Merge "JDWP: Change more classes to use getClassSignature"
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod002Test.java
index ca1063e..0b17ccc 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod002Test.java
@@ -32,6 +32,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.TaggedObject;
import org.apache.harmony.jpda.tests.framework.jdwp.Value;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -41,7 +42,7 @@
public class InvokeMethod002Test extends JDWPSyncTestCase {
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee";
+ return InvokeMethodDebuggee.class.getName();
}
/**
@@ -60,7 +61,7 @@
CommandPacket packet = new CommandPacket(
JDWPCommands.VirtualMachineCommandSet.CommandSetID,
JDWPCommands.VirtualMachineCommandSet.ClassesBySignatureCommand);
- String classSig = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/InvokeMethodDebuggee;";
+ String classSig = getDebuggeeClassSignature();
packet.setNextValueAsString(classSig);
ReplyPacket reply = debuggeeWrapper.vmMirror.performCommand(packet);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethodTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethodTest.java
index 62004e0..c538f05 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethodTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethodTest.java
@@ -32,6 +32,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.TaggedObject;
import org.apache.harmony.jpda.tests.framework.jdwp.Value;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -45,7 +46,7 @@
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee";
+ return InvokeMethodDebuggee.class.getName();
}
/**
@@ -67,7 +68,7 @@
CommandPacket packet = new CommandPacket(
JDWPCommands.VirtualMachineCommandSet.CommandSetID,
JDWPCommands.VirtualMachineCommandSet.ClassesBySignatureCommand);
- String classSig = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/InvokeMethodDebuggee;";
+ String classSig = getDebuggeeClassSignature();
packet.setNextValueAsString(classSig);
ReplyPacket reply = debuggeeWrapper.vmMirror.performCommand(packet);
checkReplyPacket(reply, "VirtualMachine::ClassesBySignature command");
@@ -223,7 +224,7 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
logWriter.println("\n==> Getting debuggeeRefTypeID... ");
- String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/InvokeMethodDebuggee;";
+ String debuggeeSignature = getDebuggeeClassSignature();
logWriter.println("==> debuggeeSignature = |" + debuggeeSignature + "|+");
long debuggeeRefTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeSignature);
if ( debuggeeRefTypeID == -1 ) {
@@ -295,7 +296,8 @@
checkReplyPacket(reply, "EventRequest::Clear command");
logWriter.println("\n==> Getting invalidClassRefTypeID... ");
- String invalidClassSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/testClass2;";
+ String invalidClassSignature = getDebuggeeClassSignature().replace("InvokeMethodDebuggee",
+ "testClass2");
logWriter.println("==> invalidClassSignature = |" + invalidClassSignature + "|+");
long invalidClassRefTypeID = debuggeeWrapper.vmMirror.getClassID(invalidClassSignature);
if ( invalidClassRefTypeID == -1 ) {
@@ -360,7 +362,7 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
logWriter.println("\n==> Getting debuggeeRefTypeID... ");
- String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/InvokeMethodDebuggee;";
+ String debuggeeSignature = getDebuggeeClassSignature();
logWriter.println("==> debuggeeSignature = |" + debuggeeSignature + "|+");
long debuggeeRefTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeSignature);
if ( debuggeeRefTypeID == -1 ) {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstanceTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstanceTest.java
index dae0c07..d0c7001 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstanceTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstanceTest.java
@@ -32,6 +32,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.TaggedObject;
import org.apache.harmony.jpda.tests.framework.jdwp.Value;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -42,7 +43,7 @@
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee";
+ return InvokeMethodDebuggee.class.getName();
}
/**
@@ -65,7 +66,7 @@
CommandPacket packet = new CommandPacket(
JDWPCommands.VirtualMachineCommandSet.CommandSetID,
JDWPCommands.VirtualMachineCommandSet.ClassesBySignatureCommand);
- String classSig = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/testClass2;";
+ String classSig = getDebuggeeClassSignature().replace("InvokeMethodDebuggee", "testClass2");
packet.setNextValueAsString(classSig);
ReplyPacket reply = debuggeeWrapper.vmMirror.performCommand(packet);
checkReplyPacket(reply, "VirtualMachine::ClassesBySignature command");
@@ -253,7 +254,8 @@
CommandPacket packet = new CommandPacket(
JDWPCommands.VirtualMachineCommandSet.CommandSetID,
JDWPCommands.VirtualMachineCommandSet.ClassesBySignatureCommand);
- String classSig = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/InvokeMethodDebuggee$testClass1;";
+ String classSig = getDebuggeeClassSignature().replace("InvokeMethodDebuggee",
+ "InvokeMethodDebuggee$testClass1");
packet.setNextValueAsString(classSig);
ReplyPacket reply = debuggeeWrapper.vmMirror.performCommand(packet);
checkReplyPacket(reply, "VirtualMachine::ClassesBySignature command");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SuperClassTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SuperClassTest.java
index 694a3cc..e9e150a 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SuperClassTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SuperClassTest.java
@@ -31,6 +31,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPConstants;
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
+import org.apache.harmony.jpda.tests.share.SyncDebuggee;
@@ -116,7 +117,7 @@
ReplyPacket reply = jdwpGetSuperClassReply(classID, JDWPConstants.Error.NONE);
// complare returned signature with superclass signature
- asserSuperClassReplyIsValid(reply, "Lorg/apache/harmony/jpda/tests/share/SyncDebuggee;");
+ asserSuperClassReplyIsValid(reply, getClassSignature(SyncDebuggee.class));
}
// check that there is no superclass for java.lang.Object
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodEntryTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodEntryTest.java
index cd2bb16..b53d9f9 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodEntryTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodEntryTest.java
@@ -52,7 +52,7 @@
public void testMethodEntry() {
logWriter.println("testMethodEntry started");
- String methodEntryClassNameRegexp = "org.apache.harmony.jpda.tests.jdwp.Events.MethodEntryDebuggee";
+ String methodEntryClassNameRegexp = getDebuggeeClassName();
//String methodEntryClassNameSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/MethodEntryDebuggee;";
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitTest.java
index d834649..69c2eb4 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitTest.java
@@ -52,7 +52,7 @@
public void testMethodExit() {
logWriter.println("testMethodExit started");
- String methodExitClassNameRegexp = "org.apache.harmony.jpda.tests.jdwp.Events.MethodEntryDebuggee";
+ String methodExitClassNameRegexp = MethodEntryDebuggee.class.getName();
//String methodExitClassNameSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/MethodEntryDebuggee;";
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnterTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnterTest.java
index 5ede1fa..7f80e5b 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnterTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnterTest.java
@@ -27,11 +27,11 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
public class MonitorContendedEnterTest extends JDWPSyncTestCase {
- String monitorSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitMockMonitor;";
+ String monitorSignature = getClassSignature(MonitorWaitMockMonitor.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.Events.MonitorContendedEnterAndEnteredDebuggee";
+ return MonitorContendedEnterAndEnteredDebuggee.class.getName();
}
public void testMonitorContendedEnterForClassMatch() {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnteredTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnteredTest.java
index 57fe6d0..fc0bf0f 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnteredTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorContendedEnteredTest.java
@@ -27,11 +27,11 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
public class MonitorContendedEnteredTest extends JDWPSyncTestCase {
- String monitorSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitMockMonitor;";
+ String monitorSignature = getClassSignature(MonitorWaitMockMonitor.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.Events.MonitorContendedEnterAndEnteredDebuggee";
+ return MonitorContendedEnterAndEnteredDebuggee.class.getName();
}
public void testMonitorContendedEnteredForClassMatch() {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitTest.java
index f8e5c2b..b146890 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitTest.java
@@ -27,11 +27,11 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
public class MonitorWaitTest extends JDWPSyncTestCase {
- String monitorSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitMockMonitor;";
+ String monitorSignature = getClassSignature(MonitorWaitMockMonitor.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitAndWaitedDebuggee";
+ return MonitorWaitAndWaitedDebuggee.class.getName();
}
public void testMonitorWaitForClassOnly() {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitedTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitedTest.java
index dd7af6d..c1fa48e 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitedTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitedTest.java
@@ -27,11 +27,11 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
public class MonitorWaitedTest extends JDWPSyncTestCase {
- String monitorSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/MonitorWaitMockMonitor;";
+ String monitorSignature = getClassSignature(MonitorWaitMockMonitor.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.Events.MonitorWaitAndWaitedDebuggee";
+ return MonitorWaitAndWaitedDebuggee.class.getName();
}
public void testMonitorWaitedForClassOnly() {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassPrepareTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassPrepareTest.java
index 0252def..d7d8bd5 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassPrepareTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassPrepareTest.java
@@ -56,7 +56,8 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
- String class2prepareRegexp = "org.apache.harmony.jpda.tests.jdwp.Events.Class2Prepare";
+ String class2prepareRegexp =
+ getDebuggeeClassName().replaceAll("ClassPrepareDebuggee", "Class2Prepare");
//String class2prepareSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/Class2Prepare;";
ReplyPacket reply = debuggeeWrapper.vmMirror
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionTest.java
index 6fc5c28..2c4e331 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionTest.java
@@ -29,6 +29,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.CommandPacket;
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPConstants;
import org.apache.harmony.jpda.tests.framework.jdwp.ParsedEvent;
+import org.apache.harmony.jpda.tests.jdwp.Events.DebuggeeException;
import org.apache.harmony.jpda.tests.jdwp.Events.ExceptionCaughtDebuggee;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -55,7 +56,7 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
- String exceptionSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/DebuggeeException;";
+ String exceptionSignature = getClassSignature(DebuggeeException.class);
boolean isCatch = true;
boolean isUncatch = true;
logWriter.println("\n>> testExceptionEvent: => setException(...)...");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java
index 75e0c00..e6290a9 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java
@@ -35,13 +35,11 @@
*/
public class RefTypeIDTest extends JDWPSyncTestCase {
- private final String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/MultiSessionDebuggee;";
-
private final String METHOD_NAME = "printWord";
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.MultiSession.MultiSessionDebuggee";
+ return MultiSessionDebuggee.class.getName();
}
/**
@@ -55,7 +53,7 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
- long classID = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_SIGNATURE);
+ long classID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
logWriter.println("");
logWriter.println("=> CLOSE CONNECTION..");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethodTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethodTest.java
index 6a1f74d..373c9cf 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethodTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethodTest.java
@@ -31,6 +31,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.framework.jdwp.TaggedObject;
import org.apache.harmony.jpda.tests.framework.jdwp.Value;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -54,7 +55,7 @@
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.InvokeMethodDebuggee";
+ return InvokeMethodDebuggee.class.getName();
}
protected int setEventRequest() {
@@ -176,7 +177,7 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
// Get referenceTypeID
- String classSig = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/testClass2;";
+ String classSig = getDebuggeeClassSignature().replace("InvokeMethodDebuggee", "testClass2");
long typeID = getReferenceTypeID(classSig);
// Get methodIDs
@@ -286,11 +287,11 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
// Get referenceTypeID of super class
- String classSig = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/testClass2;";
+ String classSig = getDebuggeeClassSignature().replace("InvokeMethodDebuggee", "testClass2");
long typeIDSuper = getReferenceTypeID(classSig);
// Get referenceTypeID of child class
- classSig = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/testClass3;";
+ classSig = getDebuggeeClassSignature().replace("InvokeMethodDebuggee", "testClass3");
long typeIDChild = getReferenceTypeID(classSig);
// Get methodID
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassFileVersionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassFileVersionTest.java
index f563b7d..20afa5c 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassFileVersionTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassFileVersionTest.java
@@ -35,13 +35,12 @@
static final String thisCommandName = "ReferenceType.ClassFileVersion command";
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassFileVersionDebuggee;";
-
- static final String debuggeeClass = "org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassFileVersionDebuggee.class";
+ static final String debuggeeClass =
+ ClassFileVersionDebuggee.class.getName().replace('.', '/') + ".class";
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.ClassFileVersionDebuggee";
+ return ClassFileVersionDebuggee.class.getName();
}
/**
@@ -57,7 +56,7 @@
+ ": START...");
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
- long refTypeID = getClassIDBySignature(debuggeeSignature);
+ long refTypeID = getClassIDBySignature(getDebuggeeClassSignature());
logWriter.println("=> Debuggee class = " + getDebuggeeClassName());
logWriter.println("=> referenceTypeID for Debuggee class = "
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassLoaderTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassLoaderTest.java
index 122a8ae..7daf55f 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassLoaderTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassLoaderTest.java
@@ -30,6 +30,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPConstants;
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -41,11 +42,11 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
static final String thisCommandName = "ReferenceType.ClassLoader command";
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/HelloWorld;";
+ static final String debuggeeSignature = getClassSignature(HelloWorld.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld";
+ return HelloWorld.class.getName();
}
/**
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ConstantPoolTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ConstantPoolTest.java
index 230112f..2d2813c 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ConstantPoolTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ConstantPoolTest.java
@@ -40,14 +40,13 @@
static final String thisCommandName = "ReferenceType.ConstantPool command";
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/ConstantPoolDebuggee;";
-
- static final String debuggeeClass = "org/apache/harmony/jpda/tests/jdwp/ReferenceType/ConstantPoolDebuggee.class";
+ static final String debuggeeClass =
+ ConstantPoolDebuggee.class.getName().replace('.', '/') + ".class";
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.ConstantPoolDebuggee";
+ return ConstantPoolDebuggee.class.getName();
}
/**
@@ -71,7 +70,7 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
// Compose ConstantPool command
- long refTypeID = getClassIDBySignature(debuggeeSignature);
+ long refTypeID = getClassIDBySignature(getDebuggeeClassSignature());
logWriter.println("=> Debuggee class = " + getDebuggeeClassName());
logWriter.println("=> referenceTypeID for Debuggee class = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ModifiersTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ModifiersTest.java
index 0763dba..5cd6c14 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ModifiersTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ModifiersTest.java
@@ -29,6 +29,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPCommands;
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -40,13 +41,22 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
static final String thisCommandName = "ReferenceType.Modifiers command";
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/HelloWorld;";
- static final String debuggeeInterfaceSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/HelloWorldInterface;";
- static final String debuggeeInterfaceClassName = "org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorldInterface";
+ static final String debuggeeSignature = getClassSignature(HelloWorld.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld";
+ return HelloWorld.class.getName();
+ }
+
+ // Note: HelloWorldInterface is intentionally not public, so we cannot use a class literal
+ // to construct the strings. But for potential renaming, this needs to be computed.
+
+ private String getDebuggeeInterfaceSignature() {
+ return debuggeeSignature.replace("HelloWorld", "HelloWorldInterface");
+ }
+
+ private String getDebuggeeInterfaceClassName() {
+ return getDebuggeeClassName().replace("HelloWorld", "HelloWorldInterface");
}
/**
@@ -152,9 +162,9 @@
String failMessage = "";
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
- long refTypeID = getClassIDBySignature(debuggeeInterfaceSignature);
+ long refTypeID = getClassIDBySignature(getDebuggeeInterfaceSignature());
- logWriter.println("=> Debuggee Interface class = " + debuggeeInterfaceClassName);
+ logWriter.println("=> Debuggee Interface class = " + getDebuggeeInterfaceClassName());
logWriter.println("=> referenceTypeID for Debuggee interface = " + refTypeID);
logWriter.println("=> CHECK1: send " + thisCommandName + " and check reply...");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesTest.java
index d83da22..da54f82 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesTest.java
@@ -41,11 +41,11 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
static final String thisCommandName = "ReferenceType.NestedTypes command";
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesDebuggee;";
+ static final String debuggeeSignature = getClassSignature(NestedTypesDebuggee.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.NestedTypesDebuggee";
+ return NestedTypesDebuggee.class.getName();
}
/**
@@ -80,9 +80,11 @@
logWriter.println("=> Returned nested types number = " + returnedNestedTypesNumber);
String nestedTypeSignatures[] = {
- "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesDebuggee$StatInterf_1;",
- "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesDebuggee$StatClass_1;",
- "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/NestedTypesDebuggee$NonStatClass_1;",
+ debuggeeSignature.replace("NestedTypesDebuggee",
+ "NestedTypesDebuggee$StatInterf_1"),
+ debuggeeSignature.replace("NestedTypesDebuggee", "NestedTypesDebuggee$StatClass_1"),
+ debuggeeSignature.replace("NestedTypesDebuggee",
+ "NestedTypesDebuggee$NonStatClass_1"),
};
byte nestedTypeTags[] = {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureTest.java
index 7d9b4ff..19a3948 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureTest.java
@@ -29,6 +29,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPCommands;
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -40,11 +41,11 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
static final String thisCommandName = "ReferenceType.Signature command";
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/HelloWorld;";
+ static final String debuggeeSignature = getClassSignature(HelloWorld.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld";
+ return HelloWorld.class.getName();
}
/**
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceDebugExtensionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceDebugExtensionTest.java
index 0a057e7..7af6830 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceDebugExtensionTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceDebugExtensionTest.java
@@ -42,14 +42,13 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
static final String thisCommandName = "ReferenceType.SourceDebugExtension command";
- static final String debuggeeSignature =
- "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceDebugExtensionDebuggee;";
+ static final String debuggeeSignature = getClassSignature(SourceDebugExtensionDebuggee.class);
static final String expectedSourceDebugExtension = "SMAP\nhelloworld_jsp.java\nJSP\n*S JSP\n" +
"*F\n+ 0 helloworld.jsp\nhelloworld.jsp\n*L\n1,5:53\n6:58,3\n7,4:61\n*E\n";
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.SourceDebugExtensionDebuggee";
+ return SourceDebugExtensionDebuggee.class.getName();
}
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFrames002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFrames002Test.java
index 2fa4d2e..6ef87d5 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFrames002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFrames002Test.java
@@ -38,7 +38,7 @@
*/
public class PopFrames002Test extends JDWPStackFrameTestCase {
- private String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/StackFrame/PopFramesDebuggee;";
+ private String debuggeeSignature = getClassSignature(PopFramesDebuggee.class);
private String breakpointMethodName = "nestledMethod4";
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFramesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFramesTest.java
index e9d13af..cf24990 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFramesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/PopFramesTest.java
@@ -35,7 +35,7 @@
*/
public class PopFramesTest extends JDWPStackFrameTestCase {
- private String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/StackFrame/PopFramesDebuggee;";
+ private String debuggeeSignature = getClassSignature(PopFramesDebuggee.class);
private String breakpointMethodName = "nestledMethod4";
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StringReference/ValueTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StringReference/ValueTest.java
index a93fe45..0230898 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StringReference/ValueTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StringReference/ValueTest.java
@@ -32,6 +32,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPTestConstants;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -123,7 +124,7 @@
logWriter.println("testStringReferenceValueTest001_InvalidString started");
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
- String signature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/HelloWorld;";
+ String signature = getClassSignature(HelloWorld.class);
long debuggeeClassID = getClassIDBySignature(signature);
checkCommandError(debuggeeClassID, JDWPConstants.Error.INVALID_STRING);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturn006Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturn006Test.java
index 43946d6..43018a1 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturn006Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturn006Test.java
@@ -30,11 +30,11 @@
static final String thisCommandName = "ThreadReference.ForceEarlyReturn command ";
- static final String testObjSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ThreadReference/TestObject;";
+ static final String testObjSignature = getClassSignature(TestObject.class);
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.ThreadReference.ForceEarlyReturnDebuggee";
+ return ForceEarlyReturnDebuggee.class.getName();
}
// Get the objectID of test thread
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturnTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturnTest.java
index 19f3a21..f5c63cf 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturnTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturnTest.java
@@ -23,7 +23,6 @@
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPConstants;
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.framework.jdwp.Value;
-import org.apache.harmony.jpda.tests.framework.jdwp.JDWPConstants.Tag;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -50,11 +49,9 @@
static Value expectedValue;
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ThreadReference/ForceEarlyReturnDebuggee;";
-
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.ThreadReference.ForceEarlyReturnDebuggee";
+ return ForceEarlyReturnDebuggee.class.getName();
}
private String toString(Value value) {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java
index 49ec7c6..3ad5860 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java
@@ -38,7 +38,7 @@
*/
public class StopTest extends JDWPSyncTestCase {
- static String SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/ThreadReference/StopDebuggee;";
+ static String SIGNATURE = getClassSignature(StopDebuggee.class);
@Override
protected String getDebuggeeClassName() {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ThreadGroup002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ThreadGroup002Test.java
index fd4e7d4..c4192c3 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ThreadGroup002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ThreadGroup002Test.java
@@ -40,12 +40,10 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
- static final String debuggeeSignature =
- "Lorg/apache/harmony/jpda/tests/jdwp/ThreadReference/ThreadGroup002Debuggee;";
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.ThreadReference.ThreadGroup002Debuggee";
+ return ThreadGroup002Debuggee.class.getName();
}
/**
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ClassesBySignatureTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ClassesBySignatureTest.java
index f0eacc9..ddaf9b6 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ClassesBySignatureTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ClassesBySignatureTest.java
@@ -30,6 +30,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPConstants;
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -38,7 +39,7 @@
*/
public class ClassesBySignatureTest extends JDWPSyncTestCase {
- static final String SIGNATURE001 = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/HelloWorld;";
+ static final String SIGNATURE001 = getClassSignature(HelloWorld.class);
@Override
protected String getDebuggeeClassName() {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/RedefineClassesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/RedefineClassesTest.java
index 249ed5a..51f22ee 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/RedefineClassesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/RedefineClassesTest.java
@@ -45,14 +45,15 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
static final String thisCommandName = "VirtualMachine::RedefineClasses command";
- static final String checkedClassSignature
- = "Lorg/apache/harmony/jpda/tests/jdwp/VirtualMachine/RedefineClass_Debuggee;";
+ static final String checkedClassSignature =
+ getClassSignature(RedefineClassesDebuggee.class).replace("RedefineClassesDebuggee",
+ "RedefineClass_Debuggee");
static final String byteCodeToRedefineFile = "RedefineByteCode_Debuggee001";
private static String thisTestName;
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.RedefineClassesDebuggee";
+ return RedefineClassesDebuggee.class.getName();
}
File findNewClassByteCode() {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/SetDefaultStratumTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/SetDefaultStratumTest.java
index d78aa6f..fcd0082 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/SetDefaultStratumTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/SetDefaultStratumTest.java
@@ -30,6 +30,7 @@
import org.apache.harmony.jpda.tests.framework.jdwp.JDWPConstants;
import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
+import org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld;
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
@@ -41,11 +42,10 @@
static final int testStatusPassed = 0;
static final int testStatusFailed = -1;
static final String thisCommandName = "VirtualMachine::SetDefaultStratum command";
- static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/share/debuggee/HelloWorld;";
@Override
protected String getDebuggeeClassName() {
- return "org.apache.harmony.jpda.tests.jdwp.share.debuggee.HelloWorld";
+ return HelloWorld.class.getName();
}
/**
