changeset 48443:1a049cfcdc83 datum

fixing some failing tests
author vromero
date Tue, 12 Dec 2017 21:08:36 -0500
parents 0bfcdc878c1b
children 2c9da8ee0983
files test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out test/langtools/tools/javac/enum/EnumMembersOrder.out test/langtools/tools/javac/parser/JavacParserTest.java test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out test/langtools/tools/javac/parser/extend/TrialParser.java
diffstat 7 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out	Tue Dec 12 20:04:06 2017 -0500
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedImport.out	Tue Dec 12 21:08:36 2017 -0500
@@ -1,7 +1,7 @@
 AnnotatedImport.java:10:13: compiler.err.expected: token.identifier
-AnnotatedImport.java:10:16: compiler.err.expected4: class, interface, enum, __datum
+AnnotatedImport.java:10:16: compiler.err.expected4: class, interface, enum, record
 AnnotatedImport.java:11:7: compiler.err.expected: token.identifier
-AnnotatedImport.java:11:11: compiler.err.expected4: class, interface, enum, __datum
+AnnotatedImport.java:11:11: compiler.err.expected4: class, interface, enum, record
 AnnotatedImport.java:12:18: compiler.err.expected: token.identifier
-AnnotatedImport.java:12:21: compiler.err.expected4: class, interface, enum, __datum
+AnnotatedImport.java:12:21: compiler.err.expected4: class, interface, enum, record
 6 errors
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out	Tue Dec 12 20:04:06 2017 -0500
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage1.out	Tue Dec 12 21:08:36 2017 -0500
@@ -1,3 +1,3 @@
 AnnotatedPackage1.java:9:14: compiler.err.expected: token.identifier
-AnnotatedPackage1.java:9:17: compiler.err.expected4: class, interface, enum, __datum
+AnnotatedPackage1.java:9:17: compiler.err.expected4: class, interface, enum, record
 2 errors
--- a/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out	Tue Dec 12 20:04:06 2017 -0500
+++ b/test/langtools/tools/javac/annotations/typeAnnotations/failures/AnnotatedPackage2.out	Tue Dec 12 21:08:36 2017 -0500
@@ -1,3 +1,3 @@
 AnnotatedPackage2.java:9:8: compiler.err.expected: token.identifier
-AnnotatedPackage2.java:9:12: compiler.err.expected4: class, interface, enum, __datum
+AnnotatedPackage2.java:9:12: compiler.err.expected4: class, interface, enum, record
 2 errors
--- a/test/langtools/tools/javac/enum/EnumMembersOrder.out	Tue Dec 12 20:04:06 2017 -0500
+++ b/test/langtools/tools/javac/enum/EnumMembersOrder.out	Tue Dec 12 21:08:36 2017 -0500
@@ -1,7 +1,7 @@
 EnumMembersOrder.java:11:16: compiler.err.expected: ')'
 EnumMembersOrder.java:11:17: compiler.err.expected3: ',', '}', ';'
 EnumMembersOrder.java:11:18: compiler.err.expected: '}'
-EnumMembersOrder.java:11:31: compiler.err.expected4: class, interface, enum, __datum
-EnumMembersOrder.java:17:13: compiler.err.expected4: class, interface, enum, __datum
-EnumMembersOrder.java:19:1: compiler.err.expected4: class, interface, enum, __datum
+EnumMembersOrder.java:11:31: compiler.err.expected4: class, interface, enum, record
+EnumMembersOrder.java:17:13: compiler.err.expected4: class, interface, enum, record
+EnumMembersOrder.java:19:1: compiler.err.expected4: class, interface, enum, record
 6 errors
--- a/test/langtools/tools/javac/parser/JavacParserTest.java	Tue Dec 12 20:04:06 2017 -0500
+++ b/test/langtools/tools/javac/parser/JavacParserTest.java	Tue Dec 12 21:08:36 2017 -0500
@@ -993,7 +993,7 @@
     @Test //JDK-8065753
     void testWrongFirstToken() throws IOException {
         String code = "<";
-        String expectedErrors = "Test.java:1:1: compiler.err.expected4: class, interface, enum, __datum\n" +
+        String expectedErrors = "Test.java:1:1: compiler.err.expected4: class, interface, enum, record\n" +
                                 "1 error\n";
         StringWriter out = new StringWriter();
         JavacTaskImpl ct = (JavacTaskImpl) tool.getTask(out, fm, null,
--- a/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out	Tue Dec 12 20:04:06 2017 -0500
+++ b/test/langtools/tools/javac/parser/SingleCommaAnnotationValueFail.out	Tue Dec 12 21:08:36 2017 -0500
@@ -1,3 +1,3 @@
 SingleCommaAnnotationValueFail.java:34:12: compiler.err.expected: '}'
-SingleCommaAnnotationValueFail.java:34:14: compiler.err.expected4: class, interface, enum, __datum
+SingleCommaAnnotationValueFail.java:34:14: compiler.err.expected4: class, interface, enum, record
 2 errors
--- a/test/langtools/tools/javac/parser/extend/TrialParser.java	Tue Dec 12 20:04:06 2017 -0500
+++ b/test/langtools/tools/javac/parser/extend/TrialParser.java	Tue Dec 12 21:08:36 2017 -0500
@@ -174,7 +174,7 @@
                 if (token.kind == CLASS
                         || token.kind == INTERFACE
                         || token.kind == ENUM) {
-                    return List.<JCTree>of(classOrDatumOrInterfaceOrEnumDeclaration(mods, dc));
+                    return List.<JCTree>of(classOrRecordOrInterfaceOrEnumDeclaration(mods, dc));
                 } else {
                     int pos = token.pos;
                     List<JCTypeParameter> typarams = typeParametersOpt();