Skip to content

Commit 9ac162e

Browse files
iignateviignatev
committed
8251999: remove usage of PropertyResolvingWrapper in vmTestbase/nsk/aod
Reviewed-by: shade, sspitsyn
1 parent 527a309 commit 9ac162e

File tree

20 files changed

+232
-222
lines changed

20 files changed

+232
-222
lines changed

‎test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider01/AttachProvider01.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,25 @@
3535
*
3636
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
3737
* /test/lib
38-
* @build nsk.aod.AttachProvider.AttachProvider01.AttachProvider01
39-
* nsk.share.aod.DummyTargetApplication
40-
* @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
38+
* @build nsk.share.aod.DummyTargetApplication
39+
* @run main/othervm
40+
* -XX:+UsePerfData
4141
* nsk.aod.AttachProvider.AttachProvider01.AttachProvider01
4242
* -jdk ${test.jdk}
43-
* "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
43+
* -javaOpts="-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
4444
* -target nsk.share.aod.DummyTargetApplication
4545
*/
4646

4747
package nsk.aod.AttachProvider.AttachProvider01;
4848

49-
import java.util.List;
50-
import com.sun.tools.attach.*;
49+
import com.sun.tools.attach.VirtualMachine;
50+
import com.sun.tools.attach.VirtualMachineDescriptor;
5151
import com.sun.tools.attach.spi.AttachProvider;
52-
import nsk.share.aod.*;
52+
import nsk.share.aod.AODTestRunner;
5353
import nsk.share.test.TestUtils;
5454

55+
import java.util.List;
56+
5557
/*
5658
* Test checks method AttachProvider.listVirtualMachines()
5759
* (test checks that collection returned by AttachProvider.listVirtualMachines() contains current VM
@@ -63,7 +65,7 @@ public AttachProvider01(String[] args) {
6365
super(args);
6466
}
6567

66-
public void doTestActions(String targetVMId) throws Throwable {
68+
public void doTestActions(String targetVMId) {
6769
String currentVMId = getCurrentVMId();
6870

6971
for (AttachProvider provider : AttachProvider.providers()) {

‎test/hotspot/jtreg/vmTestbase/nsk/aod/AttachProvider/AttachProvider02/AttachProvider02.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,26 @@
3737
*
3838
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
3939
* /test/lib
40-
* @build nsk.aod.AttachProvider.AttachProvider02.AttachProvider02
41-
* nsk.share.aod.DummyTargetApplication
42-
* @run main/othervm -Djdk.attach.allowAttachSelf -XX:+UsePerfData
43-
* PropertyResolvingWrapper
40+
* @build nsk.share.aod.DummyTargetApplication
41+
* @run main/othervm
42+
* -Djdk.attach.allowAttachSelf
43+
* -XX:+UsePerfData
4444
* nsk.aod.AttachProvider.AttachProvider02.AttachProvider02
4545
* -jdk ${test.jdk}
46-
* "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
46+
* -javaOpts="-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
4747
* -target nsk.share.aod.DummyTargetApplication
4848
*/
4949

5050
package nsk.aod.AttachProvider.AttachProvider02;
5151

52-
import java.util.Properties;
53-
import com.sun.tools.attach.*;
52+
import com.sun.tools.attach.VirtualMachine;
53+
import com.sun.tools.attach.VirtualMachineDescriptor;
5454
import com.sun.tools.attach.spi.AttachProvider;
55-
import nsk.share.aod.*;
55+
import nsk.share.aod.AODTestRunner;
5656
import nsk.share.test.TestUtils;
5757

58+
import java.util.Properties;
59+
5860
/*
5961
* Test checks following methods:
6062
* - AttachProvider.attachVirtualMachine(String id)
@@ -80,11 +82,9 @@ public void doTestActions(String targetVMId) throws Throwable {
8082
TestUtils.assertNotNull(provider.type(), "Provider.type() returns null");
8183

8284
tryAttach(provider, currentVMId, false);
83-
8485
tryAttach(provider, currentVMId, true);
8586

8687
tryAttach(provider, targetVMId, false);
87-
8888
tryAttach(provider, targetVMId, true);
8989
}
9090
}
@@ -95,17 +95,17 @@ void tryAttach(AttachProvider provider, String vmId, boolean useVMDescriptor) th
9595

9696
VirtualMachine vm;
9797

98-
if (useVMDescriptor)
98+
if (useVMDescriptor) {
9999
vm = provider.attachVirtualMachine(new VirtualMachineDescriptor(provider, vmId));
100-
else
100+
} else {
101101
vm = provider.attachVirtualMachine(vmId);
102+
}
102103

103104
try {
104105
log.display("Attached to vm: " + vm);
105106
TestUtils.assertEquals(vm.id(), vmId, "VirtualMachine.id() returns unexpected value for attached vm: " + vm.id());
106107

107108
// try to use created VirtualMachine
108-
109109
log.display("Trying to call VirtualMachine.getSystemProperties()");
110110
Properties properties = vm.getSystemProperties();
111111
TestUtils.assertNotNull(properties, "VirtualMachine.getSystemProperties() returns null");

‎test/hotspot/jtreg/vmTestbase/nsk/aod/TEST.properties‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine01/VirtualMachine01.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,23 @@
3939
*
4040
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
4141
* /test/lib
42-
* @build nsk.aod.VirtualMachine.VirtualMachine01.VirtualMachine01
43-
* nsk.share.aod.DummyTargetApplication
44-
* @run main/othervm -XX:+UsePerfData PropertyResolvingWrapper
42+
* @build nsk.share.aod.DummyTargetApplication
43+
* @run main/othervm
44+
* -XX:+UsePerfData
4545
* nsk.aod.VirtualMachine.VirtualMachine01.VirtualMachine01
4646
* -jdk ${test.jdk}
47-
* "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
47+
* -javaOpts="-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
4848
* -target nsk.share.aod.DummyTargetApplication
4949
*/
5050

