svn commit: r1196365 - in /tapestry/tapestry5/trunk: tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java

[hlship]

Author: hlship
Date: Tue Nov  1 23:10:33 2011
New Revision: 1196365

URL: http://svn.apache.org/viewvc?rev=1196365&view=rev
Log:
TAP5-1739: Remove use of Javassist as sample used when testing ClassNameLocator

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
    
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java?rev=1196365&r1=1196364&r2=1196365&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/reload/ReloadTests.java
 Tue Nov  1 23:10:33 2011
@@ -74,8 +74,7 @@ public class ReloadTests extends Tapestr
         System.err.println("Created: " + webappDir);
     }
 
-    private void createIndexClass(int number) throws NotFoundException, 
CannotCompileException,
-            IOException
+    private void createIndexClass(int number) throws Exception
     {
         ClassPool pool = new ClassPool(null);
 

Modified: 
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java?rev=1196365&r1=1196364&r2=1196365&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java
 Tue Nov  1 23:10:33 2011
@@ -33,7 +33,7 @@ public class ClassNameLocatorImplTest ex
     private final ClasspathURLConverter converter = new 
ClasspathURLConverterImpl();
 
     /**
-     * Use various packages in javassist to test this, as those don't change 
unexpectedly(-ish) and we know they are in
+     * Use various packages in javax.inject to test this, as those don't 
change unexpectedly(-ish) and we know they are in
      * a JAR on the classpath.
      */
     @Test
@@ -42,17 +42,12 @@ public class ClassNameLocatorImplTest ex
         ClassNameLocator locator = new ClassNameLocatorImpl(converter);
 
         Collection<String> names = locator
-                .locateClassNames("javassist.util");
+                .locateClassNames("javax.inject");
 
+        // Assert a couple of the matched names
         assertInList(
                 names,
-                "javassist.util",
-                "HotSwapper",
-                "Trigger");
-        assertNotInList(
-                names,
-                "javassist.util",
-                "Orderer$1");
+                "javax.inject", "Inject", "Named", "Singleton");
     }
 
     @Test
@@ -60,12 +55,12 @@ public class ClassNameLocatorImplTest ex
     {
         ClassNameLocator locator = new ClassNameLocatorImpl(converter);
 
-        Collection<String> names = locator.locateClassNames("javassist.util");
+        Collection<String> names = locator.locateClassNames("org.slf4j");
 
         assertInList(
                 names,
-                "javassist.util",
-                "proxy.ProxyFactory");
+                "org.slf4j",
+                "spi.MDCAdapter");
 
     }