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