[qdox-scm] [1154] trunk/qdox/src/test/java/com/thoughtworks/qdox: Remove JavaMethod.isConstructor()

Wed, 06 Apr 2011 14:32:57 -0700

Title: [1154] trunk/qdox/src/test/java/com/thoughtworks/qdox: Remove JavaMethod.isConstructor()

Diff

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java (1153 => 1154)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/builder/ModelBuilder.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -269,7 +269,6 @@
         // basic details
         currentMethod.setName(def.name);
         currentMethod.setReturns(createType(def.returnType, def.dimensions));
-        currentMethod.setConstructor(def.constructor);
 
         // typeParameters
         if (def.typeParams != null) {

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/io/DefaultModelWriter.java (1153 => 1154)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/io/DefaultModelWriter.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/io/DefaultModelWriter.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -213,13 +213,10 @@
             writeNonAccessibilityModifiers( method.getModifiers() );
         }
 
-        if ( !method.isConstructor() )
+        if ( isDeclaration )
         {
-            if ( isDeclaration )
-            {
-                buffer.write( method.getReturns().toString() );
-                buffer.write( ' ' );
-            }
+            buffer.write( method.getReturns().toString() );
+            buffer.write( ' ' );
         }
 
         buffer.write( method.getName() );

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java (1153 => 1154)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/DefaultJavaMethod.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -29,7 +29,6 @@
 public class DefaultJavaMethod extends AbstractBaseMethod implements JavaMethod {
 
 	private Type returns = Type.VOID;
-    private boolean constructor;
     /**
      * The default constructor
      */
@@ -64,13 +63,6 @@
     }
 
     /* (non-Javadoc)
-     * @see com.thoughtworks.qdox.model.JavaMethod#isConstructor()
-     */
-    public boolean isConstructor() {
-        return constructor;
-    }
-    
-    /* (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaMethod#getCodeBlock()
      */
     public String getCodeBlock()
@@ -120,11 +112,9 @@
             }
         }
 
-        if (!constructor) {
-            if(isDeclaration) {
-                result.write(returns.toString());
-                result.write(' ');
-            }
+        if(isDeclaration) {
+            result.write(returns.toString());
+            result.write(' ');
         }
 
         result.write(getName());
@@ -179,10 +169,6 @@
         this.returns = returns;
     }
 
-    public void setConstructor(boolean constructor) {
-        this.constructor = constructor;
-    }
-
     /* (non-Javadoc)
      * @see com.thoughtworks.qdox.model.JavaMethod#equals(java.lang.Object)
      */
@@ -190,8 +176,6 @@
         if (obj == null) return false;
         JavaMethod m = (JavaMethod) obj;
 
-        if (m.isConstructor() != isConstructor()) return false;
-
         if (m.getName() == null) return (getName() == null);
         if (!m.getName().equals(getName())) return false;
         
@@ -307,18 +291,12 @@
 		if(isNative()) {
 			result.append("native ");
 		}
-		if (!constructor) {
-		    result.append(getReturns().getValue() + " ");
-		}
+	    result.append(getReturns().getValue() + " ");
 		if(getParentClass() != null) {
 			result.append(getParentClass().getFullyQualifiedName());
-			if (!constructor) {
-			    result.append(".");
-			}
+		    result.append(".");
 		}
