Title: [747] trunk/qdox/src/test/com/thoughtworks/qdox/model: Prepare TypeTest
Revision
747
Author
rfscholte
Date
2010-09-07 16:17:08 -0500 (Tue, 07 Sep 2010)

Log Message

Prepare TypeTest

Modified Paths


Added Paths

Diff

Added: trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultTypeTest.java (0 => 747)

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultTypeTest.java	                        (rev 0)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultTypeTest.java	2010-09-07 21:17:08 UTC (rev 747)
@@ -0,0 +1,48 @@
+package com.thoughtworks.qdox.model;
+
+import com.thoughtworks.qdox.JavaClassContext;
+
+public class DefaultTypeTest extends TypeTest
+{
+
+    public DefaultTypeTest( String s )
+    {
+        super( s );
+    }
+
+    public JavaSource newJavaSource()
+    {
+        return new JavaSource();
+    }
+
+    public JavaSource newJavaSource( JavaClassContext context )
+    {
+        return new JavaSource(context);
+    }
+
+    public Type newType( String fullname )
+    {
+        return new Type(fullname);
+    }
+
+    public Type newType( String fullname, int dimensions )
+    {
+        return new Type(fullname, dimensions);
+    }
+
+    public Type newType( String fullname, int dimensions, JavaSource source )
+    {
+        return new Type(fullname, dimensions, source);
+    }
+
+    public void setClassLibrary( JavaSource source, ClassLibrary library )
+    {
+        source.setClassLibrary( library );
+    }
+
+    public void addImport( JavaSource source, String imp )
+    {
+        source.addImport( imp );
+    }
+
+}
Property changes on: trunk/qdox/src/test/com/thoughtworks/qdox/model/DefaultTypeTest.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/TypeTest.java (746 => 747)

--- trunk/qdox/src/test/com/thoughtworks/qdox/model/TypeTest.java	2010-09-07 15:35:16 UTC (rev 746)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/model/TypeTest.java	2010-09-07 21:17:08 UTC (rev 747)
@@ -7,17 +7,27 @@
 import com.thoughtworks.qdox.JavaClassContext;
 import com.thoughtworks.qdox.JavaDocBuilder;
 
-public class TypeTest extends TestCase {
+public abstract class TypeTest extends TestCase {
 
     public TypeTest(String s) {
         super(s);
     }
+    
+    public abstract JavaSource newJavaSource();
+    public abstract JavaSource newJavaSource(JavaClassContext context);
+    public abstract Type newType(String fullname);
+    public abstract Type newType(String fullname, int dimensions);
+    public abstract Type newType(String fullname, int dimensions, JavaSource source);
+    
+    public abstract void setClassLibrary(JavaSource source, ClassLibrary library);
+    
+    public abstract void addImport(JavaSource source, String imp);
 
     public void testResolving() throws Exception {
         ClassLibrary classLib = new ClassLibrary();
-        JavaSource src = "" JavaSource();
-        src.setClassLibrary(classLib);
-        src.addImport("foo.*");
+        JavaSource src = ""
+        setClassLibrary(src, classLib);
+        addImport(src, "foo.*");
         Type type = Type.createUnresolved("Bar", 0, src);
         assertEquals(false, type.isResolved());
         classLib.add("foo.Bar");
@@ -26,32 +36,32 @@
     }
 
     public void testArrayType() throws Exception {
-        Type type = new Type("int", 1);
+        Type type = newType("int", 1);
         assertTrue(type.isArray());
     }
 
     public void testToString() throws Exception {
-        assertEquals("int", new Type("int").toString());
-        assertEquals("int[]", new Type("int", 1).toString());
-        assertEquals("long[][][]", new Type("long", 3).toString());
+        assertEquals("int", newType("int").toString());
+        assertEquals("int[]", newType("int", 1).toString());
+        assertEquals("long[][][]", newType("long", 3).toString());
     }
 
     public void testEquals() throws Exception {
-        assertEquals(new Type("string"),
-                new Type("string"));
-        assertNotEquals(new Type("string"),
-                new Type("int"));
-        assertNotEquals(new Type("long", 1),
-                new Type("long"));
-        assertNotEquals(new Type("long"),
-                new Type("long", 2));
-        assertFalse(new Type("int").equals(null));
+        assertEquals(newType("string"),
+                newType("string"));
+        assertNotEquals(newType("string"),
+                newType("int"));
+        assertNotEquals(newType("long", 1),
+                newType("long"));
+        assertNotEquals(newType("long"),
+                newType("long", 2));
+        assertFalse(newType("int").equals(null));
     }
 
     public void testTypeHasJavaClass() {
-        JavaSource javaSource = new JavaSource(new JavaClassContext(new JavaDocBuilder()));
-        javaSource.setClassLibrary(new ClassLibrary());
-        Type type = new Type("java.util.HashSet", 0, javaSource);
+        JavaSource javaSource = newJavaSource(new JavaClassContext(new JavaDocBuilder()));
+        setClassLibrary(javaSource, new ClassLibrary());
+        Type type = newType("java.util.HashSet", 0, javaSource);
         JavaClass clazz = type.getJavaClass();
         JavaClass superClass = clazz.getSuperJavaClass();
         assertEquals("java.util.AbstractSet", superClass.getFullyQualifiedName());


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to