[infinispan-commits] Infinispan SVN: r1456 - trunk/tools/src/test/java/org/infinispan/test/fwk.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-02-05 13:37:24 -0500 (Fri, 05 Feb 2010)
New Revision: 1456

Modified:
   trunk/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
Log:
Better atAnnotation regexp that ignores comments

Modified: trunk/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java
===================================================================
--- trunk/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java	2010-02-04 22:12:11 UTC (rev 1455)
+++ trunk/tools/src/test/java/org/infinispan/test/fwk/TestNameVerifier.java	2010-02-05 18:37:24 UTC (rev 1456)
@@ -27,15 +27,14 @@
 
    Pattern packageLinePattern = Pattern.compile("package org.infinispan[^;]*");
    Pattern classLinePattern = Pattern.compile("(abstract\\s*)??(public\\s*)(abstract\\s*)??class [^\\s]*");
-   Pattern atAnnotationPattern = Pattern.compile("@Test[^)]*");
+   Pattern atAnnotationPattern = Pattern.compile("$\\s*@Test[^)]*");
    Pattern testNamePattern = Pattern.compile("testName\\s*=\\s*\"[^\"]*\"");
 
    String fileCache;
 
    FilenameFilter javaFilter = new FilenameFilter() {
       public boolean accept(File dir, String name) {
-         if (dir.getAbsolutePath().contains("testng")) return false;
-         return name.endsWith(".java");
+         return !dir.getAbsolutePath().contains("testng") && name.endsWith(".java");
       }
    };
 
@@ -66,7 +65,7 @@
 
    private void persistNewFile(File file, String javaString) throws Exception {
       if (file.delete()) {
-         System.out.println("!!!!!!!!!! error porcessing file " + file.getName());
+         System.out.println("!!!!!!!!!! error processing file " + file.getName());
          return;
       }
       file.createNewFile();
@@ -91,7 +90,7 @@
 
       classNamePart = classNamePart.substring("public class ".length());
       String packagePart = getPackagePart(javaString, filename);
-      //if the test is in org.infinispan package then make sure no . is prepanded
+      //if the test is in org.infinispan package then make sure no . is prepended
       String packagePrepend = ((packagePart != null) && (packagePart.length() > 0)) ? packagePart + "." : "";
       return packagePrepend + classNamePart;
    }
@@ -155,12 +154,6 @@
       }
    }
 
-   private void printFiles(File[] javaFiles) {
-      for (File f : javaFiles) {
-         System.out.println(f.getAbsolutePath());
-      }
-   }
-
    public void verifyTestName() throws Exception {
       File[] javaFiles = getAllJavaFiles();
       StringBuilder errorMessage = new StringBuilder("Following test class(es) do not have an appropriate test names: \n");