changeset 2357:f4500abff1fd

7080464: langtools regression test failures when assertions are enabled Reviewed-by: jjg
author darcy
date Fri, 22 Mar 2013 10:08:46 -0700
parents 5da12e8a59ba
children 03102c640d53 65e1ca8dcdc7
files test/tools/javac/api/TestJavacTaskScanner.java test/tools/javac/diags/MessageFile.java test/tools/javac/diags/MessageInfo.java
diffstat 3 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/api/TestJavacTaskScanner.java	Fri Mar 22 12:44:48 2013 +0000
+++ b/test/tools/javac/api/TestJavacTaskScanner.java	Fri Mar 22 10:08:46 2013 -0700
@@ -179,7 +179,6 @@
 
         @Override
         public Scanner newScanner(CharSequence input, boolean keepDocComments) {
-            assert !keepDocComments;
             if (input instanceof CharBuffer) {
                 return new MyScanner(this, (CharBuffer)input, test);
             } else {
@@ -190,7 +189,6 @@
 
         @Override
         public Scanner newScanner(char[] input, int inputLength, boolean keepDocComments) {
-            assert !keepDocComments;
             return new MyScanner(this, input, inputLength, test);
         }
 
--- a/test/tools/javac/diags/MessageFile.java	Fri Mar 22 12:44:48 2013 +0000
+++ b/test/tools/javac/diags/MessageFile.java	Fri Mar 22 10:08:46 2013 -0700
@@ -65,7 +65,7 @@
         }
 
         void insertAfter(Line l) {
-            assert prev == null && next == null;
+            assert l.prev == null && l.next == null;
             l.prev = this;
             l.next = next;
             if (next == null)
@@ -82,7 +82,7 @@
         }
 
         void insertBefore(Line l) {
-            assert prev == null && next == null;
+            assert l.prev == null && l.next == null;
             l.prev = prev;
             l.next = this;
             if (prev == null)
--- a/test/tools/javac/diags/MessageInfo.java	Fri Mar 22 12:44:48 2013 +0000
+++ b/test/tools/javac/diags/MessageInfo.java	Fri Mar 22 10:08:46 2013 -0700
@@ -409,5 +409,3 @@
     }
 
 }
-
-