Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 58183 invoked from network); 7 Sep 2010 07:09:13 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Sep 2010 07:09:13 -0000 Received: (qmail 78467 invoked by uid 500); 7 Sep 2010 07:09:13 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 78408 invoked by uid 500); 7 Sep 2010 07:09:11 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 78392 invoked by uid 99); 7 Sep 2010 07:09:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Sep 2010 07:09:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Sep 2010 07:09:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5FD412388A41; Tue, 7 Sep 2010 07:08:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r993245 - /sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/testing/TestAll.java Date: Tue, 07 Sep 2010 07:08:50 -0000 To: commits@sling.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100907070850.5FD412388A41@eris.apache.org> Author: fmeschbe Date: Tue Sep 7 07:08:50 2010 New Revision: 993245 URL: http://svn.apache.org/viewvc?rev=993245&view=rev Log: Cleanup and use a single classloader variable only Modified: sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/testing/TestAll.java Modified: sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/testing/TestAll.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/testing/TestAll.java?rev=993245&r1=993244&r2=993245&view=diff ============================================================================== --- sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/testing/TestAll.java (original) +++ sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/testing/TestAll.java Tue Sep 7 07:08:50 2010 @@ -46,45 +46,41 @@ public class TestAll extends TestCase { @SuppressWarnings("unchecked") public static Test suite() { - ClassLoader sysClassLoader = TestAll.class.getClassLoader(); - - - - List matchingClasses = new ArrayList(); + final ClassLoader sysClassLoader = TestAll.class.getClassLoader(); + final List matchingClasses = new ArrayList(); // Get the URLs - URL[] urls = ((URLClassLoader) sysClassLoader).getURLs(); - String testPattern = System.getProperty("integrationTestPattern", - "**/launchpad/webapp/integrationtest/**/*Test"); - String testRegex = convertToRegex(testPattern); - Pattern pattern = Pattern.compile(testRegex); + final URL[] urls = ((URLClassLoader) sysClassLoader).getURLs(); + final String testPattern = System.getProperty("integrationTestPattern", + "**/launchpad/webapp/integrationtest/**/*Test"); + final String testRegex = convertToRegex(testPattern); + final Pattern pattern = Pattern.compile(testRegex); for (URL u : urls) { try { matchingClasses.addAll(scanFile(new File(u.toURI()), pattern)); } catch (URISyntaxException e) { - // TODO Auto-generated catch block e.printStackTrace(); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } - ClassLoader cl = TestAll.class.getClassLoader(); - Set> classSet = new HashSet>(); + final Set> classSet = new HashSet>(); for (String classFile : matchingClasses) { String className = classFileToName(classFile); try { - Class c = (Class) cl.loadClass(className); - if (!c.isInterface() && !Modifier.isAbstract(c.getModifiers()) ) { - LOGGER.info("Added "+className); + final Class c = (Class) sysClassLoader.loadClass(className); + if (!c.isInterface() && !Modifier.isAbstract(c.getModifiers())) { + LOGGER.info("Added " + className); classSet.add(c); } } catch (ClassNotFoundException e) { e.printStackTrace(); } } - LOGGER.info(classSet.size() + " test classes found using Pattern " + testRegex); - TestSuite suite = new LoggingSuite(classSet,"Sling Integration Tests matching "+testPattern,LOGGER); - + LOGGER.info(classSet.size() + " test classes found using Pattern " + + testRegex); + TestSuite suite = new LoggingSuite(classSet, + "Sling Integration Tests matching " + testPattern, LOGGER); + return suite; } @@ -93,9 +89,9 @@ public class TestAll extends TestCase { * @return */ private static String classFileToName(String classFile) { - String className = classFile.substring(0, classFile.length() - (".class".length())) - .replace('/', '.'); - if ( className.charAt(0) == '.' ) { + String className = classFile.substring(0, + classFile.length() - (".class".length())).replace('/', '.'); + if (className.charAt(0) == '.') { className = className.substring(1); } return className; @@ -107,8 +103,8 @@ public class TestAll extends TestCase { */ private static String convertToRegex(String testPattern) { return testPattern.replace("**/", ".a?").replace("*", ".a?").replace( - ".a?", ".*?").replace("/", "\\/") - + "\\.class$"; + ".a?", ".*?").replace("/", "\\/") + + "\\.class$"; } /**