8218461: test/jdk/java/lang/invoke/VarHandles should be generated rather than manually edited

Reviewed-by: bpb, vromero

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessBoolean extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessByte extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessChar extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessDouble extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessFloat extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessInt extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessLong extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java

@@ -133,16 +133,13 @@ public class VarHandleTestAccessShort extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java

@@ -135,16 +135,13 @@ public class VarHandleTestAccessString extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java

@@ -83,7 +83,7 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = setupVarHandleSources(true).stream().
             map(vhs -> vhs.s).toArray(VarHandle[]::new);
         VarHandle[] vhs2 = setupVarHandleSources(true).stream().
@@ -91,10 +91,7 @@ public class VarHandleTestByteArrayAsChar extends VarHandleBaseByteArrayTest {
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java

@@ -83,7 +83,7 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = setupVarHandleSources(true).stream().
             map(vhs -> vhs.s).toArray(VarHandle[]::new);
         VarHandle[] vhs2 = setupVarHandleSources(true).stream().
@@ -91,10 +91,7 @@ public class VarHandleTestByteArrayAsDouble extends VarHandleBaseByteArrayTest {
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java

@@ -83,7 +83,7 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = setupVarHandleSources(true).stream().
             map(vhs -> vhs.s).toArray(VarHandle[]::new);
         VarHandle[] vhs2 = setupVarHandleSources(true).stream().
@@ -91,10 +91,7 @@ public class VarHandleTestByteArrayAsFloat extends VarHandleBaseByteArrayTest {
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java

@@ -83,7 +83,7 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = setupVarHandleSources(true).stream().
             map(vhs -> vhs.s).toArray(VarHandle[]::new);
         VarHandle[] vhs2 = setupVarHandleSources(true).stream().
@@ -91,10 +91,7 @@ public class VarHandleTestByteArrayAsInt extends VarHandleBaseByteArrayTest {
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java

@@ -83,7 +83,7 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = setupVarHandleSources(true).stream().
             map(vhs -> vhs.s).toArray(VarHandle[]::new);
         VarHandle[] vhs2 = setupVarHandleSources(true).stream().
@@ -91,10 +91,7 @@ public class VarHandleTestByteArrayAsLong extends VarHandleBaseByteArrayTest {
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java

@@ -83,7 +83,7 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = setupVarHandleSources(true).stream().
             map(vhs -> vhs.s).toArray(VarHandle[]::new);
         VarHandle[] vhs2 = setupVarHandleSources(true).stream().
@@ -91,10 +91,7 @@ public class VarHandleTestByteArrayAsShort extends VarHandleBaseByteArrayTest {
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestAccess.java.template

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -143,18 +143,13 @@ public class VarHandleTestAccess$Type$ extends VarHandleBaseTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = allocate(true);
         VarHandle[] vhs2 = allocate(true);
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                    assertEquals(vhs1[i], vhs2[i]);
-                    assertEquals(vhs1[i].hashCode(), vhs2[i].hashCode());
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }

test/jdk/java/lang/invoke/VarHandles/X-VarHandleTestByteArrayView.java.template

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -87,7 +87,7 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
     }
 
     @Test
-    public void testEqualsAndHashCode() {
+    public void testEquals() {
         VarHandle[] vhs1 = setupVarHandleSources(true).stream().
             map(vhs -> vhs.s).toArray(VarHandle[]::new);
         VarHandle[] vhs2 = setupVarHandleSources(true).stream().
@@ -95,12 +95,7 @@ public class VarHandleTestByteArrayAs$Type$ extends VarHandleBaseByteArrayTest {
 
         for (int i = 0; i < vhs1.length; i++) {
             for (int j = 0; j < vhs1.length; j++) {
-                if (i == j) {
+                if (i != j) {
-                    assertEquals(vhs1[i], vhs1[i]);
-                    assertEquals(vhs1[i], vhs2[i]);
-                    assertEquals(vhs1[i].hashCode(), vhs2[i].hashCode());
-                }
-                else {
                     assertNotEquals(vhs1[i], vhs1[j]);
                     assertNotEquals(vhs1[i], vhs2[j]);
                 }