stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: bpb, vromero
This commit is contained in:
Mandy Chung 2019-02-06 15:09:05 -08:00
parent 9c2e3cffb6
commit 007d3c0143
17 changed files with 36 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessBoolean.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessByte.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessChar.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessDouble.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessFloat.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessInt.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessLong.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessShort.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestAccessString.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsChar.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsDouble.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsFloat.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsInt.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsLong.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

7
test/jdk/java/lang/invoke/VarHandles/VarHandleTestByteArrayAsShort.java
View File

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

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

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
assertEquals(vhs1[i], vhs2[i]);
assertEquals(vhs1[i].hashCode(), vhs2[i].hashCode());
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}

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

@ -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) {
assertEquals(vhs1[i], vhs1[i]);
assertEquals(vhs1[i], vhs2[i]);
assertEquals(vhs1[i].hashCode(), vhs2[i].hashCode());
}
else {
if (i != j) {
assertNotEquals(vhs1[i], vhs1[j]);
assertNotEquals(vhs1[i], vhs2[j]);
}