-		if (!constructor) {
-		    result.append(getName());
-		}
+	    result.append(getName());
 		result.append("(");
 		for(int paramIndex=0;paramIndex<getParameters().size();paramIndex++) {
 			if(paramIndex>0) {

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java (1153 => 1154)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethod.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -39,12 +39,6 @@
 
     /**
      * 
-     * @return true is this method is a constructor
-     */
-    public boolean isConstructor();
-
-    /**
-     * 
      * @return true is this method conains varArgs
      */
     public boolean isVarArgs();

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java (1153 => 1154)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/model/JavaMethodDelegate.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -221,11 +221,6 @@
         return originalMethod.isAbstract();
     }
 
-    public boolean isConstructor()
-    {
-        return originalMethod.isConstructor();
-    }
-
     public boolean isFinal()
     {
         return originalMethod.isFinal();

Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/impl/BinaryClassParser.java (1153 => 1154)

--- trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/impl/BinaryClassParser.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/main/java/com/thoughtworks/qdox/parser/impl/BinaryClassParser.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -88,13 +88,17 @@
             // if no constructor exists.
             Constructor<?>[] constructors = clazz.getDeclaredConstructors();
             for (int i = 0; i < constructors.length; i++) {
-                addMethodOrConstructor(constructors[i], binaryBuilder);
+                binaryBuilder.beginConstructor();
+                MethodDef methodDef = createMethodDef(constructors[i], binaryBuilder);
+                binaryBuilder.endConstructor( methodDef );
             }
 
             // add the methods
             Method[] methods = clazz.getDeclaredMethods();
             for (int i = 0; i < methods.length; i++) {
-                addMethodOrConstructor(methods[i], binaryBuilder);
+                binaryBuilder.beginMethod();
+                MethodDef methodDef = createMethodDef(methods[i], binaryBuilder);
+                binaryBuilder.endMethod( methodDef );
             }
 
             Field[] fields = clazz.getDeclaredFields();
@@ -127,7 +131,7 @@
         binaryBuilder.addField(fieldDef);
     }
 
-    private void addMethodOrConstructor(Member member, ModelBuilder binaryBuilder) {
+    private MethodDef createMethodDef(Member member, ModelBuilder binaryBuilder) {
         MethodDef methodDef = new MethodDef();
         // The name of constructors are qualified. Need to strip it.
         // This will work for regular methods too, since -1 + 1 = 0
@@ -159,7 +163,6 @@
             Class<?> exception = exceptions[j];
             methodDef.exceptions.add(getTypeDef(exception));
         }
-        binaryBuilder.beginMethod();
         for (int j = 0; j < parameterTypes.length; j++) {
             FieldDef param = new FieldDef();
             Class<?> parameterType = parameterTypes[j];
@@ -168,7 +171,7 @@
             param.dimensions = getDimension(parameterType);
             binaryBuilder.addParameter( param );
         }
-        binaryBuilder.endMethod(methodDef);
+        return methodDef;
     }
 
     private static final int getDimension(Class<?> c) {

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java (1153 => 1154)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaDocBuilderTest.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -483,13 +483,6 @@
         assertNotNull(privateMethod);
         assertNull(shouldntBeInherited);
 
-        assertFalse(getFoo.isConstructor());
-        assertFalse(isBar.isConstructor());
-        assertFalse(get.isConstructor());
-        assertFalse(set.isConstructor());
-        assertFalse(protectedMethod.isConstructor());
-        assertFalse(privateMethod.isConstructor());
-
         assertTrue(getFoo.isStatic());
         assertFalse(isBar.isStatic());
         assertFalse(get.isStatic());
@@ -513,9 +506,6 @@
         JavaClass javaClass = builder.getClassByName("com.thoughtworks.qdox.testdata.DefaultCtor");
 
         JavaMethod ctor = javaClass.getMethodBySignature("DefaultCtor", null);
-
-        // Differs from binary as currently no way to identify default
-        // constructor in binary class.
         assertNull(ctor);
     }
 
@@ -523,10 +513,7 @@
         JavaClass javaClass = builder.getClassByName("com.thoughtworks.qdox.testdata.DefaultCtor");
 
         JavaMethod ctor = javaClass.getMethodBySignature("DefaultCtor", null);
-
-        // Differs from source as currently no way to identify default 
-        // constructor in binary class.
-        assertNotNull(ctor);
+        assertNull(ctor);
     }
 
     public void testSerializable() throws Exception {

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1153 => 1154)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -484,13 +484,6 @@
         assertNotNull(privateMethod);
         assertNull(shouldntBeInherited);
 
-        assertFalse(getFoo.isConstructor());
-        assertFalse(isBar.isConstructor());
-        assertFalse(get.isConstructor());
-        assertFalse(set.isConstructor());
-        assertFalse(protectedMethod.isConstructor());
-        assertFalse(privateMethod.isConstructor());
-
         assertTrue(getFoo.isStatic());
         assertFalse(isBar.isStatic());
         assertFalse(get.isStatic());
@@ -514,9 +507,6 @@
         JavaClass javaClass = builder.getClassByName("com.thoughtworks.qdox.testdata.DefaultCtor");
 
         JavaMethod ctor = javaClass.getMethodBySignature("DefaultCtor", null);
-
-        // Differs from binary as currently no way to identify default
-        // constructor in binary class.
         assertNull(ctor);
     }
 
@@ -524,10 +514,7 @@
         JavaClass javaClass = builder.getClassByName("com.thoughtworks.qdox.testdata.DefaultCtor");
 
         JavaMethod ctor = javaClass.getMethodBySignature("DefaultCtor", null);
