[jboss-cvs] JBossAS SVN: r65089 - in projects/aop/trunk/aop: src/test/org/jboss/test/aop/beforeafterArgs and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 5 10:04:44 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-09-05 10:04:44 -0400 (Wed, 05 Sep 2007)
New Revision: 65089
Added:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCaseJDK50.java
Modified:
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java
Log:
[JBAOP-458] Generics tests temporarily removed from jdk14 test suite.
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2007-09-05 13:16:00 UTC (rev 65088)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2007-09-05 14:04:44 UTC (rev 65089)
@@ -242,6 +242,7 @@
<classpath refid="javac.classpath"/>
<include name="**/*.java"/>
<exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/>
+ <exclude name="org/jboss/test/aop/**/*JDK50.java"/>
</javac>
</target>
@@ -716,7 +717,7 @@
<pathelement location="${build.tests.retro}"/>
<pathelement location="docs"/>
</classpath>
- <formatter type="plain" extension="-jdk14.xml"/>
+ <formatter type="plain" extension="-jdk14.txt"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
usefile="true" extension="-jdk14.xml"/>
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java 2007-09-05 13:16:00 UTC (rev 65088)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCase.java 2007-09-05 14:04:44 UTC (rev 65089)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.aop.beforeafterArgs;
-import java.util.ArrayList;
-import java.util.List;
-
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
@@ -823,320 +820,4 @@
}
assertTrue(thrown);
}
-
- public void testGenerics1()
- {
- List<SuperValue> list = new ArrayList<SuperValue>();
- boolean thrown = false;
- try
- {
- pojo.method13Before7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Before8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Around5(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Around7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Around8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13After5(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13After7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13After8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Throwing2(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Throwing7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Throwing8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Finally5(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Finally7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method13Finally8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
- }
-
- public void testGenerics2() throws POJOException
- {
- List<SuperValue> list = new ArrayList<SuperValue>();
- boolean thrown = false;
- try
- {
- pojo.method14Before7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Before8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Around5(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Around7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Around8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14After5(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14After7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14After8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Throwing2(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Throwing7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Throwing8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Finally5(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Finally7(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
-
- thrown = false;
- try
- {
- pojo.method14Finally8(list);
- }
- catch(NoMatchingAdviceException e)
- {
- thrown = true;
- }
- assertTrue(thrown);
- }
}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCaseJDK50.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCaseJDK50.java (rev 0)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/ArgInvalidTestCaseJDK50.java 2007-09-05 14:04:44 UTC (rev 65089)
@@ -0,0 +1,386 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, 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.aop.beforeafterArgs;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+import org.jboss.aop.advice.NoMatchingAdviceException;
+import org.jboss.test.aop.AOPTestWithSetup;
+
+/**
+ * Tests that have been temporarily removed from {@link ArgInvalidTestCase} (task
+ * JBAOP-458)
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class ArgInvalidTestCaseJDK50 extends AOPTestWithSetup
+{
+ private ArgsInvalidPOJO pojo;
+
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("ArgTestCase");
+ suite.addTestSuite(ArgInvalidTestCaseJDK50.class);
+ return suite;
+ }
+
+ public ArgInvalidTestCaseJDK50(String name)
+ {
+ super(name);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ this.pojo = new ArgsInvalidPOJO();
+ ArgAspect.clear();
+ ArgAspectInterfaces.clear();
+ ArgAspectInvertedArgs.clear();
+ ArgAspectGenerics.clear();
+ }
+
+ public void testGenerics1()
+ {
+ List<SuperValue> list = new ArrayList<SuperValue>();
+ boolean thrown = false;
+ try
+ {
+ pojo.method13Before7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Before8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Around5(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Around7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Around8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13After5(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13After7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13After8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Throwing2(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Throwing7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Throwing8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Finally5(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Finally7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method13Finally8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+
+ public void testGenerics2() throws POJOException
+ {
+ List<SuperValue> list = new ArrayList<SuperValue>();
+ boolean thrown = false;
+ try
+ {
+ pojo.method14Before7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Before8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Around5(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Around7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Around8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14After5(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14After7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14After8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Throwing2(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Throwing7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Throwing8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Finally5(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Finally7(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+
+ thrown = false;
+ try
+ {
+ pojo.method14Finally8(list);
+ }
+ catch(NoMatchingAdviceException e)
+ {
+ thrown = true;
+ }
+ assertTrue(thrown);
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list