Changeset 429 for trunk/icedtea-web/tests/junit-runner

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

Location:

trunk/icedtea-web/tests/junit-runner

Files:

• CommandLine.java (modified) (2 diffs)
• JunitLikeXmlOutputListener.java (modified) (11 diffs)
• LessVerboseTextListener.java (modified) (8 diffs)

trunk/icedtea-web/tests/junit-runner/CommandLine.java

@@ -27 +27 @@
     public static void runMainAndExit(JUnitSystem system, String... args) {
         new CommandLine().runMain(system, args);
-        system.exit(0);
+        System.exit(0);
     }
 
-    @Override
     public Result runMain(JUnitSystem system, String... args) {
         List<Class<?>> classes = new ArrayList<Class<?>>();
@@ -47 +46 @@
         RunListener listener = new LessVerboseTextListener(system);
         addListener(listener);
-        Result result = run(classes.toArray(new Class[0]));
+        Result result = run(classes.toArray(new Class<?>[0]));
         for (Failure each : missingClasses) {
             result.getFailures().add(each);

trunk/icedtea-web/tests/junit-runner/JunitLikeXmlOutputListener.java

@@ -21 +21 @@
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 import net.sourceforge.jnlp.annotations.Bug;
 import net.sourceforge.jnlp.annotations.KnownToFail;
+import net.sourceforge.jnlp.annotations.Remote;
+import net.sourceforge.jnlp.browsertesting.Browsers;
 
 
@@ -50 +53 @@
     private static final String BUG = "bug";
     private static final String K2F = "known-to-fail";
+    private static final String REMOTE = "remote";
     private static final String TEST_NAME_ATTRIBUTE = "name";
     private static final String TEST_TIME_ATTRIBUTE = "time";
@@ -77 +81 @@
     private class ClassStat {
 
-        Class c;
+        Class<?> c;
         int total;
         int failed;
@@ -173 +177 @@
         testDone(description, testTime, testTimeSeconds, false);
     }
-
+    
+
+    @SuppressWarnings("unchecked")
     private void testDone(Description description, long testTime, double testTimeSeconds, boolean ignored) throws Exception {
-        Class testClass = null;
+        Class<?> testClass = null;
         Method testMethod = null;
         try {
@@ -198 +204 @@
             testcaseAtts.put(TEST_IGNORED_ATTRIBUTE, Boolean.TRUE.toString());
         }
-        KnownToFail k2f=null;
-        try {
-            if (testClass != null && testMethod != null) {
-                k2f = testMethod.getAnnotation(KnownToFail.class);
-                if (k2f != null) {
-                    testcaseAtts.put(K2F, Boolean.TRUE.toString());
-                }
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
+        KnownToFail k2f = LessVerboseTextListener.getAnnotation(testClass, testMethod.getName(), KnownToFail.class);
+        boolean thisTestIsK2F = false;
+        Remote remote =  LessVerboseTextListener.getAnnotation(testClass, testMethod.getName(), Remote.class);
+        if (k2f != null) {
+            //determine if k2f in the current browser
+            //??
+            Browsers[] br = k2f.failsIn();
+            if(0 == br.length){//the KnownToFail annotation without optional parameter
+                thisTestIsK2F = true;
+            }else{
+                for(Browsers b : br){
+                    if(description.toString().contains(b.toString())){
+                        thisTestIsK2F = true;
+                    }
+                }
+            }
+        }
+        if( thisTestIsK2F ) testcaseAtts.put(K2F, Boolean.TRUE.toString());
+        if (remote != null) {
+            testcaseAtts.put(REMOTE, Boolean.TRUE.toString());
+
         }
         openElement(TEST_ELEMENT, testcaseAtts);
         if (testFailed != null) {
-            if (k2f != null) {
+            if (thisTestIsK2F) {
                 failedK2F++;
             }
@@ -226 +243 @@
             writeElement(TEST_ERROR_ELEMENT, testFailed.getTrace(), errorAtts);
         } else {
-            if (k2f != null) {
+            if (thisTestIsK2F) {
                 if (ignored) {
                     ignoredK2F++;
@@ -265 +282 @@
         }
         classStat.total++;
-        if (k2f != null) {
+        if (thisTestIsK2F) {
             classStat.totalK2F++;
         }
@@ -272 +289 @@
             if (ignored) {
                 classStat.ignored++;
-                if (k2f != null) {
+                if (thisTestIsK2F) {
                     classStat.ignoredK2F++;
                 }
             } else {
                 classStat.passed++;
-                if (k2f != null) {
+                if (thisTestIsK2F) {
                     classStat.passedK2F++;
                 }
@@ -283 +300 @@
         } else {
             classStat.failed++;
-            if (k2f != null) {
+            if (thisTestIsK2F) {
                 classStat.failedK2F++;
             }
@@ -290 +307 @@
 
     @Override
+    @SuppressWarnings("unchecked")
     public void testRunFinished(Result result) throws Exception {
 
@@ -320 +338 @@
                 Bug b = null;
                 if (entry.getValue().c != null) {
-                    b = (Bug) entry.getValue().c.getAnnotation(Bug.class);
+                    b = entry.getValue().c.getAnnotation(Bug.class);
                 }
                 if (b != null) {

trunk/icedtea-web/tests/junit-runner/LessVerboseTextListener.java

@@ -7 +7 @@
  */
 import java.io.PrintStream;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import net.sourceforge.jnlp.annotations.KnownToFail;
+import net.sourceforge.jnlp.annotations.Remote;
+import net.sourceforge.jnlp.browsertesting.Browsers;
 
 import org.junit.internal.JUnitSystem;
@@ -38 +41 @@
         writer.println("Ignored: " + description.getClassName() + "." + description.getMethodName());
         printK2F(writer, null, description);
+        printRemote(writer, description);
     }
 
@@ -46 +50 @@
         writer.println("FAILED: " + failure.getTestHeader() + " " + failure.getMessage());
         printK2F(writer,true,failure.getDescription());
+        printRemote(writer, failure.getDescription());
     }
 
@@ -53 +58 @@
             writer.println("Passed: " + description.getClassName() + "." + description.getMethodName());
             printK2F(writer,false,description);
+            printRemote(writer, description);
         }
     }
@@ -70 +76 @@
         try {
             KnownToFail k2f = getK2F(description);
-            if (k2f != null) {
+            boolean thisTestIsK2F = false;
+            if (k2f != null){
+                //determine if k2f in the current browser
+                Browsers[] br = k2f.failsIn();
+                if(0 == br.length){ //@KnownToFail with default optional parameter failsIn={}
+                    thisTestIsK2F = true;
+                }else{
+                    for(Browsers b : br){
+                        if(description.toString().contains(b.toString())){
+                            thisTestIsK2F = true;
+                        }
+                    }
+                }
+            }
+
+            if( thisTestIsK2F ){
                 totalK2F++;
                 if (failed != null) {
@@ -94 +115 @@
     }
 
-    public static  KnownToFail getK2F(Description description) {
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Annotation> T getAnnotation(Class<?> q, String methodName, Class<T> a) {
         try {
-            Class q = description.getTestClass();
             if (q != null) {
-                String qs = description.getMethodName();
+                T rem = q.getAnnotation(a);
+                if (rem != null) {
+                    return rem;
+                }
+                String qs = methodName;
                 if (qs.contains(" - ")) {
                     qs = qs.replaceAll(" - .*", "");
@@ -104 +130 @@
                 Method qm = q.getMethod(qs);
                 if (qm != null) {
-                    KnownToFail k2f = qm.getAnnotation(KnownToFail.class);
-                    return k2f;
+                    rem = qm.getAnnotation(a);
+                    return rem;
 
                 }
@@ -115 +141 @@
     }
 
+    public static KnownToFail getK2F(Description description) {
+        return getAnnotation(description.getTestClass(), description.getMethodName(), KnownToFail.class);
+    }
+
+    public static Remote getRemote(Description description) {
+        return getAnnotation(description.getTestClass(), description.getMethodName(), Remote.class);
+
+    }
+
+    private void printRemote(PrintStream writer, Description description) {
+        try {
+            Remote rem = getRemote(description);
+            if (rem != null) {
+                writer.println(" - This test is running remote content, note that failures may be caused by broken target application or connection");
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
 }