- Revision
- 1316
- Author
- rfscholte
- Date
- 2011-09-10 09:11:04 -0500 (Sat, 10 Sep 2011)
Log Message
Use Collection for JavaProjectBuilder.getClasses() and JavaProjectBuilder.getPackages() as we cannot guarantee the order.
Modified Paths
- trunk/qdox/src/main/java/com/thoughtworks/qdox/JavaProjectBuilder.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/FieldsTest.java
- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java
Diff
Modified: trunk/qdox/src/main/java/com/thoughtworks/qdox/JavaProjectBuilder.java (1315 => 1316)
--- trunk/qdox/src/main/java/com/thoughtworks/qdox/JavaProjectBuilder.java 2011-09-10 13:46:11 UTC (rev 1315) +++ trunk/qdox/src/main/java/com/thoughtworks/qdox/JavaProjectBuilder.java 2011-09-10 14:11:04 UTC (rev 1316) @@ -257,7 +257,7 @@ * @see #addSourceFolder(File) * @see #addSourceTree(File) */ - public List<JavaClass> getClasses() + public Collection<JavaClass> getClasses() { return classLibraryBuilder.getClassLibrary().getJavaClasses(); } @@ -282,7 +282,7 @@ * @see #addSourceFolder(File) * @see #addSourceTree(File) */ - public List<JavaPackage> getPackages() + public Collection<JavaPackage> getPackages() { return classLibraryBuilder.getClassLibrary().getJavaPackages(); }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java (1315 => 1316)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java 2011-09-10 13:46:11 UTC (rev 1315) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsModelTest.java 2011-09-10 14:11:04 UTC (rev 1316) @@ -216,8 +216,8 @@ String source = "@javax.xml.bind.annotation.XmlSchema(namespace = \"http://docs.oasis-open.org/wsn/br-2\")\n" + "package org.oasis_open.docs.wsn.br_2;\n" + "public class Foo {}"; - builder.addSource(new StringReader(source)); - JavaPackage jPackage = builder.getClasses().get(0).getPackage(); + JavaClass cls = builder.addSource(new StringReader(source)).getClasses().get( 0 ); + JavaPackage jPackage = cls.getPackage(); assertEquals("org.oasis_open.docs.wsn.br_2", jPackage.getName()); assertEquals("javax.xml.bind.annotation.XmlSchema", jPackage.getAnnotations().get(0).getType().getValue()); assertEquals(2, jPackage.getLineNumber());
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java (1315 => 1316)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java 2011-09-10 13:46:11 UTC (rev 1315) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/AnnotationsTest.java 2011-09-10 14:11:04 UTC (rev 1316) @@ -205,8 +205,8 @@ public void testEmptyParameterListAnnotation() throws Exception { String source = "@MyAnnotation()\n" + "public class MyClass {}"; - builder.addSource(new StringReader(source)); - assertEquals("MyAnnotation", builder.getClasses().get(0).getAnnotations().get(0).getType().getValue()); + JavaClass cls = builder.addSource(new StringReader(source)).getClasses().get(0); + assertEquals("MyAnnotation", cls.getAnnotations().get(0).getType().getValue()); } public void testMethodAnnotationBeforeComment() throws Exception { @@ -217,9 +217,9 @@ " */" + " public boolean isPostback() { return true;}\n" + "}"; - builder.addSource(new StringReader(source)); - assertEquals("Override", builder.getClasses().get(0).getMethods().get(0).getAnnotations().get(0).getType().getValue()); - assertEquals("java.lang.Override", builder.getClasses().get(0).getMethods().get(0).getAnnotations().get(0).getType().getFullyQualifiedName()); + JavaClass cls = builder.addSource(new StringReader(source)).getClasses().get(0); + assertEquals("Override", cls.getMethods().get(0).getAnnotations().get(0).getType().getValue()); + assertEquals("java.lang.Override", cls.getMethods().get(0).getAnnotations().get(0).getType().getFullyQualifiedName()); } public void testEnumsWithAnnotations() throws Exception { @@ -239,8 +239,8 @@ " @NativeAccessible\n" + " static void get_tmp_dir( String targetfilename, @ParamInfo( direction = ParamInfo.Direction.OUT ) byte[] tmpDirOutput ) throws IOException {}\n" + "}"; - builder.addSource( new StringReader( source ) ); - JavaMethod jMethod = builder.getClasses().get(0).getMethods().get(0); + JavaClass cls = builder.addSource( new StringReader( source ) ).getClasses().get(0) ; + JavaMethod jMethod = cls.getMethods().get(0); assertEquals( "NativeAccessible", jMethod.getAnnotations().get(0).getType().getValue() ); JavaAnnotation annotation = jMethod.getParameters().get(1).getAnnotations().get(0); assertEquals( "ParamInfo", annotation.getType().getValue() ); @@ -253,10 +253,10 @@ " @SuppressWarnings( s )\n" + " public void testNothing() { }\n " + "}"; - builder.addSource( new StringReader( source ) ); - JavaMethod method = builder.getClasses().get(0).getMethods().get(0); + JavaClass cls = builder.addSource( new StringReader( source ) ).getClasses().get( 0 ); + JavaMethod method = cls.getMethods().get(0); FieldRef suppressWarnings = (FieldRef) method.getAnnotations().get(0).getProperty( "value" ); - assertEquals( builder.getClasses().get(0).getFields().get(0), suppressWarnings.getField()); + assertEquals( cls.getFields().get(0), suppressWarnings.getField()); } public void testDoubleEscapedString() throws Exception {
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/FieldsTest.java (1315 => 1316)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/FieldsTest.java 2011-09-10 13:46:11 UTC (rev 1315) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/FieldsTest.java 2011-09-10 14:11:04 UTC (rev 1316) @@ -56,8 +56,8 @@ "private String uDI = null;\n" + "}"; - builder.addSource(new StringReader(source)); - JavaField field = builder.getClasses().get(0).getFields().get(0); + JavaClass cls = builder.addSource(new StringReader(source)).getClasses().get(0); + JavaField field = cls.getFields().get(0); assertEquals("null", field.getInitializationExpression()); } @@ -69,8 +69,8 @@ " */\r\n" + " private Bla bla;" + "}"; - builder.addSource( new StringReader( source ) ); - JavaField field = builder.getClasses().get(0).getFields().get(0); + JavaClass cls = builder.addSource( new StringReader( source ) ).getClasses().get(0); + JavaField field = cls.getFields().get(0); assertEquals( "", field.getComment() ); assertEquals( 2, field.getTags().size() ); } @@ -84,8 +84,8 @@ " */\r\n" + " private Bla bla;" + "}"; - builder.addSource( new StringReader( source ) ); - JavaField field = builder.getClasses().get(0).getFields().get(0); + JavaClass cls = builder.addSource( new StringReader( source ) ).getClasses().get(0); + JavaField field = cls.getFields().get(0); assertEquals( "Being Lazy Always", field.getComment() ); assertEquals( 2, field.getTags().size() ); } @@ -102,8 +102,8 @@ " */\r\n" + " private Bla bla;" + "}"; - builder.addSource( new StringReader( source ) ); - JavaField field = builder.getClasses().get(0).getFields().get(0); + JavaClass cls = builder.addSource( new StringReader( source ) ).getClasses().get(0); + JavaField field = cls.getFields().get(0); assertEquals( "Being\r\nLazy\r\nAlways", field.getComment() ); assertEquals( 2, field.getTags().size() ); }
Modified: trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java (1315 => 1316)
--- trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-09-10 13:46:11 UTC (rev 1315) +++ trunk/qdox/src/test/java/com/thoughtworks/qdox/JavaProjectBuilderTest.java 2011-09-10 14:11:04 UTC (rev 1316) @@ -124,17 +124,16 @@ public void testGetClasses() { builder.addSource(new StringReader(createOuter())); - List<JavaClass> classes = builder.getClasses(); + Collection<JavaClass> classes = builder.getClasses(); assertEquals(2, classes.size()); } public void testGetPackagesShowsOnePackageAndTwoClasses() { builder.addSourceTree(new File("target/test-source")); - List<JavaPackage> packages = builder.getPackages(); + Collection<JavaPackage> packages = builder.getPackages(); assertEquals(2, packages.size()); - JavaPackage comBlah = packages.get(0); - assertEquals("com.blah", comBlah.getName()); - JavaPackage comBlahSubpackage = packages.get(1); + JavaPackage comBlah = builder.getPackageByName( "com.blah" ); + JavaPackage comBlahSubpackage = builder.getPackageByName( "com.blah.subpackage" ); assertEquals("com.blah.subpackage", comBlahSubpackage.getName()); List<JavaClass> classes = comBlahSubpackage.getClasses(); assertEquals(1, classes.size()); @@ -1054,8 +1053,7 @@ " b = 2,\n" + " /** etc */\n" + " c = 3; }"; - builder.addSource(new StringReader(sourceCode)); - JavaClass javaClass = builder.getClasses().get(0); + JavaClass javaClass = builder.addSource(new StringReader(sourceCode)).getClasses().get(0); JavaField fieldA = javaClass.getFieldByName("a"); assertEquals("some doc", fieldA.getComment()); JavaField fieldB = javaClass.getFields().get(1); @@ -1119,8 +1117,7 @@ "*/\n" + "public class TestClassImpl {\r\n" + "}"; - builder.addSource(new StringReader(sourceCode)); - JavaClass jClass = builder.getClasses().get(0); + JavaClass jClass = builder.addSource(new StringReader(sourceCode)).getClasses().get(0); assertEquals( Arrays.asList( new String[] {"name=TestClass","attrs=Something1,Something2,Something3"}), jClass.getTags().get(0).getParameters()); //assertTrue( Arrays.equals( new String[] {"name=TestClass","attrs=Something1,Something2,Something3"}, jClass.getTags()[0].getParameters() )); } @@ -1327,8 +1324,7 @@ " public void method1() { \n" + " }\n" + "}"; - builder.addSource( new StringReader( source ) ); - JavaClass clazz = builder.getClasses().get(0); + JavaClass clazz = builder.addSource( new StringReader( source ) ).getClasses().get(0); assertEquals( 3, clazz.getMethods().get(0).getLineNumber() ); assertEquals( 9, clazz.getMethods().get(1).getLineNumber() ); } @@ -1374,8 +1370,7 @@ String source = "package com.foo;\b" + "public class Outer {\n" + "public class Inner {\n" + "public class Core {}\n" + "}\n" + "}\n"; - builder.addSource( new StringReader( source ) ); - JavaClass cls = builder.getClasses().get( 0 ); + JavaClass cls = builder.addSource( new StringReader( source ) ).getClasses().get( 0 ); assertEquals( "com.foo.Outer", cls.getFullyQualifiedName() ); assertEquals( "com.foo.Outer", cls.getCanonicalName() ); cls = cls.getNestedClassByName( "Inner" );
To unsubscribe from this list please visit:
