OpenJDK / amber / amber

changeset 58358:057cf61f4072 records

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
records: Enable preview features in serializable record tests
author chegar
date Fri, 18 Oct 2019 20:28:34 +0100
parents 4d3851fa6bfd
children 64a9225f91bf
files test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java test/jdk/java/io/Serializable/records/BasicRecordSer.java test/jdk/java/io/Serializable/records/ConstructorAccessTest.java test/jdk/java/io/Serializable/records/ConstructorPermissionTest.java test/jdk/java/io/Serializable/records/CycleTest.java test/jdk/java/io/Serializable/records/ProhibitedMethods.java test/jdk/java/io/Serializable/records/ReadResolveTest.java test/jdk/java/io/Serializable/records/RecordClassTest.java test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java test/jdk/java/io/Serializable/records/StreamRefTest.java test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java test/jdk/java/io/Serializable/records/WriteReplaceTest.java test/jdk/java/io/Serializable/records/migration/AbstractTest.java test/jdk/java/io/Serializable/records/migration/AssignableFromTest.java test/jdk/java/io/Serializable/records/migration/DefaultValuesTest.java test/jdk/java/io/Serializable/records/migration/SuperStreamFieldsTest.java
diffstat 16 files changed, 68 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/AbsentStreamValuesTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -23,9 +23,10 @@
 
 /*
  * @test
- * @summary Checks that the appropriate default value is given to the canonical ctr.
- * @run testng AbsentStreamValuesTest
- * @run testng/othervm/java.security.policy=empty_security.policy AbsentStreamValuesTest
+ * @summary Checks that the appropriate default value is given to the canonical ctr
+ * @compile --enable-preview -source 14 AbsentStreamValuesTest.java
+ * @run testng/othervm --enable-preview AbsentStreamValuesTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview AbsentStreamValuesTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/BasicRecordSer.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/BasicRecordSer.java	Fri Oct 18 20:28:34 2019 +0100
@@ -24,8 +24,9 @@
 /*
  * @test
  * @summary Basic test that serializes and deserializes a number of records
- * @run testng BasicRecordSer
- * @run testng/othervm/java.security.policy=empty_security.policy BasicRecordSer
+ * @compile --enable-preview -source 14 BasicRecordSer.java
+ * @run testng/othervm --enable-preview BasicRecordSer
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview BasicRecordSer
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/ConstructorAccessTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -24,9 +24,10 @@
 /*
  * @test
  * @summary Ensures that the serialization implementation can *always* access
- *          the record constructor.
- * @run testng ConstructorAccessTest
- * @run testng/othervm/java.security.policy=empty_security.policy ConstructorAccessTest
+ *          the record constructor
+ * @compile --enable-preview -source 14 ConstructorAccessTest.java
+ * @run testng/othervm --enable-preview ConstructorAccessTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview ConstructorAccessTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/ConstructorPermissionTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/ConstructorPermissionTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -24,8 +24,9 @@
 /*
  * @test
  * @summary Verifies that privileged operations performed in the record
- *          constructor throw, when run without the required permissions.
- * @run testng/othervm/java.security.policy=empty_security.policy ConstructorPermissionTest
+ *          constructor throw, when run without the required permissions
+ * @compile --enable-preview -source 14 ConstructorPermissionTest.java
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview ConstructorPermissionTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/CycleTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/CycleTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -23,9 +23,10 @@
 
 /*
  * @test
- * @summary Ensures basic behavior of cycles from record components.
- * @run testng CycleTest
- * @run testng/othervm/java.security.policy=empty_security.policy CycleTest
+ * @summary Ensures basic behavior of cycles from record components
+ * @compile --enable-preview -source 14 CycleTest.java
+ * @run testng/othervm --enable-preview CycleTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview CycleTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/ProhibitedMethods.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/ProhibitedMethods.java	Fri Oct 18 20:28:34 2019 +0100
@@ -26,7 +26,8 @@
  * @summary Basic tests for prohibited magic serialization methods
  * @library /test/lib
  * @modules java.base/jdk.internal.org.objectweb.asm
- * @run testng ProhibitedMethods
+ * @compile --enable-preview -source 14 ProhibitedMethods.java
+ * @run testng/othervm --enable-preview ProhibitedMethods
  */
 
 import java.io.ByteArrayInputStream;
@@ -104,7 +105,8 @@
     public void setup() {
         {
             byte[] byteCode = InMemoryJavaCompiler.compile("Foo",
-                    "public record Foo () implements java.io.Serializable { }");
+                    "public record Foo () implements java.io.Serializable { }",
+                    "--enable-preview", "-source", "14");
             byteCode = addWriteObject(byteCode);
             byteCode = addReadObject(byteCode);
             byteCode = addReadObjectNoData(byteCode);
@@ -112,7 +114,8 @@
         }
         {
             byte[] byteCode = InMemoryJavaCompiler.compile("Bar",
-                    "public record Bar (int x, int y) implements java.io.Serializable { }");
+                    "public record Bar (int x, int y) implements java.io.Serializable { }",
+                    "--enable-preview", "-source", "14");
             byteCode = addWriteObject(byteCode);
             byteCode = addReadObject(byteCode);
             byteCode = addReadObjectNoData(byteCode);
