7080464: langtools regression test failures when assertions are enabled

Fri, 22 Mar 2013 10:08:46 -0700

author
darcy
date
Fri, 22 Mar 2013 10:08:46 -0700
changeset 1657
f4500abff1fd
parent 1656
5da12e8a59ba
child 1659
65e1ca8dcdc7

7080464: langtools regression test failures when assertions are enabled
Reviewed-by: jjg

test/tools/javac/api/TestJavacTaskScanner.java file | annotate | diff | comparison | revisions
test/tools/javac/diags/MessageFile.java file | annotate | diff | comparison | revisions
test/tools/javac/diags/MessageInfo.java file | annotate | diff | comparison | revisions
     1.1 --- a/test/tools/javac/api/TestJavacTaskScanner.java	Fri Mar 22 12:44:48 2013 +0000
     1.2 +++ b/test/tools/javac/api/TestJavacTaskScanner.java	Fri Mar 22 10:08:46 2013 -0700
     1.3 @@ -179,7 +179,6 @@
     1.4  
     1.5          @Override
     1.6          public Scanner newScanner(CharSequence input, boolean keepDocComments) {
     1.7 -            assert !keepDocComments;
     1.8              if (input instanceof CharBuffer) {
     1.9                  return new MyScanner(this, (CharBuffer)input, test);
    1.10              } else {
    1.11 @@ -190,7 +189,6 @@
    1.12  
    1.13          @Override
    1.14          public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) {
    1.15 -            assert !keepDocComments;
    1.16              return new MyScanner(this, input, inputLength, test);
    1.17          }
    1.18  
     2.1 --- a/test/tools/javac/diags/MessageFile.java	Fri Mar 22 12:44:48 2013 +0000
     2.2 +++ b/test/tools/javac/diags/MessageFile.java	Fri Mar 22 10:08:46 2013 -0700
     2.3 @@ -65,7 +65,7 @@
     2.4          }
     2.5  
     2.6          void insertAfter(Line l) {
     2.7 -            assert prev == null && next == null;
     2.8 +            assert l.prev == null && l.next == null;
     2.9              l.prev = this;
    2.10              l.next = next;
    2.11              if (next == null)
    2.12 @@ -82,7 +82,7 @@
    2.13          }
    2.14  
    2.15          void insertBefore(Line l) {
    2.16 -            assert prev == null && next == null;
    2.17 +            assert l.prev == null && l.next == null;
    2.18              l.prev = prev;
    2.19              l.next = this;
    2.20              if (prev == null)
     3.1 --- a/test/tools/javac/diags/MessageInfo.java	Fri Mar 22 12:44:48 2013 +0000
     3.2 +++ b/test/tools/javac/diags/MessageInfo.java	Fri Mar 22 10:08:46 2013 -0700
     3.3 @@ -409,5 +409,3 @@
     3.4      }
     3.5  
     3.6  }
     3.7 -
     3.8 -

mercurial