[jboss-cvs] JBossAS SVN: r57702 - in projects/microcontainer/trunk/aop-mc-int: . src/main/org/jboss/aop/microcontainer/junit src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 18 11:35:22 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-18 11:35:13 -0400 (Wed, 18 Oct 2006)
New Revision: 57702
Added:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java
Removed:
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTestDelegate.java
Modified:
projects/microcontainer/trunk/aop-mc-int/.classpath
projects/microcontainer/trunk/aop-mc-int/build-test.xml
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java
Log:
[JBAOP-240] Run tests with a security manager installed
Modified: projects/microcontainer/trunk/aop-mc-int/.classpath
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/.classpath 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/.classpath 2006-10-18 15:35:13 UTC (rev 57702)
@@ -14,7 +14,7 @@
<classpathentry kind="lib" path="/thirdparty/trove/lib/trove.jar"/>
<classpathentry kind="lib" path="src/resources/schema"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
+ <classpathentry sourcepath="C:/cygwin/home/Kabir/sourcecontrol/jboss-test/test/src/main" kind="lib" path="/thirdparty/jboss/test/lib/jboss-test.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: projects/microcontainer/trunk/aop-mc-int/build-test.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/build-test.xml 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/build-test.xml 2006-10-18 15:35:13 UTC (rev 57702)
@@ -172,6 +172,8 @@
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
+ <antcall target="tests-weave-secure" inheritRefs="true"/>
+ <antcall target="tests-no-weave-secure" inheritRefs="true"/>
<antcall target="tests-weave" inheritRefs="true"/>
<antcall target="tests-no-weave" inheritRefs="true"/>
@@ -217,6 +219,47 @@
</junit>
</target>
+ <target name="tests-weave-secure" depends="most"
+ description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each run has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="jboss.aop.exclude" value="org.jboss.,org.apache."/>
+ <sysproperty key="jboss.aop.include" value="org.jboss.test."/>
+ <sysproperty key="jboss-junit-configuration" value="weave-secure"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="java.system.class.loader" value="org.jboss.aop.standalone.SystemClassLoader"/>
+ <sysproperty key="jboss.mc.secure" value="true"/>
+
+ <classpath>
+ <pathelement location="${build.lib}/${jar.prefix}.jar"/>
+ <path refid="javac.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension="-weave-secure.txt"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="true" extension="-weave-secure.xml"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="tests-no-weave" depends="most"
description="Execute all tests in the given test directory.">
<mkdir dir="${build.reports}"/>
@@ -252,6 +295,42 @@
</junit>
</target>
+ <target name="tests-no-weave-secure" depends="most"
+ description="Execute all tests in the given test directory.">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}"
+ printsummary="yes"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <sysproperty key="jboss-junit-configuration" value="no_weave-secure"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="jboss.mc.secure" value="true"/>
+
+ <classpath>
+ <pathelement location="${build.lib}/${jar.prefix}.jar"/>
+ <path refid="javac.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="true" extension="-no-weave-secure.txt"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="true" extension="-no-weave-secure.xml"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="false"
+ haltonfailure="false"
+ fork="true">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/microcontainer/test/**/*TestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="one-test" depends="init"
description="Executes a specific test with weaving.">
<mkdir dir="${build.reports}"/>
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -41,7 +41,11 @@
*/
public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
{
- return new AOPMicrocontainerTestDelegate(clazz);
+ String property = System.getProperty("jboss.mc.secure", "false");
+ boolean enableSecurity = Boolean.valueOf(property).booleanValue();
+ AOPMicrocontainerTestDelegate delegate = new AOPMicrocontainerTestDelegate(clazz);
+ delegate.enableSecurity = enableSecurity;
+ return delegate;
}
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -52,6 +52,13 @@
super(clazz);
}
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ log.debug("Security enabled: " + enableSecurity);
+ }
+
+
protected void deploy() throws Exception
{
String testName = clazz.getName();
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -0,0 +1,396 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.junit;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.aop.proxy.container.AOPProxyFactory;
+import org.jboss.aop.proxy.container.AOPProxyFactoryMixin;
+import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
+import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
+import org.jboss.test.AbstractTestCaseWithSetup;
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * AbstractProxyTest.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 45764 $
+ */
+public abstract class AbstractProxyTest extends AbstractTestCaseWithSetup
+{
+ /** The proxy factory */
+ protected AOPProxyFactory proxyFactory;
+
+ /**
+ * Get the test delegate
+ *
+ * @param clazz the test class
+ * @return the delegate
+ * @throws Exception for any error
+ */
+ public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ {
+ String property = System.getProperty("jboss.mc.secure", "false");
+ boolean enableSecurity = Boolean.valueOf(property).booleanValue();
+ AbstractProxyTestDelegate delegate = new AbstractProxyTestDelegate(clazz);
+ delegate.enableSecurity = enableSecurity;
+ return delegate;
+ }
+
+ /**
+ * Create a new AbstractProxyTest.
+ *
+ * @param name the test name
+ */
+ public AbstractProxyTest(String name)
+ {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ configureLogging();
+ proxyFactory = new GeneratedAOPProxyFactory();
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class expected) throws Exception
+ {
+ Object proxy = createProxy(target);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, Class[] interfaces) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setInterfaces(interfaces);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param mixins the mixins
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, AOPProxyFactoryMixin[] mixins) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setMixins(mixins);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param mixins the mixins
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, Class[] interfaces, AOPProxyFactoryMixin[] mixins) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setInterfaces(interfaces);
+ params.setMixins(mixins);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param mixins the mixins
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, AOPProxyFactoryMixin[] mixins, Class expected) throws Exception
+ {
+ Object proxy = createProxy(target, mixins);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param mixins the mixins
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class[] interfaces, AOPProxyFactoryMixin[] mixins, Class[] expected) throws Exception
+ {
+ Object proxy = createProxy(target, interfaces, mixins);
+ assertNotNull(proxy);
+ for (int i = 0 ; i < expected.length ; i++)
+ {
+ assertTrue("Proxy " + proxy + " should implement " + expected[i].getName() + " interfaces=" + getInterfaces(proxy), expected[i].isInstance(proxy));
+ }
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class[] interfaces, Class expected) throws Exception
+ {
+ Object proxy = createProxy(target, interfaces);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param metadata the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, Class[] interfaces, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setInterfaces(interfaces);
+ params.setSimpleMetaData(metaData);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param metadata the metadata
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class[] interfaces, SimpleMetaData metaData, Class expected) throws Exception
+ {
+ Object proxy = createProxy(target, interfaces, metaData);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param interfaces the interfaces
+ * @param metaData the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createHollowProxy(Class[] interfaces, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setInterfaces(interfaces);
+ params.setSimpleMetaData(metaData);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param mixins the mixins
+ * @param metaData the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setMixins(mixins);
+ params.setSimpleMetaData(metaData);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param mixins the mixins
+ * @param metaData the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createHollowProxy(Class[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setInterfaces(interfaces);
+ params.setMixins(mixins);
+ params.setSimpleMetaData(metaData);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param interfaces the interfaces
+ * @param metadata the metadata
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateHollowProxy(Class[] interfaces, SimpleMetaData metaData, Class expected) throws Exception
+ {
+ Object proxy = createHollowProxy(interfaces, metaData);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param interfaces the interfaces
+ * @param metadata the metadata
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class expected) throws Exception
+ {
+ Object proxy = createHollowProxy(mixins, metaData);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param mixins the mixins
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateHollowProxy(Class[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class[] expected) throws Exception
+ {
+ Object proxy = createHollowProxy(interfaces, mixins, metaData);
+ assertNotNull(proxy);
+ for (int i = 0 ; i < expected.length ; i++)
+ {
+ assertTrue("Proxy " + proxy + " should implement " + expected[i].getName() + " interfaces=" + getInterfaces(proxy), expected[i].isInstance(proxy));
+ }
+ return proxy;
+ }
+ /**
+ * Get the interfaces for an object
+ *
+ * @param object the object
+ * @return the set of interfaces
+ */
+ protected Set getInterfaces(Object object)
+ {
+ Set<Class> interfaces = new HashSet<Class>();
+ addInterfaces(interfaces, object.getClass());
+ return interfaces;
+ }
+
+ /**
+ * Add interfaces
+ *
+ * @param interfaces the interfaces to add to
+ * @param clazz the class
+ */
+ protected void addInterfaces(Set<Class> interfaces, Class clazz)
+ {
+ Class[] intfs = clazz.getInterfaces();
+ for (int i = 0; i < intfs.length; ++i)
+ interfaces.add(intfs[i]);
+ Class superClass = clazz.getSuperclass();
+ if (superClass != null)
+ addInterfaces(interfaces, superClass);
+ }
+
+ /**
+ * Get the delegate
+ *
+ * @return the delegate
+ */
+ protected AbstractProxyTestDelegate getMCDelegate()
+ {
+ return (AbstractProxyTestDelegate) getDelegate();
+ }
+
+}
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -0,0 +1,153 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.aop.microcontainer.junit;
+
+import java.net.URL;
+
+import org.jboss.aop.AspectXmlLoader;
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * AbstractProxyTestDelegate.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 44908 $
+ */
+public class AbstractProxyTestDelegate extends AbstractTestDelegate
+{
+ /**
+ * Create a new AbstractProxyTestDelegate.
+ *
+ * @param clazz the test class
+ * @throws Exception for any error
+ */
+ public AbstractProxyTestDelegate(Class clazz) throws Exception
+ {
+ super(clazz);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ log.debug("Security enabled: " + enableSecurity);
+
+ try
+ {
+ deploy();
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ catch (Error e)
+ {
+ throw e;
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ undeploy();
+ }
+
+ /**
+ * Deploy the aop config
+ *
+ * @throws Exception for any error
+ */
+ protected void deploy() throws Exception
+ {
+ String testName = clazz.getName();
+ testName = testName.replace('.', '/') + ".xml";
+ URL url = clazz.getClassLoader().getResource(testName);
+ if (url != null)
+ deploy(url);
+ else
+ throw new RuntimeException("No test specific deployment " + testName);
+ }
+
+ /**
+ * Undeploy the aop config
+ */
+ protected void undeploy()
+ {
+ String testName = clazz.getName();
+ testName = testName.replace('.', '/') + ".xml";
+ URL url = clazz.getClassLoader().getResource(testName);
+ if (url != null)
+ undeploy(url);
+ else
+ log.debug("No test specific deployment " + testName);
+ }
+
+ /**
+ * Get the test url
+ *
+ * @return the test url
+ */
+ protected URL getTestURL()
+ {
+ String testName = clazz.getName();
+ testName = testName.replace('.', '/') + ".xml";
+ return clazz.getClassLoader().getResource(testName);
+ }
+
+ /**
+ * Deploy the aop config
+ *
+ * @param url the url
+ * @throws Exception for any error
+ */
+ protected void deploy(URL url) throws Exception
+ {
+ log.debug("Deploying " + url);
+ AspectXmlLoader.deployXML(url);
+ }
+
+ /**
+ * Undeploy the aop config
+ *
+ * @param url the url
+ */
+ protected void undeploy(URL url)
+ {
+ try
+ {
+ log.debug("Undeploying " + url);
+ AspectXmlLoader.undeployXML(url);
+ }
+ catch (Exception e)
+ {
+ log.warn("Ignored error undeploying " + url, e);
+ }
+ }
+}
Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTest.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTest.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -1,392 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.microcontainer.matrix.proxyfactory.test;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.aop.proxy.container.AOPProxyFactory;
-import org.jboss.aop.proxy.container.AOPProxyFactoryMixin;
-import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
-import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
-import org.jboss.test.AbstractTestCaseWithSetup;
-import org.jboss.test.AbstractTestDelegate;
-
-/**
- * AbstractProxyTest.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public abstract class AbstractProxyTest extends AbstractTestCaseWithSetup
-{
- /** The proxy factory */
- protected AOPProxyFactory proxyFactory;
-
- /**
- * Get the test delegate
- *
- * @param clazz the test class
- * @return the delegate
- * @throws Exception for any error
- */
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
- {
- return new AbstractProxyTestDelegate(clazz);
- }
-
- /**
- * Create a new AbstractProxyTest.
- *
- * @param name the test name
- */
- public AbstractProxyTest(String name)
- {
- super(name);
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- configureLogging();
- proxyFactory = new GeneratedAOPProxyFactory();
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createProxy(Object target) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setProxiedClass(target.getClass());
- params.setTarget(target);
- return proxyFactory.createAdvisedProxy(params);
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateProxy(Object target, Class expected) throws Exception
- {
- Object proxy = createProxy(target);
- assertNotNull(proxy);
- assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
- return proxy;
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param interfaces the interfaces
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createProxy(Object target, Class[] interfaces) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setProxiedClass(target.getClass());
- params.setInterfaces(interfaces);
- params.setTarget(target);
- return proxyFactory.createAdvisedProxy(params);
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param mixins the mixins
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createProxy(Object target, AOPProxyFactoryMixin[] mixins) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setProxiedClass(target.getClass());
- params.setMixins(mixins);
- params.setTarget(target);
- return proxyFactory.createAdvisedProxy(params);
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param interfaces the interfaces
- * @param mixins the mixins
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createProxy(Object target, Class[] interfaces, AOPProxyFactoryMixin[] mixins) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setProxiedClass(target.getClass());
- params.setInterfaces(interfaces);
- params.setMixins(mixins);
- params.setTarget(target);
- return proxyFactory.createAdvisedProxy(params);
- }
- /**
- * Create a proxy
- *
- * @param target the target
- * @param mixins the mixins
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateProxy(Object target, AOPProxyFactoryMixin[] mixins, Class expected) throws Exception
- {
- Object proxy = createProxy(target, mixins);
- assertNotNull(proxy);
- assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
- return proxy;
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param interfaces the interfaces
- * @param mixins the mixins
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateProxy(Object target, Class[] interfaces, AOPProxyFactoryMixin[] mixins, Class[] expected) throws Exception
- {
- Object proxy = createProxy(target, interfaces, mixins);
- assertNotNull(proxy);
- for (int i = 0 ; i < expected.length ; i++)
- {
- assertTrue("Proxy " + proxy + " should implement " + expected[i].getName() + " interfaces=" + getInterfaces(proxy), expected[i].isInstance(proxy));
- }
- return proxy;
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param interfaces the interfaces
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateProxy(Object target, Class[] interfaces, Class expected) throws Exception
- {
- Object proxy = createProxy(target, interfaces);
- assertNotNull(proxy);
- assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
- return proxy;
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param interfaces the interfaces
- * @param metadata the metadata
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createProxy(Object target, Class[] interfaces, SimpleMetaData metaData) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setProxiedClass(target.getClass());
- params.setInterfaces(interfaces);
- params.setSimpleMetaData(metaData);
- params.setTarget(target);
- return proxyFactory.createAdvisedProxy(params);
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param interfaces the interfaces
- * @param metadata the metadata
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateProxy(Object target, Class[] interfaces, SimpleMetaData metaData, Class expected) throws Exception
- {
- Object proxy = createProxy(target, interfaces, metaData);
- assertNotNull(proxy);
- assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
- return proxy;
- }
-
- /**
- * Create a proxy
- *
- * @param interfaces the interfaces
- * @param metaData the metadata
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createHollowProxy(Class[] interfaces, SimpleMetaData metaData) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setInterfaces(interfaces);
- params.setSimpleMetaData(metaData);
- return proxyFactory.createAdvisedProxy(params);
- }
-
- /**
- * Create a proxy
- *
- * @param mixins the mixins
- * @param metaData the metadata
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setMixins(mixins);
- params.setSimpleMetaData(metaData);
- return proxyFactory.createAdvisedProxy(params);
- }
-
- /**
- * Create a proxy
- *
- * @param mixins the mixins
- * @param metaData the metadata
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object createHollowProxy(Class[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
- {
- AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
- params.setInterfaces(interfaces);
- params.setMixins(mixins);
- params.setSimpleMetaData(metaData);
- return proxyFactory.createAdvisedProxy(params);
- }
-
- /**
- * Create a proxy
- *
- * @param interfaces the interfaces
- * @param metadata the metadata
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateHollowProxy(Class[] interfaces, SimpleMetaData metaData, Class expected) throws Exception
- {
- Object proxy = createHollowProxy(interfaces, metaData);
- assertNotNull(proxy);
- assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
- return proxy;
- }
-
- /**
- * Create a proxy
- *
- * @param interfaces the interfaces
- * @param metadata the metadata
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class expected) throws Exception
- {
- Object proxy = createHollowProxy(mixins, metaData);
- assertNotNull(proxy);
- assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
- return proxy;
- }
-
- /**
- * Create a proxy
- *
- * @param target the target
- * @param interfaces the interfaces
- * @param mixins the mixins
- * @param expected the expected class
- * @return the proxy
- * @throws Exception for any error
- */
- protected Object assertCreateHollowProxy(Class[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class[] expected) throws Exception
- {
- Object proxy = createHollowProxy(interfaces, mixins, metaData);
- assertNotNull(proxy);
- for (int i = 0 ; i < expected.length ; i++)
- {
- assertTrue("Proxy " + proxy + " should implement " + expected[i].getName() + " interfaces=" + getInterfaces(proxy), expected[i].isInstance(proxy));
- }
- return proxy;
- }
- /**
- * Get the interfaces for an object
- *
- * @param object the object
- * @return the set of interfaces
- */
- protected Set getInterfaces(Object object)
- {
- Set<Class> interfaces = new HashSet<Class>();
- addInterfaces(interfaces, object.getClass());
- return interfaces;
- }
-
- /**
- * Add interfaces
- *
- * @param interfaces the interfaces to add to
- * @param clazz the class
- */
- protected void addInterfaces(Set<Class> interfaces, Class clazz)
- {
- Class[] intfs = clazz.getInterfaces();
- for (int i = 0; i < intfs.length; ++i)
- interfaces.add(intfs[i]);
- Class superClass = clazz.getSuperclass();
- if (superClass != null)
- addInterfaces(interfaces, superClass);
- }
-
- /**
- * Get the delegate
- *
- * @return the delegate
- */
- protected AbstractProxyTestDelegate getMCDelegate()
- {
- return (AbstractProxyTestDelegate) getDelegate();
- }
-
-}
Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTestDelegate.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AbstractProxyTestDelegate.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -1,151 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.microcontainer.matrix.proxyfactory.test;
-
-import java.net.URL;
-
-import org.jboss.aop.AspectXmlLoader;
-import org.jboss.test.AbstractTestDelegate;
-
-/**
- * AbstractProxyTestDelegate.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision$
- */
-public class AbstractProxyTestDelegate extends AbstractTestDelegate
-{
- /**
- * Create a new AbstractProxyTestDelegate.
- *
- * @param clazz the test class
- * @throws Exception for any error
- */
- public AbstractProxyTestDelegate(Class clazz) throws Exception
- {
- super(clazz);
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
-
- try
- {
- deploy();
- }
- catch (RuntimeException e)
- {
- throw e;
- }
- catch (Exception e)
- {
- throw e;
- }
- catch (Error e)
- {
- throw e;
- }
- catch (Throwable e)
- {
- throw new RuntimeException(e);
- }
- }
-
- public void tearDown() throws Exception
- {
- super.tearDown();
- undeploy();
- }
-
- /**
- * Deploy the aop config
- *
- * @throws Exception for any error
- */
- protected void deploy() throws Exception
- {
- String testName = clazz.getName();
- testName = testName.replace('.', '/') + ".xml";
- URL url = clazz.getClassLoader().getResource(testName);
- if (url != null)
- deploy(url);
- else
- throw new RuntimeException("No test specific deployment " + testName);
- }
-
- /**
- * Undeploy the aop config
- */
- protected void undeploy()
- {
- String testName = clazz.getName();
- testName = testName.replace('.', '/') + ".xml";
- URL url = clazz.getClassLoader().getResource(testName);
- if (url != null)
- undeploy(url);
- else
- log.debug("No test specific deployment " + testName);
- }
-
- /**
- * Get the test url
- *
- * @return the test url
- */
- protected URL getTestURL()
- {
- String testName = clazz.getName();
- testName = testName.replace('.', '/') + ".xml";
- return clazz.getClassLoader().getResource(testName);
- }
-
- /**
- * Deploy the aop config
- *
- * @param url the url
- * @throws Exception for any error
- */
- protected void deploy(URL url) throws Exception
- {
- log.debug("Deploying " + url);
- AspectXmlLoader.deployXML(url);
- }
-
- /**
- * Undeploy the aop config
- *
- * @param url the url
- */
- protected void undeploy(URL url)
- {
- try
- {
- log.debug("Undeploying " + url);
- AspectXmlLoader.undeployXML(url);
- }
- catch (Exception e)
- {
- log.warn("Ignored error undeploying " + url, e);
- }
- }
-}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.support.SimpleBean;
import org.jboss.test.microcontainer.matrix.Base;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AOPProxyFactoryMixin;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.support.OtherMixin;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -26,6 +26,7 @@
import org.jboss.aop.Advised;
import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -25,6 +25,7 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -26,6 +26,7 @@
import org.jboss.aop.Advised;
import org.jboss.aop.AspectManager;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AOPProxyFactoryMixin;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.support.OtherMixin;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -26,6 +26,7 @@
import org.jboss.aop.Advised;
import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.DynamicAspectDeployer;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java 2006-10-18 14:00:02 UTC (rev 57701)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java 2006-10-18 15:35:13 UTC (rev 57702)
@@ -25,6 +25,7 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
+import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.DynamicAspectDeployer;
More information about the jboss-cvs-commits
mailing list