@@ -121,7 +124,8 @@
         {
             byte[] byteCode = InMemoryJavaCompiler.compile("Baz",
                     "import java.io.Serializable;" +
-                    "public record Baz<U extends Serializable,V extends Serializable>(U u, V v) implements Serializable { }");
+                    "public record Baz<U extends Serializable,V extends Serializable>(U u, V v) implements Serializable { }",
+                    "--enable-preview", "-source", "14");
             byteCode = addWriteObject(byteCode);
             byteCode = addReadObject(byteCode);
             byteCode = addReadObjectNoData(byteCode);
--- a/test/jdk/java/io/Serializable/records/ReadResolveTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/ReadResolveTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -24,8 +24,9 @@
 /*
  * @test
  * @summary Basic tests for readResolve
- * @run testng ReadResolveTest
- * @run testng/othervm/java.security.policy=empty_security.policy ReadResolveTest
+ * @compile --enable-preview -source 14 ReadResolveTest.java
+ * @run testng/othervm --enable-preview ReadResolveTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview ReadResolveTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/RecordClassTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/RecordClassTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -23,9 +23,10 @@
 
 /*
  * @test
- * @summary Basic tests for serializing and deserializing record classes.
- * @run testng RecordClassTest
- * @run testng/othervm/java.security.policy=empty_security.policy RecordClassTest
+ * @summary Basic tests for serializing and deserializing record classes
+ * @compile --enable-preview -source 14 RecordClassTest.java
+ * @run testng/othervm --enable-preview RecordClassTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview RecordClassTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/SerialPersistentFieldsTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -26,7 +26,8 @@
  * @summary Basic tests for prohibited magic serialPersistentFields
  * @library /test/lib
  * @modules java.base/jdk.internal.org.objectweb.asm
- * @run testng SerialPersistentFieldsTest
+ * @compile --enable-preview -source 14 SerialPersistentFieldsTest.java
+ * @run testng/othervm --enable-preview SerialPersistentFieldsTest
  */
 
 import java.io.ByteArrayInputStream;
@@ -83,7 +84,8 @@
     public void setup() {
         {  // R1
             byte[] byteCode = InMemoryJavaCompiler.compile("R1",
-                    "public record R1 () implements java.io.Serializable { }");
+                    "public record R1 () implements java.io.Serializable { }",
+                    "--enable-preview", "-source", "14");
             ObjectStreamField[] serialPersistentFields = {
                     new ObjectStreamField("s", String.class),
                     new ObjectStreamField("i", int.class),
@@ -95,7 +97,8 @@
         }
         {  // R2
             byte[] byteCode = InMemoryJavaCompiler.compile("R2",
-                    "public record R2 (int x) implements java.io.Serializable { }");
+                    "public record R2 (int x) implements java.io.Serializable { }",
+                    "--enable-preview", "-source", "14");
             ObjectStreamField[] serialPersistentFields = {
                     new ObjectStreamField("s", String.class)
             };
@@ -104,7 +107,8 @@
         }
         {  // R3
             byte[] byteCode = InMemoryJavaCompiler.compile("R3",
-                    "public record R3 (int x, int y) implements java.io.Serializable { }");
+                    "public record R3 (int x, int y) implements java.io.Serializable { }",
+                    "--enable-preview", "-source", "14");
             ObjectStreamField[] serialPersistentFields = new ObjectStreamField[0];
             byteCode = addSerialPersistentFields(byteCode, serialPersistentFields);
             serializableRecordLoader = new ByteCodeLoader("R3", byteCode, serializableRecordLoader);
@@ -112,7 +116,8 @@
         {  // R4
             byte[] byteCode = InMemoryJavaCompiler.compile("R4",
                     "import java.io.Serializable;" +
-                    "public record R4<U extends Serializable,V extends Serializable>(U u, V v) implements Serializable { }");
+                    "public record R4<U extends Serializable,V extends Serializable>(U u, V v) implements Serializable { }",
+                    "--enable-preview", "-source", "14");
             ObjectStreamField[] serialPersistentFields = {
                     new ObjectStreamField("v", String.class)
             };
@@ -128,7 +133,8 @@
                     "    }\n" +
                     "    @Override public void readExternal(ObjectInput in) {\n" +
                     "        throw new AssertionError(\"should not reach here\");\n" +
