1.1 --- a/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Wed Jan 23 08:42:00 2013 +0100
     1.2 +++ b/vmtest/src/main/java/org/apidesign/bck2brwsr/vmtest/impl/CompareCase.java	Thu Jan 31 17:39:47 2013 +0100
     1.3 @@ -111,17 +111,17 @@
     1.4          if (c == null) {
     1.5              return;
     1.6          }
     1.7 -        final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null, false, null);
     1.8 +        final Bck2BrwsrCase real = new Bck2BrwsrCase(m, "Java", null, false, null, null);
     1.9          ret.add(real);
    1.10          if (c.scripting()) {
    1.11 -            final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript(), false, null);
    1.12 +            final Bck2BrwsrCase js = new Bck2BrwsrCase(m, "JavaScript", l.javaScript(), false, null, null);
    1.13              ret.add(js);
    1.14              ret.add(new CompareCase(m, real, js));
    1.15          }
    1.16          for (String b : brwsr) {
    1.17              final Launcher s = l.brwsr(b);
    1.18              ret.add(s);
    1.19 -            final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s, false, null);
    1.20 +            final Bck2BrwsrCase cse = new Bck2BrwsrCase(m, b, s, false, null, null);
    1.21              ret.add(cse);
    1.22              ret.add(new CompareCase(m, real, cse));
    1.23          }
    1.24 @@ -135,16 +135,19 @@
    1.25          if (f == null) {
    1.26              f = m.getDeclaringClass().getAnnotation(HtmlFragment.class);
    1.27          }
    1.28 -        String html = f == null ? null : f.value();
    1.29 +        HttpResource r = m.getAnnotation(HttpResource.class);
    1.30 +        if (r == null) {
    1.31 +            r = m.getDeclaringClass().getAnnotation(HttpResource.class);
    1.32 +        }
    1.33          if (brwsr.length == 0) {
    1.34              final Launcher s = l.brwsr(null);
    1.35              ret.add(s);
    1.36 -            ret.add(new Bck2BrwsrCase(m, "Brwsr", s, true, html));
    1.37 +            ret.add(new Bck2BrwsrCase(m, "Brwsr", s, true, f, r));
    1.38          } else {
    1.39              for (String b : brwsr) {
    1.40                  final Launcher s = l.brwsr(b);
    1.41                  ret.add(s);
    1.42 -                ret.add(new Bck2BrwsrCase(m, b, s, true, html));
    1.43 +                ret.add(new Bck2BrwsrCase(m, b, s, true, f, r));
    1.44              }
    1.45          }
    1.46      }