1.1 --- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Sat Dec 29 19:42:47 2012 +0100
     1.2 +++ b/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Tue Jan 22 11:59:25 2013 +0100
     1.3 @@ -74,23 +74,8 @@
     1.4          }
     1.5          
     1.6          for (Method m : arr) {
     1.7 -            Compare c = m.getAnnotation(Compare.class);
     1.8 -            if (c == null) {
     1.9 -                continue;
    1.10 -            }
    1.11 -            final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null);
    1.12 -            final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript());
    1.13 -            ret.add(real);
    1.14 -            ret.add(js);
    1.15 -            ret.add(new CompareCase(m, real, js));
    1.16 -
    1.17 -            for (String b : brwsr) {
    1.18 -                final Launcher s = l.brwsr(b);
    1.19 -                ret.add(s);
    1.20 -                final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s);
    1.21 -                ret.add(cse);
    1.22 -                ret.add(new CompareCase(m, real, cse));
    1.23 -            }
    1.24 +            registerCompareCases(m, l, ret, brwsr);
    1.25 +            registerBrwsrCases(m, l, ret, brwsr);
    1.26          }
    1.27          return ret.toArray();
    1.28      }
    1.29 @@ -123,4 +108,40 @@
    1.30      public String getTestName() {
    1.31          return m.getName() + "[Compare " + second.typeName() + "]";
    1.32      }
    1.33 +    
    1.34 +    private static void registerCompareCases(Method m, final LaunchSetup l, List<Object> ret, String[] brwsr) {
    1.35 +        Compare c = m.getAnnotation(Compare.class);
    1.36 +        if (c == null) {
    1.37 +            return;
    1.38 +        }
    1.39 +        final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null, false);
    1.40 +        final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript(), false);
    1.41 +        ret.add(real);
    1.42 +        ret.add(js);
    1.43 +        ret.add(new CompareCase(m, real, js));
    1.44 +        for (String b : brwsr) {
    1.45 +            final Launcher s = l.brwsr(b);
    1.46 +            ret.add(s);
    1.47 +            final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s, false);
    1.48 +            ret.add(cse);
    1.49 +            ret.add(new CompareCase(m, real, cse));
    1.50 +        }
    1.51 +    }
    1.52 +    private static void registerBrwsrCases(Method m, final LaunchSetup l, List<Object> ret, String[] brwsr) {
    1.53 +        BrwsrTest c = m.getAnnotation(BrwsrTest.class);
    1.54 +        if (c == null) {
    1.55 +            return;
    1.56 +        }
    1.57 +        if (brwsr.length == 0) {
    1.58 +            final Launcher s = l.brwsr(null);
    1.59 +            ret.add(s);
    1.60 +            ret.add(new Bck2BrwsrCase(m, "Brwsr", s, true));
    1.61 +        } else {
    1.62 +            for (String b : brwsr) {
    1.63 +                final Launcher s = l.brwsr(b);
    1.64 +                ret.add(s);
    1.65 +                ret.add(new Bck2BrwsrCase(m, b, s, true));
    1.66 +            }
    1.67 +        }
    1.68 +    }
    1.69  }