- Revision
- 752
- Author
- rfscholte
- Date
- 2010-09-27 15:33:31 -0500 (Mon, 27 Sep 2010)
Log Message
Copied tests from ClassLibraryTest to ClassLoaderLibraryTest
Modified Paths
- trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java
- trunk/qdox/src/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java
- trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java
Added Paths
- trunk/qdox/src/test/com/thoughtworks/qdox/library/
- trunk/qdox/src/test/com/thoughtworks/qdox/library/ClassLoaderLibraryTest.java
Diff
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java (751 => 752)
--- trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java 2010-09-27 19:51:14 UTC (rev 751) +++ trunk/qdox/src/java/com/thoughtworks/qdox/JavaClassContext.java 2010-09-27 20:33:31 UTC (rev 752) @@ -24,6 +24,10 @@ private JavaDocBuilder builder; private Map packageMap = new HashMap(); // <String, JavaPackage> + public JavaClassContext(){ + cache = new DefaultJavaClassCache(); + } + public JavaClassContext(JavaDocBuilder builder) { this.builder = builder; this.cache = new DefaultJavaClassCache();
Modified: trunk/qdox/src/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java (751 => 752)
--- trunk/qdox/src/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java 2010-09-27 19:51:14 UTC (rev 751) +++ trunk/qdox/src/java/com/thoughtworks/qdox/library/AbstractClassLibrary.java 2010-09-27 20:33:31 UTC (rev 752) @@ -1,6 +1,7 @@ package com.thoughtworks.qdox.library; import com.thoughtworks.qdox.JavaClassContext; +import com.thoughtworks.qdox.JavaDocBuilder; import com.thoughtworks.qdox.model.JavaClass; public abstract class AbstractClassLibrary @@ -8,7 +9,7 @@ { private ClassLibrary parent; - private JavaClassContext context; + private JavaClassContext context = new JavaClassContext(); public AbstractClassLibrary() {
Added: trunk/qdox/src/test/com/thoughtworks/qdox/library/ClassLoaderLibraryTest.java (0 => 752)
--- trunk/qdox/src/test/com/thoughtworks/qdox/library/ClassLoaderLibraryTest.java (rev 0) +++ trunk/qdox/src/test/com/thoughtworks/qdox/library/ClassLoaderLibraryTest.java 2010-09-27 20:33:31 UTC (rev 752) @@ -0,0 +1,44 @@ +package com.thoughtworks.qdox.library; + +import junit.framework.TestCase; + +import com.thoughtworks.qdox.model.JavaClass; + +public class ClassLoaderLibraryTest + extends TestCase +{ + + private ClassLoaderLibrary classLoaderLibrary; + + protected void setUp() + throws Exception + { + classLoaderLibrary = new ClassLoaderLibrary(new ClassLibrary() + { + public JavaClass getJavaClass( String name ) + { + return null; + } + }); + } + + public void testNoClassLoaders() throws Exception { + assertNull( classLoaderLibrary.getJavaClass( "java.lang.String") ); + } + + public void testWithClassLoader() throws Exception { + classLoaderLibrary.addClassLoader(getClass().getClassLoader()); + assertNotNull(classLoaderLibrary.getJavaClass("java.lang.String")); + assertNotNull(classLoaderLibrary.getJavaClass("java.util.Collection")); + assertNull(classLoaderLibrary.getJavaClass("java.util.GoatCrusher")); + } + + public void testDefaultClassLoader() throws Exception { + classLoaderLibrary.addDefaultLoader(); + assertNotNull(classLoaderLibrary.getJavaClass( "java.lang.String")); + assertNotNull(classLoaderLibrary.getJavaClass("java.util.Collection")); + assertNotNull(classLoaderLibrary.getJavaClass("java.util.Map$Entry")); + assertNull(classLoaderLibrary.getJavaClass("java.util.GoatCrusher")); + } + +} Property changes on: trunk/qdox/src/test/com/thoughtworks/qdox/library/ClassLoaderLibraryTest.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java (751 => 752)
--- trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java 2010-09-27 19:51:14 UTC (rev 751) +++ trunk/qdox/src/test/com/thoughtworks/qdox/model/ClassLibraryTest.java 2010-09-27 20:33:31 UTC (rev 752) @@ -46,11 +46,17 @@ assertEquals(4, all.size()); } + /** + * @deprecated Moved to ClassLoaderLibraryTest + */ public void testNoClassLoaders() throws Exception { ClassLibrary c = new ClassLibrary(); assertTrue(!c.contains("java.lang.String")); } + /** + * @deprecated Moved to ClassLoaderLibraryTest + */ public void testWithClassLoader() throws Exception { ClassLibrary c = new ClassLibrary(); c.addClassLoader(getClass().getClassLoader()); @@ -59,6 +65,9 @@ assertTrue(!c.contains("java.util.GoatCrusher")); } + /** + * @deprecated Moved to ClassLoaderLibraryTest + */ public void testDefaultClassLoader() throws Exception { ClassLibrary c = new ClassLibrary(); c.addDefaultLoader();
To unsubscribe from this list please visit:
