[jboss-cvs] JBossAS SVN: r63823 - projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 4 10:57:32 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-07-04 10:57:32 -0400 (Wed, 04 Jul 2007)
New Revision: 63823
Added:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeTest.java
Modified:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/AssignabilityAlgorithmTest.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromArrayTest.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromClassTest.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromParamTypeTest.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromVariableTest.java
Log:
[JBAOP-420] Test refactoring
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/AssignabilityAlgorithmTest.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/AssignabilityAlgorithmTest.java 2007-07-04 14:52:02 UTC (rev 63822)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/AssignabilityAlgorithmTest.java 2007-07-04 14:57:32 UTC (rev 63823)
@@ -56,70 +56,4 @@
algorithm = Algorithm.getInstance();
hierarchy = algorithm.getInitialHierarchy();
}
-
- protected <A> void called1(ArrayList<A> arg)
- {}
-
- protected void called2(ArrayList<?> arg)
- {}
-
- protected void called3(ArrayList arg)
- {}
-
- protected void called4(ArrayList<String> arg)
- {}
-
- protected void called5(ArrayList<Object> arg)
- {}
-
- protected void called6(ArrayList<Integer> arg)
- {}
-
- protected void called7(ArrayList<? extends String> arg)
- {}
-
- protected void called8(ArrayList<? extends Integer> arg)
- {}
-
- protected <A> void called9(List<A> arg)
- {}
-
- protected void called10(List<?> arg)
- {}
-
- protected void called11(List arg)
- {}
-
- protected void called12(List<String> arg)
- {}
-
- protected void called13(List<Object> arg)
- {}
-
- protected void called14(List<Integer> arg)
- {}
-
- protected void called15(List<? extends String> arg)
- {}
-
- protected void called16(List<? extends Integer> arg)
- {}
-
- protected void called17(HashMap<Integer,String> a)
- {}
-
-}
-
-class MyClass1 extends MyClass2{}
-class MyClass2<A extends Runnable> extends MyClass3<A>{}
-class MyClass3<A> extends ArrayList<A>{}
-
-class NewClass2<A> extends NewClass1{}
-class NewClass3<A> extends MyClass2{}
-class NewClass1<A> extends NewClass{}
-class NewClass extends MyClass2<Runnable>{}
-
-class MyClass_<A extends Serializable, B> extends MyClass2_<A>{}
-class MyClass2_<A extends Serializable> extends HashMap<String, A>{}
-
-class MyClass3_<A extends Serializable, B> extends MyClass2_{}
\ No newline at end of file
+}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromArrayTest.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromArrayTest.java 2007-07-04 14:52:02 UTC (rev 63822)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromArrayTest.java 2007-07-04 14:57:32 UTC (rev 63823)
@@ -30,7 +30,7 @@
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
-public class ParameterizedTypeFromArrayTest extends AssignabilityAlgorithmTest
+public class ParameterizedTypeFromArrayTest extends ParameterizedTypeTest
{
// Scenario 1
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromClassTest.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromClassTest.java 2007-07-04 14:52:02 UTC (rev 63822)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromClassTest.java 2007-07-04 14:57:32 UTC (rev 63823)
@@ -31,7 +31,7 @@
*
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*/
-public class ParameterizedTypeFromClassTest extends AssignabilityAlgorithmTest
+public class ParameterizedTypeFromClassTest extends ParameterizedTypeTest
{
// Scenario 1
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromParamTypeTest.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromParamTypeTest.java 2007-07-04 14:52:02 UTC (rev 63822)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromParamTypeTest.java 2007-07-04 14:57:32 UTC (rev 63823)
@@ -31,7 +31,7 @@
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*
*/
-public class ParameterizedTypeFromParamTypeTest extends AssignabilityAlgorithmTest
+public class ParameterizedTypeFromParamTypeTest extends ParameterizedTypeTest
{
// Scenario 1
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromVariableTest.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromVariableTest.java 2007-07-04 14:52:02 UTC (rev 63822)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeFromVariableTest.java 2007-07-04 14:57:32 UTC (rev 63823)
@@ -30,8 +30,7 @@
* @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
*
*/
-public class ParameterizedTypeFromVariableTest extends
- AssignabilityAlgorithmTest
+public class ParameterizedTypeFromVariableTest extends ParameterizedTypeTest
{
// Scenario 1
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeTest.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeTest.java (rev 0)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/unit/assignability/ParameterizedTypeTest.java 2007-07-04 14:57:32 UTC (rev 63823)
@@ -0,0 +1,66 @@
+/*
+ * 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.unit.assignability;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ *
+ */
+public class ParameterizedTypeTest extends AssignabilityAlgorithmTest
+{
+ protected <A> void called1(ArrayList<A> arg) {}
+ protected void called2(ArrayList<?> arg) {}
+ protected void called3(ArrayList arg) {}
+ protected void called4(ArrayList<String> arg) {}
+ protected void called5(ArrayList<Object> arg) {}
+ protected void called6(ArrayList<Integer> arg) {}
+ protected void called7(ArrayList<? extends String> arg) {}
+ protected void called8(ArrayList<? extends Integer> arg) {}
+ protected <A> void called9(List<A> arg) {}
+ protected void called10(List<?> arg) {}
+ protected void called11(List arg) {}
+ protected void called12(List<String> arg) {}
+ protected void called13(List<Object> arg) {}
+ protected void called14(List<Integer> arg) {}
+ protected void called15(List<? extends String> arg) {}
+ protected void called16(List<? extends Integer> arg) {}
+ protected void called17(HashMap<Integer,String> a) {}
+}
+
+class MyClass1 extends MyClass2{}
+class MyClass2<A extends Runnable> extends MyClass3<A>{}
+class MyClass3<A> extends ArrayList<A>{}
+
+class NewClass2<A> extends NewClass1{}
+class NewClass3<A> extends MyClass2{}
+class NewClass1<A> extends NewClass{}
+class NewClass extends MyClass2<Runnable>{}
+
+class MyClass_<A extends Serializable, B> extends MyClass2_<A>{}
+class MyClass2_<A extends Serializable> extends HashMap<String, A>{}
+
+class MyClass3_<A extends Serializable, B> extends MyClass2_{}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list