8245652: some tests at RecordCompilationTests are resetting the wrong compilation options

Vicente Romero · Vicente Romero · commit 3a69dfb5c5f1 · 2020-07-20T12:14:44.000-04:00
Reviewed-by: darcy
diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java
@@ -960,6 +960,7 @@ public void testCheckInitializationOrderInCompactConstructor() throws Exception
     }
 
     public void testAcceptRecordId() {
+        String[] previousOptions = getCompileOptions();
         String[] testOptions = {/* no options */};
         setCompileOptions(testOptions);
         assertOKWithWarning("compiler.warn.restricted.type.not.allowed.preview",
@@ -969,10 +970,11 @@ public void testAcceptRecordId() {
                 "    }\n" +
                 "    class record {}\n" +
                 "}");
-        setCompileOptions(PREVIEW_OPTIONS);
+        setCompileOptions(previousOptions);
     }
 
     public void testAnnos() throws Exception {
+        String[] previousOptions = getCompileOptions();
         String srcTemplate =
                 """
                     import java.lang.annotation.*;
@@ -1127,7 +1129,7 @@ record R(@Anno String s) {}
         }
 
         // let's reset the default compiler options for other tests
-        setCompileOptions(PREVIEW_OPTIONS);
+        setCompileOptions(previousOptions);
     }
 
     private void checkTypeAnno(ClassFile classFile,

Original file line number	Diff line number	Diff line change
`@@ -960,6 +960,7 @@ public void testCheckInitializationOrderInCompactConstructor() throws Exception`
`960`	`960`	`}`
`961`	`961`
`962`	`962`	`public void testAcceptRecordId() {`
	`963`	`+ String[] previousOptions = getCompileOptions();`
`963`	`964`	`String[] testOptions = {/* no options */};`
`964`	`965`	`setCompileOptions(testOptions);`
`965`	`966`	`assertOKWithWarning("compiler.warn.restricted.type.not.allowed.preview",`
`@@ -969,10 +970,11 @@ public void testAcceptRecordId() {`
`969`	`970`	`" }\n" +`
`970`	`971`	`" class record {}\n" +`
`971`	`972`	`"}");`
`972`		`- setCompileOptions(PREVIEW_OPTIONS);`
	`973`	`+ setCompileOptions(previousOptions);`
`973`	`974`	`}`
`974`	`975`
`975`	`976`	`public void testAnnos() throws Exception {`
	`977`	`+ String[] previousOptions = getCompileOptions();`
`976`	`978`	`String srcTemplate =`
`977`	`979`	`"""`
`978`	`980`	`import java.lang.annotation.*;`
`@@ -1127,7 +1129,7 @@ record R(@Anno String s) {}`
`1127`	`1129`	`}`
`1128`	`1130`
`1129`	`1131`	`// let's reset the default compiler options for other tests`
`1130`		`- setCompileOptions(PREVIEW_OPTIONS);`
	`1132`	`+ setCompileOptions(previousOptions);`
`1131`	`1133`	`}`
`1132`	`1134`
`1133`	`1135`	`private void checkTypeAnno(ClassFile classFile,`