5151
package nsk.aod.VirtualMachine.VirtualMachine01;
5252

53-
import nsk.share.aod.*;
54-
import nsk.share.test.TestUtils;
55-
import com.sun.tools.attach.*;
53+
import com.sun.tools.attach.AttachNotSupportedException;
54+
import com.sun.tools.attach.VirtualMachine;
55+
import com.sun.tools.attach.VirtualMachineDescriptor;
5656
import com.sun.tools.attach.spi.AttachProvider;
57+
import nsk.share.aod.AODTestRunner;
58+
import nsk.share.test.TestUtils;
5759

5860
/*
5961
* Test provokes exception which should be thrown by VirtualMachine methods:

‎test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine02/VirtualMachine02.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,30 @@
3939
*
4040
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
4141
* /test/lib
42-
* @build nsk.aod.VirtualMachine.VirtualMachine02.VirtualMachine02
43-
* nsk.share.aod.DummyTargetApplication
44-
* @run main/othervm -Djdk.attach.allowAttachSelf -XX:+UsePerfData
45-
* PropertyResolvingWrapper
42+
* @build nsk.share.aod.DummyTargetApplication
43+
* @run main/othervm
44+
* -Djdk.attach.allowAttachSelf
45+
* -XX:+UsePerfData
4646
* nsk.aod.VirtualMachine.VirtualMachine02.VirtualMachine02
4747
* -jdk ${test.jdk}
48-
* "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
48+
* -javaOpts="-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
4949
* -target nsk.share.aod.DummyTargetApplication
5050
*/
5151

5252
package nsk.aod.VirtualMachine.VirtualMachine02;
5353

54-
import java.io.IOException;
55-
import com.sun.tools.attach.*;
54+
import com.sun.tools.attach.VirtualMachine;
55+
import com.sun.tools.attach.VirtualMachineDescriptor;
5656
import com.sun.tools.attach.spi.AttachProvider;
57-
import nsk.share.aod.*;
57+
import nsk.share.aod.AODTestRunner;
5858
import nsk.share.test.TestUtils;
5959

60+
import java.io.IOException;
61+
6062
/*
6163
* Test checks following methods:
6264
* - VirtualMachine.attach(String) (test tries to attach to current and to another VM)
63-
*
6465
* - VirtualMachine.attach(VirtualMachineDescriptor) (test tries to attach to current and to another VM)
65-
*
6666
* - VirtualMachine.detach() (test checks that after detaching operations on VirtualMachine
6767
* throw IOException)
6868
*/

‎test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine03/VirtualMachine03.java‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@
3434
*
3535
* @library /vmTestbase /test/hotspot/jtreg/vmTestbase
3636
* /test/lib
37-
* @build nsk.aod.VirtualMachine.VirtualMachine03.VirtualMachine03
38-
* nsk.share.aod.DummyTargetApplication
39-
* @run main/othervm -Djdk.attach.allowAttachSelf -XX:+UsePerfData
40-
* PropertyResolvingWrapper
37+
* @build nsk.share.aod.DummyTargetApplication
38+
* @run main/othervm
39+
* -Djdk.attach.allowAttachSelf
40+
* -XX:+UsePerfData
4141
* nsk.aod.VirtualMachine.VirtualMachine03.VirtualMachine03
4242
* -jdk ${test.jdk}
43-
* "-javaOpts=-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
43+
* -javaOpts="-XX:+UsePerfData ${test.vm.opts} ${test.java.opts}"
4444
* -target nsk.share.aod.DummyTargetApplication
4545
*/
4646

4747
package nsk.aod.VirtualMachine.VirtualMachine03;
4848

4949
import com.sun.tools.attach.VirtualMachine;
50-
import nsk.share.aod.*;
50+
import nsk.share.aod.AODTestRunner;
5151
import nsk.share.test.TestUtils;
5252

