8003650: java.lang.Exception: expected string not found: pkg/package-frame.html

Tue, 20 Nov 2012 07:25:11 -0800

author
jjg
date
Tue, 20 Nov 2012 07:25:11 -0800
changeset 1420
fb97eaf93d61
parent 1419
a25c53e12bd0
child 1421
7538e419a588

8003650: java.lang.Exception: expected string not found: pkg/package-frame.html
Reviewed-by: ksrini

test/tools/javadoc/api/basic/GetTask_WriterTest.java file | annotate | diff | comparison | revisions
test/tools/javadoc/api/basic/RunTest.java file | annotate | diff | comparison | revisions
     1.1 --- a/test/tools/javadoc/api/basic/GetTask_WriterTest.java	Tue Nov 20 07:21:07 2012 -0800
     1.2 +++ b/test/tools/javadoc/api/basic/GetTask_WriterTest.java	Tue Nov 20 07:25:11 2012 -0800
     1.3 @@ -67,8 +67,9 @@
     1.4              String out = sw.toString();
     1.5              System.err.println(">>" + out + "<<");
     1.6              for (String f: standardExpectFiles) {
     1.7 -                if (f.endsWith(".html") && !out.contains(f))
     1.8 -                    throw new Exception("expected string not found: " + f);
     1.9 +                String f1 = f.replace('/', File.separatorChar);
    1.10 +                if (f1.endsWith(".html") && !out.contains(f1))
    1.11 +                    throw new Exception("expected string not found: " + f1);
    1.12              }
    1.13          } else {
    1.14              throw new Exception("task failed");
     2.1 --- a/test/tools/javadoc/api/basic/RunTest.java	Tue Nov 20 07:21:07 2012 -0800
     2.2 +++ b/test/tools/javadoc/api/basic/RunTest.java	Tue Nov 20 07:25:11 2012 -0800
     2.3 @@ -64,8 +64,9 @@
     2.4              checkFiles(outDir, standardExpectFiles);
     2.5              String out = stdout.toString();
     2.6              for (String f: standardExpectFiles) {
     2.7 -                if (f.endsWith(".html") && !out.contains(f))
     2.8 -                    error("expected string not found: " + f);
     2.9 +                String f1 = f.replace('/', File.separatorChar);
    2.10 +                if (f1.endsWith(".html") && !out.contains(f1))
    2.11 +                    error("expected string not found: " + f1);
    2.12              }
    2.13          } else {
    2.14              error("call failed");

mercurial