-
-        // Differs from source as currently no way to identify default 
-        // constructor in binary class.
-        assertNotNull(ctor);
+        assertNull(ctor);
     }
 
     /*

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/ModelBuilderTest.java (1153 => 1154)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/ModelBuilderTest.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/builder/ModelBuilderTest.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -9,6 +9,7 @@
 import com.thoughtworks.qdox.model.DefaultDocletTagFactory;
 import com.thoughtworks.qdox.model.DefaultJavaParameter;
 import com.thoughtworks.qdox.model.JavaClass;
+import com.thoughtworks.qdox.model.JavaConstructor;
 import com.thoughtworks.qdox.model.JavaField;
 import com.thoughtworks.qdox.model.JavaMethod;
 import com.thoughtworks.qdox.model.JavaParameter;
@@ -577,27 +578,25 @@
     public void testSimpleConstructor() throws Exception {
         builder.beginClass(new ClassDef());
 
-        MethodDef mth = new MethodDef();
-        mth.name = "MyClass";
-        mth.constructor = true;
-        builder.beginMethod();
-        builder.endMethod(mth);
+        MethodDef c1 = new MethodDef();
+        c1.name = "MyClass";
+        builder.beginConstructor();
+        builder.endConstructor(c1);
 
-        MethodDef mth2 = new MethodDef();
-        mth2.name = "method";
-        mth2.returnType = new TypeDef("void");
+        MethodDef m1 = new MethodDef();
+        m1.name = "method";
+        m1.returnType = new TypeDef("void");
         builder.beginMethod();
-        builder.endMethod(mth2);
+        builder.endMethod(m1);
         builder.endClass();
 
         JavaSource source = builder.getSource();
 
-        JavaMethod result1 = source.getClasses().get(0).getMethods().get(0);
-        JavaMethod result2 = source.getClasses().get(0).getMethods().get(1);
+        JavaConstructor result1 = source.getClasses().get(0).getConstructors().get(0);
+        JavaMethod result2 = source.getClasses().get(0).getMethods().get(0);
 
-        assertTrue(result1.isConstructor());
-        assertNull(result1.getReturns());
-        assertTrue(!result2.isConstructor());
+        assertNotNull(result1);
+        assertNotNull(result2);
         assertNotNull(result2.getReturns());
     }

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java (1153 => 1154)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/DefaultJavaMethodTest.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -51,11 +51,6 @@
         method.setComment( comment );
     }
 
-    public void setConstructor( DefaultJavaMethod method, boolean isConstructor )
-    {
-        method.setConstructor( isConstructor );
-    }
-
     public void setName( DefaultJavaMethod method, String name )
     {
         method.setName( name );

Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java (1153 => 1154)

--- trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java	2011-04-06 20:59:57 UTC (rev 1153)
+++ trunk/qdox/src/test/java/com/thoughtworks/qdox/model/JavaMethodTest.java	2011-04-06 21:32:42 UTC (rev 1154)
@@ -24,7 +24,6 @@
     //setters
     public abstract void setExceptions(M method, List<Type> exceptions);
     public abstract void setComment(M method, String comment);
-    public abstract void setConstructor(M method, boolean isConstructor);
     public abstract void setName(M method, String name);
     public abstract void setModifiers(M method, List<String> modifiers);
     public abstract void setParameters(M method, List<JavaParameter> parameters);
@@ -192,25 +191,10 @@
         setName(m4, "thing");
         setReturns(m4, newType("int"));
 
-        M c1 = newJavaMethod();
-        setName(c1, "thing");
-        setConstructor(c1, true);
-        
-        M c2 = newJavaMethod();
-        setName(c2, "Thong");
-        setConstructor(c2, true);
-        
-        M c3 = newJavaMethod();
-        setName(c3, "Thong");
-        setConstructor(c3, true);
-        
         assertEquals(mth, m2);
         assertEquals(m2, mth);
         assertNotEquals(mth, m3);
         assertNotEquals(mth, m4);
-        assertNotEquals(m4, c1);
-        assertNotEquals(c1, c2);
-        assertEquals(c2, c3);
         assertFalse(mth.equals(null));
     }
 
@@ -263,17 +247,8 @@
         setParameters(m3, Arrays.asList( newJavaParameter(newType("int", 1), "blah"), newJavaParameter(newType("java.lang.String", 2), "thing")));
         setReturns(m3, newType("void"));
 
-        M c1 = newJavaMethod();
-        setName(c1, "Thong");
-        setConstructor(c1, true);
-        
-        M c2 = newJavaMethod();
-        setName(c2, "Thong");
-        setConstructor(c2, true);
-        
         assertEquals(mth.hashCode(), m2.hashCode());
         assertTrue(mth.hashCode() != m3.hashCode());
-        assertEquals(c1.hashCode(), c2.hashCode());
     }
 
     public void testSignatureMatches() throws Exception {
@@ -355,31 +330,6 @@
     	assertEquals("public boolean java.lang.Object.equals(java.lang.Object)", mthd.toString());
     }
     
-    public void testConstructorToString() throws Exception {
-        JavaClass cls = mock(JavaClass.class);
-        when(cls.getFullyQualifiedName()).thenReturn( "a.b.Executor" );
-        M constructor = newJavaMethod(null,"Executor");
-        setConstructor( constructor, true );
-        setParentClass( constructor, cls );
-        assertEquals("a.b.Executor()", constructor.toString());
-    }
-
-    public void testConstructorReturnType() throws Exception {
-        M constructor = newJavaMethod(null,"Executor");
-        setConstructor( constructor, true );
-        assertEquals(null, constructor.getReturnType());
-    }
-
-    public void testConstructorParameterTypes() throws Exception {
-        JavaClass cls = mock(JavaClass.class);
-        when(cls.getFullyQualifiedName()).thenReturn( "a.b.Executor" );
-        M constructor = newJavaMethod(null,"Executor");
-        setParameters( constructor,  Collections.singletonList( newJavaParameter( newType("a.b.C"), "param" )  ));
-        setConstructor( constructor, true );
-        setParentClass( constructor, cls );
-        assertEquals("a.b.C", constructor.getParameterTypes().get(0).toString());
-    }
-
     private void assertNotEquals(Object o1, Object o2) {
         assertTrue(o1.toString() + " should not equals " + o2.toString(), !o1.equals(o2));
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to