5353
/*
@@ -63,23 +63,21 @@ public void doTestActions(String targetVMId) throws Throwable {
6363
String currentVMId = getCurrentVMId();
6464

6565
VirtualMachine vm1 = VirtualMachine.attach(currentVMId);
66-
67-
VirtualMachine vm2 = VirtualMachine.attach(targetVMId);
68-
6966
try {
70-
TestUtils.assertEquals(vm1.id(), currentVMId, "vm.id() returns unexpected value: " + vm1.id());
71-
72-
TestUtils.assertEquals(vm2.id(), targetVMId, "vm.id() returns unexpected value: " + vm2.id());
73-
74-
TestUtils.assertTrue(!vm1.equals(vm2), vm1 + ".equals(" + vm2 + ") returns 'true'");
75-
76-
checkVM(vm1);
77-
78-
checkVM(vm2);
67+
VirtualMachine vm2 = VirtualMachine.attach(targetVMId);
68+
try {
69+
TestUtils.assertEquals(vm1.id(), currentVMId, "vm.id() returns unexpected value: " + vm1.id());
70+
TestUtils.assertEquals(vm2.id(), targetVMId, "vm.id() returns unexpected value: " + vm2.id());
71+
72+
TestUtils.assertTrue(!vm1.equals(vm2), vm1 + ".equals(" + vm2 + ") returns 'true'");
73+
74+
checkVM(vm1);
75+
checkVM(vm2);
76+
} finally {
77+
vm2.detach();
78+
}
7979
} finally {
8080
vm1.detach();
81-
82-
vm2.detach();
8381
}
8482
}
8583

@@ -90,15 +88,13 @@ void checkVM(VirtualMachine vm1) throws Throwable {
9088
VirtualMachine vm2 = VirtualMachine.attach(vm1.id());
9189
try {
9290
TestUtils.assertEquals(vm1, vm2, vm1 + ".equals(" + vm2 + ") returns 'false'");
93-
9491
TestUtils.assertTrue(vm1.hashCode() == vm2.hashCode(), "vm.hashCode() returns different values for " + vm1 + " and " + vm2);
95-
9692
TestUtils.assertEquals(vm1.provider(), vm2.provider(), "vm.provider() returns non-equals objects for " + vm1 + " and " + vm2);
9793
} finally {
9894
vm2.detach();
9995
}
10096

101-
TestUtils.assertTrue(!vm1.equals(new String()), "vm.equals(String) returns 'true'");
97+
TestUtils.assertTrue(!vm1.equals(""), "vm.equals(String) returns 'true'");
10298

10399
TestUtils.assertTrue(!vm1.equals(null), "vm.equals(null) returns 'true'");
104100
}

‎test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine04/VM04Target.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -20,6 +20,7 @@
2020
* or visit www.oracle.com if you need additional information or have any
2121
* questions.
2222
*/
23+
2324
package nsk.aod.VirtualMachine.VirtualMachine04;
2425

2526
import nsk.share.TestBug;
@@ -30,28 +31,26 @@
3031
* main test application tries to get this property using VirtualMachine.getSystemProperties()
3132
*/
3233
public class VM04Target extends DummyTargetApplication {
33-
34-
static String testPropertyKey = "VirtualMachine04_testPropertyKey";
35-
36-
static String testPropertyValue = "VirtualMachine04_testPropertyValue";
37-
38-
static String changedTestPropertyValue = "VirtualMachine04_testPropertyValue_changed";
34+
static final String TEST_PROPERTY_KEY = "VirtualMachine04_testPropertyKey";
35+
static final String TEST_PROPERTY_VALUE = "VirtualMachine04_testPropertyValue";
36+
static final String CHANGED_TEST_PROPERTY_VALUE = "VirtualMachine04_testPropertyValue_changed";
3937

4038
VM04Target(String[] args) {
4139
super(args);
4240

43-
log.display("Setting property " + testPropertyKey + " = " + testPropertyValue);
44-
System.setProperty(testPropertyKey, testPropertyValue);
41+
log.display("Setting property " + TEST_PROPERTY_KEY + " = " + TEST_PROPERTY_VALUE);
42+
System.setProperty(TEST_PROPERTY_KEY, TEST_PROPERTY_VALUE);
4543
}
4644

4745
protected void targetApplicationActions() {
4846
String signal = pipe.readln();
49-
log.display("Received signal: " + signal);
50-
if (!signal.equals(VirtualMachine04.SIGNAL_CHANGE_PROPERTY))
47+
log.display("Received signal: " + signal);
48+
if (!signal.equals(VirtualMachine04.SIGNAL_CHANGE_PROPERTY)) {
5149
throw new TestBug("Received unexpected signal: " + signal);
50+
}
5251

53-
log.display("Setting property " + testPropertyKey + " = " + changedTestPropertyValue);
54-
System.setProperty(testPropertyKey, changedTestPropertyValue);
52+
log.display("Setting property " + TEST_PROPERTY_KEY + " = " + CHANGED_TEST_PROPERTY_VALUE);
53+
System.setProperty(TEST_PROPERTY_KEY, CHANGED_TEST_PROPERTY_VALUE);
5554

5655
log.display("Sending signal " + VirtualMachine04.SIGNAL_PROPERTY_CHANGED);
5756
pipe.println(VirtualMachine04.SIGNAL_PROPERTY_CHANGED);

0 commit comments

Comments
 (0)