moving .aop.aspectj.* unit tests from .testsuite -> .context

org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java

@@ -21,13 +21,14 @@ import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
-import org.springframework.aop.framework.Lockable;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import test.mixin.Lockable;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams

org.springframework.context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml

@@ -9,8 +9,8 @@
 		<aop:aspect id="beforeAdviceBindingTests" ref="introduction">
 			<aop:declare-parents
 					types-matching="org.springframework.beans..*"
-			    implement-interface="org.springframework.aop.framework.Lockable"
-					default-impl="org.springframework.aop.framework.DefaultLockable"
+			    implement-interface="test.mixin.Lockable"
+					default-impl="test.mixin.DefaultLockable"
 			/>
 			<aop:before
 					method="checkNotLocked"

org.springframework.context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

org.springframework.context/src/test/java/test/mixin/DefaultLockable.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package test.mixin;
+
+/**
+ * Simple implementation of Lockable interface for use in mixins.
+ * 
+ * @author Rod Johnson
+ */
+public class DefaultLockable implements Lockable {
+
+	private boolean locked;
+
+	public void lock() {
+		this.locked = true;
+	}
+
+	public void unlock() {
+		this.locked = false;
+	}
+
+	public boolean locked() {
+		return this.locked;
+	}
+
+}

org.springframework.context/src/test/java/test/mixin/Lockable.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package test.mixin;
+
+/**
+ * Simple interface to use for mixins
+ * 
+ * @author Rod Johnson
+ *
+ */
+public interface Lockable {
+	
+	void lock();
+	
+	void unlock();
+	
+	boolean locked();
+}