[dna-commits] DNA SVN: r429 - trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java.

Author: spagop Date: 2008-08-14 17:41:08 -0400 (Thu, 14 Aug 2008) New Revision: 429 Modified: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataTest.java Log: support for sequencing constructors/methods with or without primitive type parameters, return primitive type and more test Modified: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java =================================================================== --- trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java 2008-08-14 21:40:16 UTC (rev 428) +++ trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java 2008-08-14 21:41:08 UTC (rev 429) @@ -159,13 +159,17 @@ // is(new Object[] {"x"})); // support for methods sequencing (modifiers, return type, method name, parameters).Not supported are javadoc + + // MySource() constructor assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[1]", "java:name"), is(new Object[] {"MySource"})); + // public MySource(int i, int j) constructor with parameters assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:modifier/java:modifierDeclaration[1]", "java:modifierName"), is(new Object[] {"public"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]", "java:name"), is(new Object[] {"MySource"})); @@ -184,15 +188,56 @@ "java:variableName"), is(new Object[] {"j"})); + // public int getI() method + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[1]/java:modifier/java:modifierDeclaration[1]", + "java:modifierName"), + is(new Object[] {"public"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[1]/java:resultType/java:primitiveType", + "java:typeName"), + is(new Object[] {"int"})); assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[1]", "java:name"), is(new Object[] {"getI"})); + + // public void setI(int i) method + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[2]/java:modifier/java:modifierDeclaration[1]", + "java:modifierName"), + is(new Object[] {"public"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[2]/java:resultType/java:primitiveType", + "java:typeName"), + is(new Object[] {"void"})); assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[2]", "java:name"), is(new Object[] {"setI"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[2]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType", + "java:typeName"), + is(new Object[] {"int"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[2]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType/java:variable", + "java:variableName"), + is(new Object[] {"i"})); + + // public void doSomething(int p1, int p2) method + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:modifier/java:modifierDeclaration[1]", + "java:modifierName"), + is(new Object[] {"public"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:resultType/java:primitiveType", + "java:typeName"), + is(new Object[] {"void"})); assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]", "java:name"), is(new Object[] {"doSomething"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType", + "java:typeName"), + is(new Object[] {"int"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType/java:variable", + "java:variableName"), + is(new Object[] {"p1"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:parameter/java:formalParameter[2]/java:type/java:primitiveType", + "java:typeName"), + is(new Object[] {"double"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:parameter/java:formalParameter[2]/java:type/java:primitiveType/java:variable", + "java:variableName"), + is(new Object[] {"p2"})); } Modified: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataTest.java =================================================================== --- trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataTest.java 2008-08-14 21:40:16 UTC (rev 428) +++ trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataTest.java 2008-08-14 21:41:08 UTC (rev 429) @@ -210,28 +210,28 @@ MethodTypeMemberMetadata methodTypeMemberMetadata1 = (MethodTypeMemberMetadata)methods.get(2); assertTrue(methodTypeMemberMetadata1.getModifiers().size() == 1); - assertEquals(methodTypeMemberMetadata1.getReturnType().getName(), "int"); + assertEquals(methodTypeMemberMetadata1.getReturnType().getType(), "int"); assertNotNull(methodTypeMemberMetadata1); assertThat(methodTypeMemberMetadata1.getName(), is("getI")); assertTrue(methodTypeMemberMetadata1.getParameters().size() == 0); MethodTypeMemberMetadata methodTypeMemberMetadata3 = (MethodTypeMemberMetadata)methods.get(3); assertTrue(methodTypeMemberMetadata3.getModifiers().size() == 1); - assertEquals(methodTypeMemberMetadata3.getReturnType().getName(), "void"); + assertEquals(methodTypeMemberMetadata3.getReturnType().getType(), "void"); assertNotNull(methodTypeMemberMetadata3); assertThat(methodTypeMemberMetadata3.getName(), is("setI")); assertTrue(methodTypeMemberMetadata3.getParameters().size() == 1); MethodTypeMemberMetadata methodTypeMemberMetadata4 = (MethodTypeMemberMetadata)methods.get(4); assertTrue(methodTypeMemberMetadata4.getModifiers().size() == 1); - assertEquals(methodTypeMemberMetadata4.getReturnType().getName(), "void"); + assertEquals(methodTypeMemberMetadata4.getReturnType().getType(), "void"); assertNotNull(methodTypeMemberMetadata4); assertThat(methodTypeMemberMetadata4.getName(), is("setJ")); assertTrue(methodTypeMemberMetadata4.getParameters().size() == 1); MethodTypeMemberMetadata methodTypeMemberMetadata5 = (MethodTypeMemberMetadata)methods.get(5); assertTrue(methodTypeMemberMetadata5.getModifiers().size() == 1); - assertEquals(methodTypeMemberMetadata5.getReturnType().getName(), "void"); + assertEquals(methodTypeMemberMetadata5.getReturnType().getType(), "void"); assertNotNull(methodTypeMemberMetadata5); assertThat(methodTypeMemberMetadata5.getName(), is("doSomething")); assertTrue(methodTypeMemberMetadata5.getParameters().size() == 2);