-                    "    }  }");
+                    "    }  }",
+                    "--enable-preview", "-source", "14");
             ObjectStreamField[] serialPersistentFields = {
                     new ObjectStreamField("v", String.class)
             };
--- a/test/jdk/java/io/Serializable/records/StreamRefTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/StreamRefTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -23,9 +23,10 @@
 
 /*
  * @test
- * @summary Tests for stream references.
- * @run testng StreamRefTest
-  * @run testng/othervm/java.security.policy=empty_security.policy StreamRefTest
+ * @summary Tests for stream references
+ * @compile --enable-preview -source 14 StreamRefTest.java
+ * @run testng/othervm --enable-preview StreamRefTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview StreamRefTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/ThrowingConstructorTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -23,9 +23,10 @@
 
 /*
  * @test
- * @summary Tests constructor invocation exceptions are handled appropriately.
- * @run testng ThrowingConstructorTest
- * @run testng/othervm/java.security.policy=empty_security.policy ThrowingConstructorTest
+ * @summary Tests constructor invocation exceptions are handled appropriately
+ * @compile --enable-preview -source 14 ThrowingConstructorTest.java
+ * @run testng/othervm --enable-preview ThrowingConstructorTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview ThrowingConstructorTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/WriteReplaceTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/WriteReplaceTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -24,8 +24,9 @@
 /*
  * @test
  * @summary Basic tests for writeReplace
- * @run testng WriteReplaceTest
- * @run testng/othervm/java.security.policy=empty_security.policy WriteReplaceTest
+ * @compile --enable-preview -source 14 StreamRefTest.java
+ * @run testng/othervm --enable-preview WriteReplaceTest
+ * @run testng/othervm/java.security.policy=empty_security.policy --enable-preview WriteReplaceTest
  */
 
 import java.io.ByteArrayInputStream;
--- a/test/jdk/java/io/Serializable/records/migration/AbstractTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/migration/AbstractTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -57,9 +57,11 @@
     @BeforeTest
     public void setup() throws IOException {
         assertTrue(CompilerUtils.compile(PLAIN_SRC_DIR, PLAIN_DEST_DIR,
+                   "--enable-preview", "-source", "14",
                    "--class-path", TEST_CLASSES_DIR.toString()));
 
         assertTrue(CompilerUtils.compile(RECORD_SRC_DIR, RECORD_DEST_DIR,
+                   "--enable-preview", "-source", "14",
                    "--class-path", TEST_CLASSES_DIR.toString()));
     }
 
--- a/test/jdk/java/io/Serializable/records/migration/AssignableFromTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/migration/AssignableFromTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -26,8 +26,9 @@
  * @summary Test for subtype stream field value assign-ability
  * @library /test/lib
  * @modules jdk.compiler
- * @compile AssignableFrom.java Point.java DefaultValues.java SuperStreamFields.java
- * @run testng AssignableFromTest
+ * @compile --enable-preview -source 14 AssignableFrom.java Point.java
+ *          DefaultValues.java SuperStreamFields.java AssignableFromTest.java
+ * @run testng/othervm --enable-preview AssignableFromTest
  */
 
 import java.math.BigDecimal;
--- a/test/jdk/java/io/Serializable/records/migration/DefaultValuesTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/migration/DefaultValuesTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -23,11 +23,12 @@
 
 /*
  * @test
- * @summary Checks that the appropriate default value is given to the canonical ctr.
+ * @summary Checks that the appropriate default value is given to the canonical ctr
  * @library /test/lib
  * @modules jdk.compiler
- * @compile AssignableFrom.java Point.java DefaultValues.java SuperStreamFields.java
- * @run testng DefaultValuesTest
+ * @compile --enable-preview -source 14 AssignableFrom.java Point.java
+ *          DefaultValues.java SuperStreamFields.java DefaultValuesTest.java
+ * @run testng/othervm --enable-preview DefaultValuesTest
  */
 
 import java.io.ByteArrayOutputStream;
--- a/test/jdk/java/io/Serializable/records/migration/SuperStreamFieldsTest.java	Fri Oct 18 13:37:51 2019 -0400
+++ b/test/jdk/java/io/Serializable/records/migration/SuperStreamFieldsTest.java	Fri Oct 18 20:28:34 2019 +0100
@@ -26,8 +26,9 @@
  * @summary superclass fields in the stream should be discarded
  * @library /test/lib
  * @modules jdk.compiler
- * @compile AssignableFrom.java Point.java DefaultValues.java SuperStreamFields.java
- * @run testng SuperStreamFieldsTest
+ * @compile --enable-preview -source 14 AssignableFrom.java Point.java
+ *          DefaultValues.java SuperStreamFields.java SuperStreamFieldsTest.java
+ * @run testng/othervm --enable-preview SuperStreamFieldsTest
  */
 
 import org.testng.annotations.DataProvider;
© 2007, Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks