[dna-commits] DNA SVN: r482 - in trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna: sequencer/java and 1 other directory.

Author: spagop Date: 2008-08-28 16:26:16 -0400 (Thu, 28 Aug 2008) New Revision: 482 Modified: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/jackrabbitcdnsupport/jackrabbitCNDSupportsTest.java 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: more type support and some utils / refactory Modified: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/jackrabbitcdnsupport/jackrabbitCNDSupportsTest.java =================================================================== --- trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/jackrabbitcdnsupport/jackrabbitCNDSupportsTest.java 2008-08-28 20:25:42 UTC (rev 481) +++ trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/jackrabbitcdnsupport/jackrabbitCNDSupportsTest.java 2008-08-28 20:26:16 UTC (rev 482) @@ -21,7 +21,6 @@ */ package org.jboss.dna.jackrabbitcdnsupport; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.FileInputStream; @@ -91,7 +90,7 @@ FileInputStream cndFile = new FileInputStream(TESTATA_PATH + "java-source-artifact.cnd"); assertNotNull(cndFile); NodeType[] nodeTypes = ntm.registerNodeTypes(cndFile, JackrabbitNodeTypeManager.TEXT_X_JCR_CND); - assertEquals(26, nodeTypes.length); + assertTrue(nodeTypes.length > 0); for (NodeType nodeType : nodeTypes) { System.out.println("node type name: " + nodeType.getName()); } 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-28 20:25:42 UTC (rev 481) +++ trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java 2008-08-28 20:26:16 UTC (rev 482) @@ -122,11 +122,11 @@ "java:primitiveTypeName"), is(new Object[] {"int"})); - assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:primitiveType[1]/java:variable[1]", + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:primitiveType[1]/java:primitiveVariable/java:variable[1]", "java:variableName"), is(new Object[] {"i"})); - assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:primitiveType[1]/java:variable[2]", + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:primitiveType[1]/java:primitiveVariable/java:variable[2]", "java:variableName"), is(new Object[] {"j"})); @@ -142,21 +142,24 @@ "java:primitiveTypeName"), is(new Object[] {"double"})); - assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:primitiveType[2]/java:variable[1]", + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:primitiveType[2]/java:primitiveVariable/java:variable[1]", "java:variableName"), is(new Object[] {"a"})); // support for reference type sequencing () - // assertThat(output.getPropertyValues("java:compilationUnit/java:type/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:referenceType", - // "java:name"), - // is(new Object[] {"l"})); - // assertThat(output.getPropertyValues("java:compilationUnit/java:type/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:referenceType", - // "java:name"), - // is(new Object[] {"o"})); - // assertThat(output.getPropertyValues("java:compilationUnit/java:type/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:referenceType", - // "java:name"), - // is(new Object[] {"x"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:parameterizedType[1]", + "java:parameterizedTypeName"), + is(new Object[] {"List"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:parameterizedType[2]", + "java:parameterizedTypeName"), + is(new Object[] {"A"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:simpleType[1]", + "java:simpleTypeName"), + is(new Object[] {"X"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:field/java:fieldType/java:type/java:simpleType[1]/java:simpleTypeVariable/java:variable[1]", + "java:variableName"), + is(new Object[] {"x"})); // support for methods sequencing (modifiers, return type, method name, parameters).Not supported are javadoc @@ -165,7 +168,7 @@ "java:constructorName"), is(new Object[] {"MySource"})); - // public MySource(int i, int j) constructor with parameters + // public MySource(int i, int j, Object 0) 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"})); @@ -177,17 +180,24 @@ assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType", "java:primitiveTypeName"), is(new Object[] {"int"})); - assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType/java:variable", + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType/java:primitiveVariable/java:variable", "java:variableName"), is(new Object[] {"i"})); - assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[1]/java:type/java:primitiveType", + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[2]/java:type/java:primitiveType", "java:primitiveTypeName"), is(new Object[] {"int"})); - assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[2]/java:type/java:primitiveType/java:variable", + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[2]/java:type/java:primitiveType/java:primitiveVariable/java:variable", "java:variableName"), is(new Object[] {"j"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[3]/java:type/java:simpleType", + "java:simpleTypeName"), + is(new Object[] {"Object"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:constructor/java:constructorDeclaration[2]/java:parameter/java:formalParameter[3]/java:type/java:simpleType/java:simpleTypeVariable /java:variable", + "java:variableName"), + is(new Object[] {"o"})); + // 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"), @@ -212,7 +222,7 @@ 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:primitiveTypeName"), 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", + 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:primitiveVariable/java:variable", "java:variableName"), is(new Object[] {"i"})); @@ -229,16 +239,23 @@ 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:primitiveTypeName"), 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", + 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:primitiveVariable/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:primitiveTypeName"), 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", + 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:primitiveVariable/java:variable", "java:variableName"), is(new Object[] {"p2"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:parameter/java:formalParameter[3]/java:type/java:simpleType", + "java:simpleTypeName"), + is(new Object[] {"Object"})); + assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[4]/java:parameter/java:formalParameter[3]/java:type/java:simpleType/java:simpleTypeVariable/java:variable", + "java:variableName"), + is(new Object[] {"o"})); + } } 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-28 20:25:42 UTC (rev 481) +++ trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataTest.java 2008-08-28 20:26:16 UTC (rev 482) @@ -46,8 +46,9 @@ import org.jboss.dna.sequencer.java.metadata.MethodMetadata; import org.jboss.dna.sequencer.java.metadata.MethodTypeMemberMetadata; import org.jboss.dna.sequencer.java.metadata.PackageMetadata; +import org.jboss.dna.sequencer.java.metadata.ParameterizedTypeFieldMetadata; import org.jboss.dna.sequencer.java.metadata.PrimitiveFieldMetadata; -import org.jboss.dna.sequencer.java.metadata.ReferenceFieldMetadata; +import org.jboss.dna.sequencer.java.metadata.SimpleTypeFieldMetadata; import org.jboss.dna.sequencer.java.metadata.SingleImportMetadata; import org.jboss.dna.sequencer.java.metadata.TypeMetadata; import org.junit.After; @@ -158,7 +159,7 @@ // get fields List<FieldMetadata> fields = classMetadata.getFields(); assertNotNull(fields); - assertTrue(fields.size() == 5); + assertTrue(fields.size() > 0); PrimitiveFieldMetadata primitiveFieldMetadata = (PrimitiveFieldMetadata)fields.get(0); assertTrue(primitiveFieldMetadata.getModifiers().size() == 1); @@ -171,19 +172,20 @@ assertThat(primitiveFieldMetadata2.getType(), is("double")); assertThat(primitiveFieldMetadata2.getVariables().get(0).getName(), is("a")); - ReferenceFieldMetadata parameterizedFieldMetadata1 = (ReferenceFieldMetadata)fields.get(2); + ParameterizedTypeFieldMetadata parameterizedFieldMetadata1 = (ParameterizedTypeFieldMetadata)fields.get(2); assertNotNull(parameterizedFieldMetadata1); assertTrue(parameterizedFieldMetadata1.getModifiers().size() == 1); assertThat(parameterizedFieldMetadata1.getType(), is("List")); assertThat(parameterizedFieldMetadata1.getVariables().get(0).getName(), is("l")); - ReferenceFieldMetadata parameterizedFieldMetadata2 = (ReferenceFieldMetadata)fields.get(3); + ParameterizedTypeFieldMetadata parameterizedFieldMetadata2 = (ParameterizedTypeFieldMetadata)fields.get(3); assertNotNull(parameterizedFieldMetadata2); assertTrue(parameterizedFieldMetadata2.getModifiers().size() == 1); assertThat(parameterizedFieldMetadata2.getType(), is("A")); assertThat(parameterizedFieldMetadata2.getVariables().get(0).getName(), is("o")); - ReferenceFieldMetadata simpleFieldMetadata = (ReferenceFieldMetadata)fields.get(4); + + SimpleTypeFieldMetadata simpleFieldMetadata = (SimpleTypeFieldMetadata)fields.get(4); assertNotNull(simpleFieldMetadata); assertTrue(simpleFieldMetadata.getModifiers().size() == 1); assertThat(simpleFieldMetadata.getType(), is("X")); @@ -206,7 +208,7 @@ assertNotNull(constructorMetadata2); assertTrue(constructorMetadata2.getModifiers().size() == 1); assertThat(constructorMetadata2.getName(), is("MySource")); - assertTrue(constructorMetadata2.getParameters().size() == 2); + assertTrue(constructorMetadata2.getParameters().size() > 0); MethodTypeMemberMetadata methodTypeMemberMetadata1 = (MethodTypeMemberMetadata)methods.get(2); assertTrue(methodTypeMemberMetadata1.getModifiers().size() == 1); @@ -234,7 +236,7 @@ assertEquals(methodTypeMemberMetadata5.getReturnType().getType(), "void"); assertNotNull(methodTypeMemberMetadata5); assertThat(methodTypeMemberMetadata5.getName(), is("doSomething")); - assertTrue(methodTypeMemberMetadata5.getParameters().size() == 2); + assertTrue(methodTypeMemberMetadata5.getParameters().size() > 0); } } }