commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: r1346585 - /commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/
Date Tue, 05 Jun 2012 20:58:58 GMT
Author: dblevins
Date: Tue Jun  5 20:58:57 2012
New Revision: 1346585

URL: http://svn.apache.org/viewvc?rev=1346585&view=rev
Log:
Renamed for clarity

Added:
    commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderDepthTest.java
  (contents, props changed)
      - copied, changed from r1346577, commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderDepthTest.java
    commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderSelectTest.java
      - copied, changed from r1346577, commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/FinderSelectTest.java
    commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderTest.java
  (contents, props changed)
      - copied, changed from r1346579, commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderTest.java
Removed:
    commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderDepthTest.java
    commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderTest.java
    commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/FinderSelectTest.java
Modified:
    commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ResourceFinderTest.java

Copied: commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderDepthTest.java
(from r1346577, commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderDepthTest.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderDepthTest.java?p2=commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderDepthTest.java&p1=commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderDepthTest.java&r1=1346577&r2=1346585&rev=1346585&view=diff
==============================================================================
--- commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderDepthTest.java
(original)
+++ commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderDepthTest.java
Tue Jun  5 20:58:57 2012
@@ -25,7 +25,7 @@ import org.apache.commons.classscan.find
 /**
  * @version $Rev$ $Date$
  */
-public class ClassFinderDepthTest extends TestCase {
+public class AnnotationFinderDepthTest extends TestCase {
 
 
     public static interface Hue<T> {

Propchange: commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderDepthTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderSelectTest.java
(from r1346577, commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/FinderSelectTest.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderSelectTest.java?p2=commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderSelectTest.java&p1=commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/FinderSelectTest.java&r1=1346577&r2=1346585&rev=1346585&view=diff
==============================================================================
--- commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/FinderSelectTest.java
(original)
+++ commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderSelectTest.java
Tue Jun  5 20:58:57 2012
@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * @version $Rev$ $Date$
  */
-public class FinderSelectTest {
+public class AnnotationFinderSelectTest {
 
     @Test
     public void test() throws Exception {

Copied: commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderTest.java
(from r1346579, commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderTest.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderTest.java?p2=commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderTest.java&p1=commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderTest.java&r1=1346579&r2=1346585&rev=1346585&view=diff
==============================================================================
--- commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ClassFinderTest.java
(original)
+++ commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderTest.java
Tue Jun  5 20:58:57 2012
@@ -52,7 +52,7 @@ import org.apache.commons.classscan.find
  * @author David Blevins
  * @version $Rev$ $Date$
  */
-public class ClassFinderTest extends TestCase {
+public class AnnotationFinderTest extends TestCase {
     private AnnotationFinder classFinder;
 
 

Propchange: commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/AnnotationFinderTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ResourceFinderTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ResourceFinderTest.java?rev=1346585&r1=1346584&r2=1346585&view=diff
==============================================================================
--- commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ResourceFinderTest.java
(original)
+++ commons/sandbox/classscan/branches/commons-finder/src/test/java/org/apache/commons/classscan/finder/ResourceFinderTest.java
Tue Jun  5 20:58:57 2012
@@ -374,34 +374,6 @@ public class ResourceFinderTest extends 
         assertNotNull(beansXmlUrl);
     }
 
-
-    private static void readJarEntries(URL location, String basePath, Map<String, URL>
resources) throws IOException {
-        JarURLConnection conn = (JarURLConnection) location.openConnection();
-        JarFile jarfile = null;
-        jarfile = conn.getJarFile();
-
-        Enumeration<JarEntry> entries = jarfile.entries();
-        while (entries != null && entries.hasMoreElements()) {
-            JarEntry entry = entries.nextElement();
-            String name = entry.getName();
-
-            if (entry.isDirectory() || !name.startsWith(basePath) || name.length() == basePath.length())
{
-                continue;
-            }
-
-            name = name.substring(basePath.length());
-
-            if (name.contains("/")) {
-                continue;
-            }
-
-            URL resource = new URL(location, name);
-            resources.put(name, resource);
-        }
-    }
-
-
-
     private void validateSimpsons(Properties properties) {
         assertEquals("props size", 6, properties.size());
         assertEquals("creator", "Matt Groening", properties.getProperty("creator"));
@@ -422,49 +394,4 @@ public class ResourceFinderTest extends 
         assertEquals("baby", "Stewie", properties.getProperty("baby"));
     }
 
-
-    /*
-     * Disable test because it's failing its purpose:
-     *   - when running in maven in a clean build, no urls are found
-     *       so the test runs with the ResourceFinder using the classloader
-     *       instead of urls
-     *   - when running on a non clean build in maven, one url is found,
-     *       but the test fails
-
-    public void testUrlConstructor() throws Exception {
-        List<URL> all = resourceFinder.findAll("MANIFEST.MF");
-
-        List<URL> urls = new ArrayList();
-        for (URL url : all) {
-            if (url.getPath().contains("xbean-finder")){
-                urls.add(url);
-            }
-        }
-
-        resourceFinder = new ResourceFinder("META-INF/", urls.toArray(new URL[]{}));
-        testGetResourcesMap1();
-        testGetResourcesMap2();
-        testFindString();
-        testFindAllStrings();
-        testFindAvailableStrings();
-        testMapAllStrings();
-        testMapAvailableStrings();
-        testFindClass();
-        testFindAllClasses();
-        testFindAvailableClasses();
-        testMapAllClasses();
-        testMapAvailableClasses();
-        testFindImplementation();
-        testFindAllImplementations();
-        testMapAllImplementations();
-        testMapAvailableImplementations();
-        testFindProperties();
-        testFindAllProperties();
-        testFindAvailableProperties();
-        testMapAllProperties();
-        testMapAvailableProperties();
-    }
-    */
-
-
 }



Mime
View raw message