8065773: JDI: UOE is not thrown, when redefineClasses changes a class modifier
Reviewed-by: sspitsyn, coleenp
This commit is contained in:
parent
739bbd03c5
commit
f5ca8385ab
@ -123,8 +123,6 @@ vmTestbase/nsk/monitoring/MemoryPoolMBean/isUsageThresholdExceeded/isexceeded005
|
||||
vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Deadlock/JavaDeadlock001/TestDescription.java 8060733 generic-all
|
||||
|
||||
vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
|
||||
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses021/TestDescription.java 8065773 generic-all
|
||||
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023/TestDescription.java 8065773 generic-all
|
||||
|
||||
vmTestbase/nsk/jdb/eval/eval001/eval001.java 8221503 generic-all
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2002, 2021, 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
|
||||
@ -48,10 +48,8 @@ import java.io.*;
|
||||
* <code>newclassXX/redefineclasses021a.java</code> - redefining debuggees <br>
|
||||
*
|
||||
* This test performs the following cases: <br>
|
||||
* 1. newclass01 - adding <code>public</code> interface-modifier <br>
|
||||
* 2. newclass02 - adding <code>protected</code> interface-modifier <br>
|
||||
* 3. newclass03 - adding <code>private</code> interface-modifier <br>
|
||||
* 4. newclass04 - adding <code>static</code> interface-modifier <br>
|
||||
* 1. newclass01 - adding <code>public</code> interface-modifier <br>
|
||||
* 2. newclass02 - removing <code>public</code> interface-modifier <br>
|
||||
* The test checks two different cases for suspended debugee and not
|
||||
* suspended one.
|
||||
* When <code>canRedefineClasses()</code> is <code>false</code>, the test is
|
||||
@ -66,21 +64,23 @@ public class redefineclasses021 {
|
||||
private final static String prefix = "nsk.jdi.VirtualMachine.redefineClasses.";
|
||||
private final static String debuggerName = prefix + "redefineclasses021";
|
||||
private final static String debugeeName = debuggerName + "a";
|
||||
public final static String testedClassName = debuggerName + "b$redefineclasses021bi";
|
||||
|
||||
private final static String[][] subDirs = {
|
||||
{"newclass01","adding <public> interface-modifier"},
|
||||
{"newclass02","adding <protected> interface-modifier"},
|
||||
{"newclass03","adding <private> interface-modifier"},
|
||||
{"newclass04","adding <static> interface-modifier"}
|
||||
{"newclass01","adding <public> interface-modifier", debuggerName + "b$redefineclasses021bi"},
|
||||
{"newclass02","removing <public> interface-modifier", debuggerName + "b$redefineclasses021bir"},
|
||||
};
|
||||
|
||||
private final static String newClassFile = File.separator
|
||||
private final static String newClassFile(String testedClassName) {
|
||||
return File.separator
|
||||
+ testedClassName.replace('.',File.separatorChar)
|
||||
+ ".class";
|
||||
private final static String oldClassFile
|
||||
= ClassFileFinder.findClassFile(testedClassName, Utils.TEST_CLASS_PATH)
|
||||
}
|
||||
|
||||
private final static String oldClassFile(String testedClassName) {
|
||||
return ClassFileFinder.findClassFile(testedClassName, Utils.TEST_CLASS_PATH)
|
||||
.toString();
|
||||
}
|
||||
|
||||
private static final String dashes = "--------------------------";
|
||||
|
||||
private static int exitStatus;
|
||||
@ -89,8 +89,6 @@ public class redefineclasses021 {
|
||||
private static String testDir;
|
||||
private static String statDebugee;
|
||||
|
||||
private ReferenceType testedClass;
|
||||
|
||||
private static void display(String msg) {
|
||||
log.display(msg);
|
||||
}
|
||||
@ -140,9 +138,6 @@ public class redefineclasses021 {
|
||||
return;
|
||||
}
|
||||
|
||||
testedClass = debugee.classByName(testedClassName);
|
||||
display(typePrompt(testedClass) + "\t:" + testedClass.name());
|
||||
|
||||
display("\nTEST BEGINS");
|
||||
display("===========");
|
||||
|
||||
@ -162,61 +157,43 @@ public class redefineclasses021 {
|
||||
Map<? extends com.sun.jdi.ReferenceType,byte[]> mapBytes;
|
||||
boolean alreadyComplained = false;
|
||||
for (int i = 0; i < subDirs.length; i++) {
|
||||
|
||||
String testedClassName = subDirs[i][2];
|
||||
ReferenceType testedClass = debugee.classByName(testedClassName);
|
||||
display(typePrompt(testedClass) + "\t:" + testedClass.name());
|
||||
|
||||
display("\n" + subDirs[i][1] + ">>>");
|
||||
mapBytes = mapClassToBytes(testDir + File.separator + subDirs [i][0] + newClassFile);
|
||||
mapBytes = mapClassToBytes(testedClass, testDir + File.separator + subDirs [i][0] + newClassFile(testedClassName));
|
||||
try {
|
||||
debugee.VM().redefineClasses(mapBytes);
|
||||
if (i < 3) {
|
||||
if (!debugee.VM().canUnrestrictedlyRedefineClasses()) {
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
if (!alreadyComplained) {
|
||||
alreadyComplained = true;
|
||||
complain("***" + dashes);
|
||||
complain("***" + statDebugee);
|
||||
complain("***" + dashes);
|
||||
}
|
||||
complain("***UnsupportedOperationException is not thrown");
|
||||
complain("***\twhile " + subDirs[i][1]);
|
||||
|
||||
display(">return to the previous state...");
|
||||
mapBytes = mapClassToBytes(oldClassFile);
|
||||
try {
|
||||
debugee.VM().redefineClasses(mapBytes);
|
||||
} catch (Exception e) {
|
||||
throw new Failure(UNEXPECTED_STRING + e);
|
||||
}
|
||||
if (!debugee.VM().canUnrestrictedlyRedefineClasses()) {
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
if (!alreadyComplained) {
|
||||
alreadyComplained = true;
|
||||
complain("***" + dashes);
|
||||
complain("***" + statDebugee);
|
||||
complain("***" + dashes);
|
||||
}
|
||||
complain("***UnsupportedOperationException is not thrown");
|
||||
complain("***\twhile " + subDirs[i][1]);
|
||||
|
||||
display(">return to the previous state...");
|
||||
mapBytes = mapClassToBytes(testedClass, oldClassFile(testedClassName));
|
||||
try {
|
||||
debugee.VM().redefineClasses(mapBytes);
|
||||
} catch (Exception e) {
|
||||
throw new Failure(UNEXPECTED_STRING + e);
|
||||
}
|
||||
} else {
|
||||
display("!!!No exception is thrown!!! Member interfaces are always implicitly static");
|
||||
}
|
||||
} catch (UnsupportedOperationException e) {
|
||||
if (i == 3) {
|
||||
complain(statDebugee + UNEXPECTED_STRING
|
||||
+ "UnsupportedOperationException");
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
} else {
|
||||
if (!debugee.VM().canUnrestrictedlyRedefineClasses()) {
|
||||
display(EXPECTED_STRING + e);
|
||||
} else {
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
if (!alreadyComplained) {
|
||||
alreadyComplained = true;
|
||||
complain("***" + dashes);
|
||||
complain("***" + statDebugee);
|
||||
complain("***" + dashes);
|
||||
}
|
||||
complain(statDebugee + UNEXPECTED_STRING
|
||||
+ "UnsupportedOperationException");
|
||||
complain("***\twhile " + subDirs[i][1]);
|
||||
}
|
||||
}
|
||||
display(EXPECTED_STRING + e);
|
||||
} catch (Exception e) {
|
||||
throw new Failure(UNEXPECTED_STRING + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Map<? extends com.sun.jdi.ReferenceType,byte[]> mapClassToBytes(String fileName) {
|
||||
private Map<? extends com.sun.jdi.ReferenceType,byte[]> mapClassToBytes(ReferenceType testedClass, String fileName) {
|
||||
display("class-file\t:" + fileName);
|
||||
File fileToBeRedefined = new File(fileName);
|
||||
int fileToRedefineLength = (int )fileToBeRedefined.length();
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2021, 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
|
||||
@ -41,9 +41,7 @@
|
||||
* newclassXX/redefineclasses021b.java - redefining debuggee's class
|
||||
* This test performs the following cases:
|
||||
* 1. newclass01 - adding <public> interface-modifier
|
||||
* 2. newclass02 - adding <protected> interface-modifier
|
||||
* 3. newclass03 - adding <private> interface-modifier
|
||||
* 4. newclass04 - adding <static> interface-modifier
|
||||
* 2. newclass02 - removing <public> interface-modifier
|
||||
* The test checks two different cases for suspended debugee and not
|
||||
* suspended one.
|
||||
* COMMENTS:
|
||||
@ -57,9 +55,7 @@
|
||||
*
|
||||
* @comment compile newclassXX to bin/newclassXX
|
||||
* with full debug info
|
||||
* @run driver nsk.share.ExtraClassesBuilder
|
||||
* -g:lines,source,vars
|
||||
* newclass01 newclass02 newclass03 newclass04
|
||||
* @run driver nsk.share.ExtraClassesBuilder -g:lines,source,vars newclass01 newclass02
|
||||
*
|
||||
* @run main/othervm
|
||||
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses021
|
||||
@ -71,4 +67,3 @@
|
||||
* -transport.address=dynamic
|
||||
* -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
|
||||
*/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2002, 2021, 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
|
||||
@ -23,10 +23,6 @@
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
/**
|
||||
* <code>redefineclasses021b</code> is deugee's part of the redefineclasses021.
|
||||
* adding <code>public</code> modifier
|
||||
@ -42,7 +38,12 @@ public class redefineclasses021b {
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi {
|
||||
public interface redefineclasses021bir {
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi, redefineclasses021bir {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2002, 2021, 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
|
||||
@ -36,13 +36,18 @@ public class redefineclasses021b {
|
||||
|
||||
redefineclasses021bc obj = new redefineclasses021bc();
|
||||
|
||||
protected interface redefineclasses021bi {
|
||||
// ^^^^^^^^^
|
||||
interface redefineclasses021bi {
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi {
|
||||
/* public */ interface redefineclasses021bir {
|
||||
//^^^^^^^^
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi, redefineclasses021bir {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
@ -1,51 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
/**
|
||||
* <code>redefineclasses021b</code> is deugee's part of the redefineclasses021.
|
||||
* adding <code>private</code> modifier
|
||||
*/
|
||||
|
||||
public class redefineclasses021b {
|
||||
|
||||
redefineclasses021bc obj = new redefineclasses021bc();
|
||||
|
||||
private interface redefineclasses021bi {
|
||||
// ^^^^^^^
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -1,51 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
/**
|
||||
* <code>redefineclasses021b</code> is deugee's part of the redefineclasses021.
|
||||
* adding <code>static</code> modifier
|
||||
*/
|
||||
|
||||
public class redefineclasses021b {
|
||||
|
||||
redefineclasses021bc obj = new redefineclasses021bc();
|
||||
|
||||
static interface redefineclasses021bi {
|
||||
// ^^^^^^
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2002, 2021, 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
|
||||
@ -23,10 +23,6 @@
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
/**
|
||||
* <code>redefineclasses021b</code> is deugee's part of the redefineclasses021.
|
||||
*/
|
||||
@ -42,7 +38,14 @@ public class redefineclasses021b {
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi {
|
||||
public interface redefineclasses021bir {
|
||||
|
||||
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses021bc implements redefineclasses021bi, redefineclasses021bir {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
@ -1,255 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import jdk.test.lib.Utils;
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
import com.sun.jdi.*;
|
||||
import com.sun.jdi.request.*;
|
||||
import com.sun.jdi.event.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.io.*;
|
||||
|
||||
/**
|
||||
* The test against the method <code>com.sun.jdi.VirtualMachine.redefineClasses()</code>
|
||||
* and checks up the following assertion: <br>
|
||||
* "If <code>canUnrestrictedlyRedefineClasses()</code> is <code>false</code> attempting
|
||||
* to change a class modifiers will throw <code>UnsupportedOperationException</code>
|
||||
* exception."
|
||||
*
|
||||
* The test consists of the following files: <br>
|
||||
* <code>redefineclasses023.java</code> - debugger <br>
|
||||
* <code>redefineclasses023a.java</code> - initial debuggee <br>
|
||||
* <code>newclassXX/redefineclasses023a.java</code> - redefining debuggees <br>
|
||||
*
|
||||
* This test performs the following cases: <br>
|
||||
* 1. newclass01 - changing <public> class-modifier to <protected> <br>
|
||||
* 2. newclass02 - changing <public> class-modifier to <private> <br>
|
||||
* 3. newclass03 - changing <public> class-modifier to <private package> <br>
|
||||
* The test checks two different cases for suspended debugee and not
|
||||
* suspended one.
|
||||
* When <code>canRedefineClasses()</code> is <code>false</code>, the test is
|
||||
* considered as passed and completes it's execution.
|
||||
*/
|
||||
|
||||
public class redefineclasses023 {
|
||||
|
||||
public final static String UNEXPECTED_STRING = "***Unexpected exception ";
|
||||
public final static String EXPECTED_STRING = "!!!Expected exception ";
|
||||
|
||||
private final static String prefix = "nsk.jdi.VirtualMachine.redefineClasses.";
|
||||
private final static String debuggerName = prefix + "redefineclasses023";
|
||||
private final static String debugeeName = debuggerName + "a";
|
||||
public final static String testedClassName = debuggerName + "b$redefineclasses023bi";
|
||||
|
||||
private final static String[][] subDirs = {
|
||||
{"newclass01","changing <public> class-modifier to <protected>"},
|
||||
{"newclass02","changing <public> class-modifier to <private>"},
|
||||
{"newclass03","changing <public> class-modifier to <private package>"}
|
||||
};
|
||||
|
||||
private final static String newClassFile = File.separator
|
||||
+ testedClassName.replace('.',File.separatorChar)
|
||||
+ ".class";
|
||||
private final static String oldClassFile
|
||||
= ClassFileFinder.findClassFile(testedClassName, Utils.TEST_CLASS_PATH)
|
||||
.toString();
|
||||
private static final String dashes = "--------------------------";
|
||||
|
||||
private static int exitStatus;
|
||||
private static Log log;
|
||||
private static Debugee debugee;
|
||||
private static String testDir;
|
||||
private static String statDebugee;
|
||||
|
||||
private ReferenceType testedClass;
|
||||
|
||||
private static void display(String msg) {
|
||||
log.display(msg);
|
||||
}
|
||||
|
||||
private static void complain(String msg) {
|
||||
log.complain("debugger FAILURE> " + msg + "\n");
|
||||
}
|
||||
|
||||
public static void main(String argv[]) {
|
||||
System.exit(Consts.JCK_STATUS_BASE + run(argv, System.out));
|
||||
}
|
||||
|
||||
public static int run(String argv[], PrintStream out) {
|
||||
|
||||
exitStatus = Consts.TEST_PASSED;
|
||||
|
||||
redefineclasses023 thisTest = new redefineclasses023();
|
||||
|
||||
ArgumentHandler argHandler = new ArgumentHandler(argv);
|
||||
log = new Log(out, argHandler);
|
||||
|
||||
testDir = argv[0];
|
||||
|
||||
debugee = Debugee.prepareDebugee(argHandler, log, debugeeName);
|
||||
|
||||
try {
|
||||
thisTest.execTest();
|
||||
} catch (TestBug e) {
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
e.printStackTrace();
|
||||
} catch (Exception e) {
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
debugee.resume();
|
||||
debugee.quit();
|
||||
}
|
||||
display("Test finished. exitStatus = " + exitStatus);
|
||||
|
||||
return exitStatus;
|
||||
}
|
||||
|
||||
private void execTest() throws TestBug {
|
||||
|
||||
if (!debugee.VM().canRedefineClasses()) {
|
||||
display("\n>>>canRedefineClasses() is false<<< test canceled.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
testedClass = debugee.classByName(testedClassName);
|
||||
display(typePrompt(testedClass) + "\t:" + testedClass.name());
|
||||
|
||||
display("\nTEST BEGINS");
|
||||
display("===========");
|
||||
|
||||
debugee.VM().suspend();
|
||||
displayVMStatus();
|
||||
performCases();
|
||||
|
||||
debugee.resume();
|
||||
displayVMStatus();
|
||||
performCases();
|
||||
|
||||
display("\n=============");
|
||||
display("TEST FINISHES\n");
|
||||
}
|
||||
|
||||
private void performCases() {
|
||||
Map<? extends com.sun.jdi.ReferenceType,byte[]> mapBytes;
|
||||
boolean alreadyComplained = false;
|
||||
for (int i = 0; i < subDirs.length; i++) {
|
||||
display("\n" + subDirs[i][1] + ">>>");
|
||||
mapBytes = mapClassToBytes(testDir + File.separator + subDirs [i][0] + newClassFile);
|
||||
try {
|
||||
debugee.VM().redefineClasses(mapBytes);
|
||||
if (!debugee.VM().canUnrestrictedlyRedefineClasses()) {
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
if (!alreadyComplained) {
|
||||
alreadyComplained = true;
|
||||
complain("***" + dashes);
|
||||
complain("***" + statDebugee);
|
||||
complain("***" + dashes);
|
||||
}
|
||||
complain("***UnsupportedOperationException is not thrown");
|
||||
complain("***\twhile " + subDirs[i][1]);
|
||||
|
||||
display(">return to the previous state...");
|
||||
mapBytes = mapClassToBytes(oldClassFile);
|
||||
try {
|
||||
debugee.VM().redefineClasses(mapBytes);
|
||||
} catch (Exception e) {
|
||||
throw new TestBug(UNEXPECTED_STRING + e);
|
||||
}
|
||||
}
|
||||
} catch (UnsupportedOperationException e) {
|
||||
if (!debugee.VM().canUnrestrictedlyRedefineClasses()) {
|
||||
display(EXPECTED_STRING + e);
|
||||
} else {
|
||||
exitStatus = Consts.TEST_FAILED;
|
||||
if (!alreadyComplained) {
|
||||
alreadyComplained = true;
|
||||
complain("***" + dashes);
|
||||
complain("***" + statDebugee);
|
||||
complain("***" + dashes);
|
||||
}
|
||||
complain(statDebugee + UNEXPECTED_STRING
|
||||
+ "UnsupportedOperationException");
|
||||
complain("***\twhile " + subDirs[i][1]);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
throw new TestBug(UNEXPECTED_STRING + e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Map<? extends com.sun.jdi.ReferenceType,byte[]> mapClassToBytes(String fileName) {
|
||||
display("class-file\t:" + fileName);
|
||||
File fileToBeRedefined = new File(fileName);
|
||||
int fileToRedefineLength = (int )fileToBeRedefined.length();
|
||||
byte[] arrayToRedefine = new byte[fileToRedefineLength];
|
||||
|
||||
FileInputStream inputFile;
|
||||
try {
|
||||
inputFile = new FileInputStream(fileToBeRedefined);
|
||||
} catch (FileNotFoundException e) {
|
||||
throw new TestBug(UNEXPECTED_STRING + e);
|
||||
}
|
||||
|
||||
try {
|
||||
inputFile.read(arrayToRedefine);
|
||||
inputFile.close();
|
||||
} catch (IOException e) {
|
||||
throw new TestBug(UNEXPECTED_STRING + e);
|
||||
}
|
||||
HashMap<com.sun.jdi.ReferenceType,byte[]> mapForClass = new HashMap<com.sun.jdi.ReferenceType,byte[]>();
|
||||
mapForClass.put(testedClass, arrayToRedefine);
|
||||
return mapForClass;
|
||||
}
|
||||
|
||||
private String typePrompt(ReferenceType refType) {
|
||||
String msg = "Tested ";
|
||||
if (refType instanceof InterfaceType) {
|
||||
msg += "interface";
|
||||
} else if (refType instanceof ClassType) {
|
||||
msg += "class";
|
||||
} else {
|
||||
msg += "type";
|
||||
}
|
||||
return msg;
|
||||
}
|
||||
|
||||
void displayVMStatus() {
|
||||
ThreadReference thrd = debugee.threadByName("main");
|
||||
if (thrd.isSuspended()) {
|
||||
statDebugee = "Debugee is suspended";
|
||||
display("\n\n<<<" + statDebugee + ">>>");
|
||||
display(dashes);
|
||||
} else {
|
||||
statDebugee = "Debugee is not suspended";
|
||||
display("\n\n<<<" + statDebugee + ">>>");
|
||||
display("------------------------------");
|
||||
}
|
||||
}
|
||||
}
|
@ -1,71 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2018, 2020, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* @test
|
||||
*
|
||||
* @summary converted from VM Testbase nsk/jdi/VirtualMachine/redefineClasses/redefineclasses023.
|
||||
* VM Testbase keywords: [jpda, jdi, redefine, quarantine]
|
||||
* VM Testbase comments: 8065773
|
||||
* VM Testbase readme:
|
||||
* DESCRIPTION:
|
||||
* The test against the method com.sun.jdi.VirtualMachine.redefineClasses()
|
||||
* and checks up the following assertion:
|
||||
* "If canUnrestrictedlyRedefineClasses() is false, changing class
|
||||
* modifiers will throw UnsupportedOperationException exception"
|
||||
* The test consists of the following files:
|
||||
* redefineclasses023.java - debugger
|
||||
* redefineclasses023a.java - debuggee
|
||||
* redefineclasses023b.java - an initial redefined class
|
||||
* newclassXX/redefineclasses023b.java - redefining debuggee's class
|
||||
* This test performs the following cases:
|
||||
* 1. newclass01 - changing <public> class-modifier to <protected>
|
||||
* 2. newclass02 - changing <public> class-modifier to <private>
|
||||
* 3. newclass03 - changing <public> class-modifier to <private package>
|
||||
* The test checks two different cases for suspended debugee and not
|
||||
* suspended one.
|
||||
* COMMENTS:
|
||||
*
|
||||
* @library /vmTestbase
|
||||
* /test/lib
|
||||
* @build nsk.jdi.VirtualMachine.redefineClasses.redefineclasses023
|
||||
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses023a
|
||||
*
|
||||
* @comment compile newclassXX to bin/newclassXX
|
||||
* with full debug info
|
||||
* @run driver nsk.share.ExtraClassesBuilder
|
||||
* -g:lines,source,vars
|
||||
* newclass01 newclass02 newclass03
|
||||
*
|
||||
* @run main/othervm
|
||||
* nsk.jdi.VirtualMachine.redefineClasses.redefineclasses023
|
||||
* ./bin
|
||||
* -verbose
|
||||
* -arch=${os.family}-${os.simpleArch}
|
||||
* -waittime=5
|
||||
* -debugee.vmkind=java
|
||||
* -transport.address=dynamic
|
||||
* -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
|
||||
*/
|
||||
|
@ -1,52 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
/**
|
||||
* <code>redefineclasses023b</code> is deugee's part of the redefineclasses023.
|
||||
* changing <public> class-modifier to <protected>
|
||||
*/
|
||||
|
||||
public class redefineclasses023b {
|
||||
|
||||
redefineclasses023bc obj = new redefineclasses023bc();
|
||||
|
||||
protected interface redefineclasses023bi {
|
||||
// ^^^^^^^^^
|
||||
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses023bc implements redefineclasses023bi {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -1,52 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
/**
|
||||
* <code>redefineclasses023b</code> is deugee's part of the redefineclasses023.
|
||||
* changing <public> class-modifier to <private>
|
||||
*/
|
||||
|
||||
public class redefineclasses023b {
|
||||
|
||||
redefineclasses023bc obj = new redefineclasses023bc();
|
||||
|
||||
private interface redefineclasses023bi {
|
||||
// ^^^^^^^
|
||||
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses023bc implements redefineclasses023bi {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -1,52 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2002, 2018, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
package nsk.jdi.VirtualMachine.redefineClasses;
|
||||
|
||||
import nsk.share.*;
|
||||
import nsk.share.jpda.*;
|
||||
import nsk.share.jdi.*;
|
||||
|
||||
/**
|
||||
* <code>redefineclasses023b</code> is deugee's part of the redefineclasses023.
|
||||
* changing <public> class-modifier to <private package>
|
||||
*/
|
||||
|
||||
public class redefineclasses023b {
|
||||
|
||||
redefineclasses023bc obj = new redefineclasses023bc();
|
||||
|
||||
interface redefineclasses023bi {
|
||||
// ^^^^^^
|
||||
|
||||
void dummyMethod01();
|
||||
|
||||
}
|
||||
|
||||
class redefineclasses023bc implements redefineclasses023bi {
|
||||
|
||||
public void dummyMethod01() {
|
||||
}
|
||||
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user