Harmony: Refactor tests

Remove string signatures in favor of the already existing helper
functions.

Bug: 116674705
Test: mmma external/apache-harmony/jdwp
Test: m apache-harmony-jdwp-tests-hostdex vogar && art/tools/run-jdwp-tests.sh --mode=host
Change-Id: I0b54b83ebb1793a93418aa682dd136c88864cdd5

68 files changed, 195 insertions, 310 deletions

diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/GetValuesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/GetValuesTest.java
index 066df97..029b7e3 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/GetValuesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/GetValuesTest.java
@@ -51,10 +51,7 @@ public class GetValuesTest extends JDWPArrayReferenceTestCase {
         logWriter.println("==> GetValuesTest.testGetValues001 started...");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        String debuggeeSig = "Lorg/apache/harmony/jpda/tests/jdwp/ArrayReference/ArrayReferenceDebuggee;";
-
-        // obtain classID
-        long classID = getClassIDBySignature(debuggeeSig);
+        long classID = getClassIDBySignature(getDebuggeeClassSignature());
 
         // obtain fields
         Field[] fields = debuggeeWrapper.vmMirror.getFieldsInfo(classID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/LengthTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/LengthTest.java
index c9b8f0c..d16d3b6 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/LengthTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/LengthTest.java
@@ -52,7 +52,7 @@ public class LengthTest extends JDWPArrayReferenceTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // obtain classID
-        long classID = getClassIDBySignature("Lorg/apache/harmony/jpda/tests/jdwp/ArrayReference/ArrayReferenceDebuggee;");
+        long classID = getClassIDBySignature(getDebuggeeClassSignature());
 
         // obtain fields
         Field[] fields = debuggeeWrapper.vmMirror.getFieldsInfo(classID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValues002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValues002Test.java
index daf15ab..77b41f7 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValues002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValues002Test.java
@@ -43,7 +43,6 @@ public class SetValues002Test extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ArrayReference::SetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValues002Debuggee;";
 
     /**
      * Returns full name of debuggee class which is used by this test.
@@ -51,7 +50,7 @@ public class SetValues002Test extends JDWPSyncTestCase {
      */
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ArrayReference.SetValues002Debuggee";
+        return SetValues002Debuggee.class.getName();
     }
 
     /**
@@ -67,7 +66,7 @@ public class SetValues002Test extends JDWPSyncTestCase {
         CommandPacket classesBySignatureCommand = new CommandPacket(
                 JDWPCommands.VirtualMachineCommandSet.CommandSetID,
                 JDWPCommands.VirtualMachineCommandSet.ClassesBySignatureCommand);
-        classesBySignatureCommand.setNextValueAsString(debuggeeSignature);
+        classesBySignatureCommand.setNextValueAsString(getDebuggeeClassSignature());
         ReplyPacket classesBySignatureReply =
             debuggeeWrapper.vmMirror.performCommand(classesBySignatureCommand);
         classesBySignatureCommand = null;
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValuesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValuesTest.java
index aebfbe8..fa72331 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValuesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayReference/SetValuesTest.java
@@ -52,7 +52,7 @@ public class SetValuesTest extends JDWPArrayReferenceTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // obtain classID
-        long classID = getClassIDBySignature("Lorg/apache/harmony/jpda/tests/jdwp/ArrayReference/ArrayReferenceDebuggee;");
+        long classID = getClassIDBySignature(getDebuggeeClassSignature());
 
         // obtain fields
         Field[] fields = debuggeeWrapper.vmMirror.getFieldsInfo(classID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod003Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod003Test.java
index b53d95a..4e6393e 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod003Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod003Test.java
@@ -34,7 +34,7 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class InvokeMethod003Test extends JDWPSyncTestCase {
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ClassType.InvokeMethod003Debuggee";
+        return InvokeMethod003Debuggee.class.getName();
     }
 
     /**
@@ -50,8 +50,7 @@ public class InvokeMethod003Test extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Get debuggee class ID.
-        String debuggeeClassSig = "Lorg/apache/harmony/jpda/tests/jdwp/ClassType/InvokeMethod003Debuggee;";
-        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeClassSig);
+        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
         assertTrue("Failed to find debuggee class", debuggeeTypeID != 0);
 
         // Set METHOD_ENTRY event request so application is suspended.
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/JDWPClassTypeTestCase.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/JDWPClassTypeTestCase.java
index 6b677a2..2f4ebf8 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/JDWPClassTypeTestCase.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/JDWPClassTypeTestCase.java
@@ -41,16 +41,7 @@ public class JDWPClassTypeTestCase extends JDWPSyncTestCase {
      */
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ClassType.ClassTypeDebuggee";
-    }
-
-    /**
-     * Returns signature of debuggee class which is used by
-     * testcases in this test.
-     * @return signature of debuggee class.
-     */
-    protected String getDebuggeeSignature() {
-      return "Lorg/apache/harmony/jpda/tests/jdwp/ClassType/ClassTypeDebuggee;";
+        return ClassTypeDebuggee.class.getName();
     }
 
     /**
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstance002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstance002Test.java
index 83dda3c..5659df3 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstance002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/NewInstance002Test.java
@@ -35,7 +35,7 @@ public class NewInstance002Test extends JDWPSyncTestCase {
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ClassType.NewInstance002Debuggee";
+        return NewInstance002Debuggee.class.getName();
     }
 
     /**
@@ -51,8 +51,7 @@ public class NewInstance002Test extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Get debuggee class ID.
-        String debuggeeClassSig = "Lorg/apache/harmony/jpda/tests/jdwp/ClassType/NewInstance002Debuggee;";
-        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeClassSig);
+        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
         assertTrue("Failed to find debuggee class", debuggeeTypeID != 0);
 
         // Set METHOD_ENTRY event request so application is suspended.
@@ -105,7 +104,7 @@ public class NewInstance002Test extends JDWPSyncTestCase {
         assertAllDataRead(reply);
 
         // Get test class ID.
-        String testClassSig = "Lorg/apache/harmony/jpda/tests/jdwp/ClassType/NewInstance002Debuggee$TestClass;";
+        String testClassSig = getClassSignature(NewInstance002Debuggee.TestClass.class);
         long testTypeID = debuggeeWrapper.vmMirror.getClassID(testClassSig);
         assertTrue("Failed to find test class", testTypeID != 0);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValues002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValues002Test.java
index 3ed6c92..1df0668 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValues002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValues002Test.java
@@ -42,11 +42,10 @@ public class SetValues002Test extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ClassType::SetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ClassType/SetValues002Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ClassType.SetValues002Debuggee";
+        return SetValues002Debuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class SetValues002Test extends JDWPSyncTestCase {
         CommandPacket classesBySignatureCommand = new CommandPacket(
                 JDWPCommands.VirtualMachineCommandSet.CommandSetID,
                 JDWPCommands.VirtualMachineCommandSet.ClassesBySignatureCommand);
-        classesBySignatureCommand.setNextValueAsString(debuggeeSignature);
+        classesBySignatureCommand.setNextValueAsString(getDebuggeeClassSignature());
         ReplyPacket classesBySignatureReply =
             debuggeeWrapper.vmMirror.performCommand(classesBySignatureCommand);
         classesBySignatureCommand = null;
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValuesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValuesTest.java
index 7ebba3f..b668361 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValuesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ClassType/SetValuesTest.java
@@ -50,7 +50,7 @@ public class SetValuesTest extends JDWPClassTypeTestCase {
         logWriter.println("testSetValues001 started");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        long classID = getClassIDBySignature(getDebuggeeSignature());
+        long classID = getClassIDBySignature(getDebuggeeClassSignature());
 
         Field[] fields = jdwpGetFieldIDs(classID);
 
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 781cc29..694a3cc 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
@@ -112,7 +112,7 @@ public class SuperClassTest extends JDWPClassTypeTestCase {
 
         // check that superclass for Debuggee is SyncDebuggee
         {
-            long classID = getClassIDBySignature(getDebuggeeSignature());
+            long classID = getClassIDBySignature(getDebuggeeClassSignature());
 
             ReplyPacket reply = jdwpGetSuperClassReply(classID, JDWPConstants.Error.NONE);
             // complare returned signature with superclass signature
@@ -163,7 +163,7 @@ public class SuperClassTest extends JDWPClassTypeTestCase {
 
         // check that reply error code is INVALID_OBJECT for a FieldID Out Data
         {
-            long classID = getClassIDBySignature(getDebuggeeSignature());
+            long classID = getClassIDBySignature(getDebuggeeClassSignature());
 
             Field[] fields = jdwpGetFields(classID);
             // assert stringID is not null
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/CountModifierTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/CountModifierTest.java
index e0d726a..a428367 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/CountModifierTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/CountModifierTest.java
@@ -29,15 +29,6 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  * JDWP Unit test for Count event modifier.
  */
 public class CountModifierTest extends JDWPEventModifierTestCase {
-    private static final
-            String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/CountModifierDebuggee;";
-    private static final
-            String TEST_CLASS_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/CountModifierDebuggee$TestClass;";
-    private static final
-            String TEST_CLASS_NAME = "org.apache.harmony.jpda.tests.jdwp.EventModifiers.CountModifierDebuggee$TestClass";
-    private static final
-            String EXCEPTION_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/CountModifierDebuggee$TestException;";
-
     // The name of the test method where we set our event requests.
     private static final String METHOD_NAME = "eventTestMethod";
 
@@ -73,8 +64,8 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
 
         // Breakpoint at start of test method.
         byte typeTag = JDWPConstants.TypeTag.CLASS;
-        Breakpoint breakpoint = new Breakpoint(TEST_CLASS_SIGNATURE,
-                METHOD_NAME, 0);
+        Breakpoint breakpoint = new Breakpoint(
+                getClassSignature(CountModifierDebuggee.TestClass.class), METHOD_NAME, 0);
         EventBuilder builder = createBreakpointEventBuilder(typeTag,
                 breakpoint);
         testEventWithCountModifier(builder, LOCATION_COUNT_FIELD_NAME);
@@ -96,7 +87,8 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
         logWriter.println("testMethodEntry started");
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        EventBuilder builder = createMethodEntryEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodEntryEventBuilder(
+                CountModifierDebuggee.TestClass.class.getName());
         testEventWithCountModifier(builder, LOCATION_COUNT_FIELD_NAME);
 
         logWriter.println("testMethodEntry done");
@@ -116,7 +108,8 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
         logWriter.println("testMethodExit started");
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        EventBuilder builder = createMethodExitEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodExitEventBuilder(
+                CountModifierDebuggee.TestClass.class.getName());
         testEventWithCountModifier(builder, LOCATION_COUNT_FIELD_NAME);
 
         logWriter.println("testMethodExit done");
@@ -138,7 +131,8 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
         logWriter.println("testMethodExitWithReturnValue started");
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        EventBuilder builder = createMethodExitWithReturnValueEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodExitWithReturnValueEventBuilder(
+                CountModifierDebuggee.TestClass.class.getName());
         testEventWithCountModifier(builder, LOCATION_COUNT_FIELD_NAME);
 
         logWriter.println("testMethodExitWithReturnValue done");
@@ -159,7 +153,8 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
         logWriter.println("testException started");
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        EventBuilder builder = createExceptionEventBuilder(EXCEPTION_SIGNATURE,
+        EventBuilder builder = createExceptionEventBuilder(
+                getClassSignature(CountModifierDebuggee.TestException.class),
                 true, false);
         testEventWithCountModifier(builder,
                 EXCEPTION_EVENT_COUNT_FIELD_NAME);
@@ -185,7 +180,7 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         EventBuilder builder = createFieldAccessEventBuilder(
-                JDWPConstants.TypeTag.CLASS, DEBUGGEE_SIGNATURE,
+                JDWPConstants.TypeTag.CLASS, getDebuggeeClassSignature(),
                 WATCHED_FIELD_NAME);
         testEventWithCountModifier(builder, FIELD_READ_WRITE_COUNT_FIELD_NAME);
 
@@ -210,7 +205,7 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         EventBuilder builder = createFieldModificationEventBuilder(
-                JDWPConstants.TypeTag.CLASS, DEBUGGEE_SIGNATURE,
+                JDWPConstants.TypeTag.CLASS, getDebuggeeClassSignature(),
                 WATCHED_FIELD_NAME);
         testEventWithCountModifier(builder, FIELD_READ_WRITE_COUNT_FIELD_NAME);
 
@@ -228,7 +223,7 @@ public class CountModifierTest extends JDWPEventModifierTestCase {
 
         // Check we properly ignore the (count - 1) previous events.
         int expectedCount = CountModifierDebuggee.EVENT_COUNT;
-        int actualCount = getStaticIntField(DEBUGGEE_SIGNATURE, countFieldName);
+        int actualCount = getStaticIntField(getDebuggeeClassSignature(), countFieldName);
         assertEquals("Invalid event count", expectedCount, actualCount);
 
         clearAndResume(event.eventKind, requestID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/InstanceOnlyModifierTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/InstanceOnlyModifierTest.java
index f43fbd3..ae35211 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/InstanceOnlyModifierTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/InstanceOnlyModifierTest.java
@@ -32,14 +32,6 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  * JDWP Unit test for InstanceOnly event modifier.
  */
 public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
-
-    private static final
-            String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/InstanceOnlyModifierDebuggee;";
-    private static final
-            String TEST_CLASS_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/InstanceOnlyModifierDebuggee$TestClass;";
-    private static final
-            String TEST_CLASS_NAME = "org.apache.harmony.jpda.tests.jdwp.EventModifiers.InstanceOnlyModifierDebuggee$TestClass";
-
     // The name of the test method where we set our event requests.
     private static final String METHOD_NAME = "eventTestMethod";
 
@@ -69,7 +61,8 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         byte typeTag = JDWPConstants.TypeTag.CLASS;
-        Breakpoint breakpoint = new Breakpoint(TEST_CLASS_SIGNATURE,
+        Breakpoint breakpoint = new Breakpoint(
+                getClassSignature(InstanceOnlyModifierDebuggee.TestClass.class),
                 METHOD_NAME, 0);
         EventBuilder builder = createBreakpointEventBuilder(typeTag,
                 breakpoint);
@@ -94,7 +87,8 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        EventBuilder builder = createMethodEntryEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodEntryEventBuilder(
+                InstanceOnlyModifierDebuggee.TestClass.class.getName());
         testEventWithInstanceOnlyModifier(builder);
 
         logWriter.println("testMethodEntry done");
@@ -117,7 +111,8 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        EventBuilder builder = createMethodExitEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodExitEventBuilder(
+                InstanceOnlyModifierDebuggee.TestClass.class.getName());
         testEventWithInstanceOnlyModifier(builder);
 
         logWriter.println("testMethodExit done");
@@ -142,7 +137,8 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        EventBuilder builder = createMethodExitWithReturnValueEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodExitWithReturnValueEventBuilder(
+                InstanceOnlyModifierDebuggee.TestClass.class.getName());
         testEventWithInstanceOnlyModifier(builder);
 
         logWriter.println("testMethodExitWithReturnValue done");
@@ -165,7 +161,7 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         String exceptionClassSignature =
-                "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/InstanceOnlyModifierDebuggee$TestException;";
+                getClassSignature(InstanceOnlyModifierDebuggee.TestException.class);
         EventBuilder builder = createExceptionEventBuilder(exceptionClassSignature, true, false);
         testEventWithInstanceOnlyModifier(builder);
 
@@ -190,7 +186,8 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         EventBuilder builder = createFieldAccessEventBuilder(
-                JDWPConstants.TypeTag.CLASS, TEST_CLASS_SIGNATURE,
+                JDWPConstants.TypeTag.CLASS,
+                getClassSignature(InstanceOnlyModifierDebuggee.TestClass.class),
                 WATCHED_FIELD_NAME);
         testEventWithInstanceOnlyModifier(builder);
 
@@ -215,7 +212,8 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         EventBuilder builder = createFieldModificationEventBuilder(
-                JDWPConstants.TypeTag.CLASS, TEST_CLASS_SIGNATURE,
+                JDWPConstants.TypeTag.CLASS,
+                getClassSignature(InstanceOnlyModifierDebuggee.TestClass.class),
                 WATCHED_FIELD_NAME);
         testEventWithInstanceOnlyModifier(builder);
 
@@ -223,7 +221,7 @@ public class InstanceOnlyModifierTest extends JDWPEventModifierTestCase {
     }
 
     private long getInstanceObjectId() {
-        Value fieldValue = getFieldValue(DEBUGGEE_SIGNATURE,
+        Value fieldValue = getFieldValue(getDebuggeeClassSignature(),
                 INSTANCE_FIELD_NAME);
         assertEquals("Invalid field value tag", JDWPConstants.Tag.OBJECT_TAG,
                 fieldValue.getTag());
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/ThreadOnlyModifierTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/ThreadOnlyModifierTest.java
index 7061bc1..7afb164 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/ThreadOnlyModifierTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/EventModifiers/ThreadOnlyModifierTest.java
@@ -30,14 +30,6 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  * JDWP Unit test for ThreadOnly event modifier.
  */
 public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
-
-    private static final
-            String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/ThreadOnlyModifierDebuggee;";
-    private static final
-            String TEST_CLASS_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/ThreadOnlyModifierDebuggee$TestClass;";
-    private static final
-            String TEST_CLASS_NAME = "org.apache.harmony.jpda.tests.jdwp.EventModifiers.ThreadOnlyModifierDebuggee$TestClass";
-
     // The name of the test method where we set our event requests.
     private static final String METHOD_NAME = "eventTestMethod";
 
@@ -65,7 +57,8 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         byte typeTag = JDWPConstants.TypeTag.CLASS;
-        Breakpoint breakpoint = new Breakpoint(TEST_CLASS_SIGNATURE,
+        Breakpoint breakpoint = new Breakpoint(
+                getClassSignature(ThreadOnlyModifierDebuggee.TestClass.class),
                 METHOD_NAME, 0);
         EventBuilder builder = createBreakpointEventBuilder(typeTag,
                 breakpoint);
@@ -87,7 +80,8 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
         logWriter.println("testMethodEntry started");
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        EventBuilder builder = createMethodEntryEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodEntryEventBuilder(
+                ThreadOnlyModifierDebuggee.TestClass.class.getName());
         testEventWithThreadOnlyModifier(builder);
 
         logWriter.println("testMethodEntry done");
@@ -106,7 +100,8 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
         logWriter.println("testMethodExit started");
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        EventBuilder builder = createMethodExitEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodExitEventBuilder(
+                ThreadOnlyModifierDebuggee.TestClass.class.getName());
         testEventWithThreadOnlyModifier(builder);
 
         logWriter.println("testMethodExit done");
@@ -128,7 +123,8 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
         logWriter.println("testMethodExitWithReturnValue started");
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        EventBuilder builder = createMethodExitWithReturnValueEventBuilder(TEST_CLASS_NAME);
+        EventBuilder builder = createMethodExitWithReturnValueEventBuilder(
+                ThreadOnlyModifierDebuggee.TestClass.class.getName());
         testEventWithThreadOnlyModifier(builder);
 
         logWriter.println("testMethodExitWithReturnValue done");
@@ -149,7 +145,7 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         EventBuilder builder = createExceptionEventBuilder(
-                "Lorg/apache/harmony/jpda/tests/jdwp/EventModifiers/ThreadOnlyModifierDebuggee$TestException;",
+                getClassSignature(ThreadOnlyModifierDebuggee.TestException.class),
                 true, false);
         testEventWithThreadOnlyModifier(builder);
 
@@ -209,7 +205,7 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         EventBuilder builder = createFieldAccessEventBuilder(
-                JDWPConstants.TypeTag.CLASS, DEBUGGEE_SIGNATURE,
+                JDWPConstants.TypeTag.CLASS, getDebuggeeClassSignature(),
                 WATCHED_FIELD_NAME);
         testEventWithThreadOnlyModifier(builder);
 
@@ -233,7 +229,7 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         EventBuilder builder = createFieldModificationEventBuilder(
-                JDWPConstants.TypeTag.CLASS, DEBUGGEE_SIGNATURE,
+                JDWPConstants.TypeTag.CLASS, getDebuggeeClassSignature(),
                 WATCHED_FIELD_NAME);
         testEventWithThreadOnlyModifier(builder);
 
@@ -241,7 +237,7 @@ public class ThreadOnlyModifierTest extends JDWPEventModifierTestCase {
     }
 
     private long getFilteredThreadId() {
-        Value fieldValue = getFieldValue(DEBUGGEE_SIGNATURE, THREAD_FIELD_NAME);
+        Value fieldValue = getFieldValue(getDebuggeeClassSignature(), THREAD_FIELD_NAME);
         assertEquals("Invalid field value tag", JDWPConstants.Tag.THREAD_TAG,
                 fieldValue.getTag());
         return fieldValue.getLongValue();
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassPrepareTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassPrepareTest.java
index 6c831f3..ae3033d 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassPrepareTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassPrepareTest.java
@@ -52,8 +52,8 @@ public class ClassPrepareTest extends JDWPEventTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        String class2prepareRegexp = "org.apache.harmony.jpda.tests.jdwp.Events.Class2Prepare";
-        String class2prepareSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/Class2Prepare;";
+        String class2prepareRegexp = Class2Prepare.class.getName();
+        String class2prepareSignature = getClassSignature(Class2Prepare.class);
 
         ReplyPacket reply = debuggeeWrapper.vmMirror.setClassPrepared(class2prepareRegexp);
         checkReplyPacket(reply, "Set CLASS_PREPARE event");
@@ -88,7 +88,7 @@ public class ClassPrepareTest extends JDWPEventTestCase {
             return;
         }
 
-        String expectedClassSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/Class2Prepare;";
+        String expectedClassSignature = getClassSignature(Class2Prepare.class);
         logWriter.println("==> testClassPrepareEventForSourceNameMatch started");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java
index 5cf7cab..3671af3 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Test.java
@@ -40,13 +40,11 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class CombinedEvents003Test extends CombinedEventsTestCase {
 
-    private String debuggeeSignature =
-        "Lorg/apache/harmony/jpda/tests/jdwp/Events/CombinedEvents003Debuggee;";
+    private final String debuggeeSignature = getDebuggeeClassSignature();
 
-    private String methodForEvents = "emptyMethod";
+    private final String methodForEvents = "emptyMethod";
 
-    private String methodEntryClassNameRegexp =
-        "org.apache.harmony.jpda.tests.jdwp.Events.CombinedEvents003Debuggee";
+    private final String methodEntryClassNameRegexp = getDebuggeeClassName();
 
     private boolean eventVmDeathReceived = false;
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEventsTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEventsTest.java
index cfe6db9..f0dd1bf 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEventsTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedEventsTest.java
@@ -40,13 +40,11 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class CombinedEventsTest extends CombinedEventsTestCase {
 
-    private String debuggeeSignature =
-        "Lorg/apache/harmony/jpda/tests/jdwp/Events/CombinedEventsDebuggee;";
+    private final String debuggeeSignature = getDebuggeeClassSignature();
 
-    private String methodForEvents = "sampleMethod";
+    private final String methodForEvents = "sampleMethod";
 
-    private String methodEntryClassNameRegexp =
-        "org.apache.harmony.jpda.tests.jdwp.Events.CombinedEventsDebuggee";
+    private final String methodEntryClassNameRegexp = getDebuggeeClassName();
 
     private boolean eventVmDeathReceived = false;
     private boolean eventMethodExitReceived = false;
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/EventLocationEventTestCase.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/EventLocationEventTestCase.java
index bd65434..4e56046 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/EventLocationEventTestCase.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/EventLocationEventTestCase.java
@@ -37,7 +37,6 @@ abstract class EventLocationEventTestCase extends JDWPEventTestCase {
 
     private Set<Integer> requestIds = new HashSet<Integer>();
 
-    protected abstract String getDebuggeeSignature();
     protected abstract String getExpectedLocationMethodName();
     protected abstract void createEventBuilder(EventBuilder builder);
     protected abstract void checkEvent(ParsedEvent event);
@@ -91,7 +90,7 @@ abstract class EventLocationEventTestCase extends JDWPEventTestCase {
         requestIds.clear();
 
         // Find the method where we expect the event to occur.
-        long typeId = getClassIDBySignature(getDebuggeeSignature());
+        long typeId = getClassIDBySignature(getDebuggeeClassSignature());
         long methodId = getMethodID(typeId, getExpectedLocationMethodName());
 
         // Get its line table
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationTest.java
index b646a65..a38f118 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationTest.java
@@ -28,7 +28,8 @@ import org.apache.harmony.jpda.tests.framework.jdwp.TaggedObject;
  * JDWP Unit test for caught EXCEPTION event with LocationOnly modifier.
  */
 public class ExceptionWithLocationTest extends EventLocationEventTestCase {
-    private static final String EXCEPTION_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/Events/DebuggeeException;";
+    private static final String EXCEPTION_SIGNATURE =
+            getClassSignature(DebuggeeException.class);
 
     // Cache exception class ID.
     private long exceptionClassId = -1;
@@ -55,11 +56,6 @@ public class ExceptionWithLocationTest extends EventLocationEventTestCase {
     }
 
     @Override
-    protected String getDebuggeeSignature() {
-        return "Lorg/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee;";
-    }
-
-    @Override
     protected String getExpectedLocationMethodName() {
         return "expectedThrowException";
     }
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldAccessTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldAccessTest.java
index 3c517b5..ce34d33 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldAccessTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldAccessTest.java
@@ -54,7 +54,7 @@ public class FieldAccessTest extends JDWPEventTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        String classSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/FieldDebuggee;";
+        String classSignature = getDebuggeeClassSignature();
         ReplyPacket reply = debuggeeWrapper.vmMirror.setFieldAccess(classSignature, JDWPConstants.TypeTag.CLASS, "testIntField");
         checkReplyPacket(reply, "Set FIELD_ACCESS event");
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldModificationTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldModificationTest.java
index 213ab86..dd1fbc2 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldModificationTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldModificationTest.java
@@ -54,7 +54,7 @@ public class FieldModificationTest extends JDWPEventTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        String classSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/FieldDebuggee;";
+        String classSignature = getDebuggeeClassSignature();
         ReplyPacket reply = debuggeeWrapper.vmMirror.setFieldModification(classSignature, JDWPConstants.TypeTag.CLASS, "testIntField");
         checkReplyPacket(reply, "Set FIELD_MODIFICATION event");
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldWithLocationTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldWithLocationTest.java
index f008608..fa1c6fe 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldWithLocationTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/FieldWithLocationTest.java
@@ -30,9 +30,6 @@ import org.apache.harmony.jpda.tests.framework.jdwp.TaggedObject;
  * LocationOnly modifier.
  */
 public class FieldWithLocationTest extends EventLocationEventTestCase {
-
-    private static final String DEBUGGEE_SIGNATURE =
-            "Lorg/apache/harmony/jpda/tests/jdwp/Events/FieldWithLocationDebuggee;";
     private static final String FIELD_NAME = "testIntField";
 
     // Cache debuggee class ID.
@@ -75,11 +72,6 @@ public class FieldWithLocationTest extends EventLocationEventTestCase {
     }
 
     @Override
-    protected final String getDebuggeeSignature() {
-        return DEBUGGEE_SIGNATURE;
-    }
-
-    @Override
     protected final String getExpectedLocationMethodName() {
         return "expectedMethodForFieldEvent";
     }
@@ -87,7 +79,7 @@ public class FieldWithLocationTest extends EventLocationEventTestCase {
     @Override
     protected final void createEventBuilder(EventBuilder builder) {
         if (debuggeeClassId == -1) {
-            debuggeeClassId = getClassIDBySignature(DEBUGGEE_SIGNATURE);
+            debuggeeClassId = getClassIDBySignature(getDebuggeeClassSignature());
         }
         if (fieldId == -1) {
             fieldId = debuggeeWrapper.vmMirror.getFieldID(debuggeeClassId, FIELD_NAME);
@@ -112,7 +104,7 @@ public class FieldWithLocationTest extends EventLocationEventTestCase {
         long typeID = getObjectReferenceType(accessedField.objectID);
         String returnedExceptionSignature = getClassSignature(typeID);
         assertString("Invalid class signature,",
-                DEBUGGEE_SIGNATURE, returnedExceptionSignature);
+                getDebuggeeClassSignature(), returnedExceptionSignature);
     }
 
     private static String getFieldCapabilityName(boolean modification) {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitWithReturnValueTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitWithReturnValueTest.java
index 177c12e..4168ba3 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitWithReturnValueTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/MethodExitWithReturnValueTest.java
@@ -43,7 +43,7 @@ public class MethodExitWithReturnValueTest extends JDWPEventTestCase {
      */
     public void testMethodExitWithReturnValueException() {
         logWriter.println("==> Start testMethodExitWithReturnValue which method will throw IOException.");
-        String methodExitClassNameRegexp = "org.apache.harmony.jpda.tests.jdwp.Events.MethodExitWithReturnValueDebuggee";
+        String methodExitClassNameRegexp = getDebuggeeClassName();
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Set event request for MethodExitWithReturnValue
@@ -72,7 +72,7 @@ public class MethodExitWithReturnValueTest extends JDWPEventTestCase {
                 JDWPConstants.EventKind.getName(event.getEventKind()));
 
         long refID = event.getLocation().classID;
-        String expectedSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/MethodExitWithReturnValueDebuggee;";
+        String expectedSignature = getDebuggeeClassSignature();
         String actualSignature =  debuggeeWrapper.vmMirror.getReferenceTypeSignature(refID);
         assertEquals("Invalid class signature of method caller,",expectedSignature,actualSignature);
     }
@@ -154,7 +154,7 @@ public class MethodExitWithReturnValueTest extends JDWPEventTestCase {
      */
     private void runMethodExitWithReturn(String type){
         logWriter.println("==> Start testMethodExitWithReturnValue with return type of " + type);
-        String methodExitClassNameRegexp = "org.apache.harmony.jpda.tests.jdwp.Events.MethodExitWithReturnValueDebuggee";
+        String methodExitClassNameRegexp = getDebuggeeClassName();
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Set event request for MethodExitWithReturnValue
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepTest.java
index 076afee..2bc1ca1 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepTest.java
@@ -41,14 +41,9 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  * JDWP Unit test for SINGLE_STEP event.
  */
 public class SingleStepTest extends JDWPEventTestCase {
-
-    private String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/SingleStepDebuggee;";
-
-    private String DEBUGGEE_CLASS_NAME = "org.apache.harmony.jpda.tests.jdwp.Events.SingleStepDebuggee";
-
     @Override
     protected String getDebuggeeClassName() {
-        return DEBUGGEE_CLASS_NAME;
+        return SingleStepDebuggee.class.getName();
     }
 
     /**
@@ -105,7 +100,7 @@ public class SingleStepTest extends JDWPEventTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         //find checked method
-        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/Events/SingleStepThroughReflectionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepThroughReflectionTest.java
index e773ed7..a795e57 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepThroughReflectionTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepThroughReflectionTest.java
@@ -35,10 +35,6 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class SingleStepThroughReflectionTest extends JDWPEventTestCase {
 
-    private static final String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/Events/SingleStepThroughReflectionDebuggee;";
-
-    private static final String DEBUGGEE_CLASS_NAME = "org.apache.harmony.jpda.tests.jdwp.Events.SingleStepThroughReflectionDebuggee";
-
     // The method where we set a breakpoint to suspend execution.
     private static final String BREAKPOINT_METHOD = "breakpointTest";
 
@@ -47,7 +43,7 @@ public class SingleStepThroughReflectionTest extends JDWPEventTestCase {
 
     @Override
     protected String getDebuggeeClassName() {
-        return DEBUGGEE_CLASS_NAME;
+        return SingleStepThroughReflectionDebuggee.class.getName();
     }
 
     /**
@@ -65,7 +61,7 @@ public class SingleStepThroughReflectionTest extends JDWPEventTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Find debuggee class id.
-        long refTypeID = getClassIDBySignature(DEBUGGEE_SIGNATURE);
+        long refTypeID = getClassIDBySignature(getDebuggeeClassSignature());
         logWriter.println("=> Debuggee class = " + getDebuggeeClassName());
         logWriter.println("=> referenceTypeID for Debuggee class = " + refTypeID);
         logWriter.println("=> Send ReferenceType::Methods command and get methodIDs ");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepWithLocationTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepWithLocationTest.java
index c101ab9..36c12f1 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepWithLocationTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/SingleStepWithLocationTest.java
@@ -32,8 +32,6 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class SingleStepWithLocationTest extends JDWPEventTestCase {
 
-    private String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/Events/SingleStepDebuggee;";
-
     private static final String BREAKPOINT_METHOD_NAME = "breakpointTest";
 
     @Override
@@ -55,7 +53,7 @@ public class SingleStepWithLocationTest extends JDWPEventTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Set breakpoint.
-        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/MultiSession/BreakpointTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/BreakpointTest.java
index 36e6bd1..d258103 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/BreakpointTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/BreakpointTest.java
@@ -39,13 +39,11 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class BreakpointTest extends JDWPSyncTestCase {
 
-    private String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/MultiSessionDebuggee;";
-
     private String METHOD_NAME = "printWord";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.MultiSession.MultiSessionDebuggee";
+        return MultiSessionDebuggee.class.getName();
     }
 
     /**
@@ -59,7 +57,7 @@ public class BreakpointTest extends JDWPSyncTestCase {
         logWriter.println("==> testClearBreakpoint001 started..");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        long classID = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_SIGNATURE);
+        long classID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
 
         //long requestID =
             debuggeeWrapper.vmMirror.setBreakpointAtMethodBegin(
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java
index 161bac0..022ef75 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java
@@ -35,13 +35,11 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class ClassObjectIDTest extends JDWPSyncTestCase {
 
-    private String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/MultiSessionDebuggee;";
-
     //private 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 @@ public class ClassObjectIDTest extends JDWPSyncTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        long classID = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_SIGNATURE);
+        long classID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
         long classObjectID = debuggeeWrapper.vmMirror.getClassObjectId(classID);
 
         logWriter.println("");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java
index ae1f874..bf34e5b 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java
@@ -45,11 +45,9 @@ public class EnableCollectionTest extends JDWPSyncTestCase {
     static final int testStatusFailed = -1;
     static final String thisCommandName = "MultiSession::EnableCollection command";
 
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionDebuggee;";
-
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.MultiSession.EnableCollectionDebuggee";
+        return EnableCollectionDebuggee.class.getName();
     }
 
     /**
@@ -64,7 +62,7 @@ public class EnableCollectionTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         finalSyncMessage = "TO_FINISH";
 
-        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/MultiSession/FieldAccessTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/FieldAccessTest.java
index 71a2001..20e4b51 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/FieldAccessTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/FieldAccessTest.java
@@ -54,8 +54,7 @@ public class FieldAccessTest extends JDWPEventTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        String classSignature = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/FieldDebuggee;";
-        debuggeeWrapper.vmMirror.setFieldAccess(classSignature,
+        debuggeeWrapper.vmMirror.setFieldAccess(getDebuggeeClassSignature(),
                 JDWPConstants.TypeTag.CLASS, "testIntField");
 
         logWriter.println("");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/FieldModificationTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/FieldModificationTest.java
index f684d09..9ea6bc4 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/FieldModificationTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/FieldModificationTest.java
@@ -55,8 +55,7 @@ public class FieldModificationTest extends JDWPEventTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        String classSignature = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/FieldDebuggee;";
-        debuggeeWrapper.vmMirror.setFieldModification(classSignature,
+        debuggeeWrapper.vmMirror.setFieldModification(getDebuggeeClassSignature(),
                 JDWPConstants.TypeTag.CLASS, "testIntField");
 
         logWriter.println("");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/MethodEntryExitTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/MethodEntryExitTest.java
index f53a3f2..f8c0068 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/MethodEntryExitTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/MethodEntryExitTest.java
@@ -39,15 +39,11 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class MethodEntryExitTest extends JDWPSyncTestCase {
 
-    private String DEBUGGEE_SIGNATURE = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/MultiSessionDebuggee;";
-
     private String METHOD_NAME = "printWord";
 
-    String classNameRegexp = "org.apache.harmony.jpda.tests.jdwp.MultiSession.MultiSessionDebuggee";
-
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.MultiSession.MultiSessionDebuggee";
+        return MultiSessionDebuggee.class.getName();
     }
 
     /**
@@ -62,7 +58,7 @@ public class MethodEntryExitTest extends JDWPSyncTestCase {
 
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        long classID = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_SIGNATURE);
+        long classID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
 
         logWriter.println("=> Set breakpoint at method begin");
         //long requestID =
@@ -71,10 +67,10 @@ public class MethodEntryExitTest extends JDWPSyncTestCase {
 
         logWriter.println("=> Set request for METHOD_ENTRY event");
         debuggeeWrapper.vmMirror
-                .setMethodEntry(classNameRegexp);
+                .setMethodEntry(getDebuggeeClassName());
 
         logWriter.println("=> Set request for METHOD_EXIT event");
-        debuggeeWrapper.vmMirror.setMethodExit(classNameRegexp);
+        debuggeeWrapper.vmMirror.setMethodExit(getDebuggeeClassName());
 
         logWriter.println("");
         logWriter.println("=> CLOSE CONNECTION..");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/SingleStepTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/SingleStepTest.java
index 2d90eac..12307eb 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/SingleStepTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/SingleStepTest.java
@@ -41,13 +41,9 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class SingleStepTest extends JDWPSyncTestCase {
 
-    private String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/MultiSession/SingleStepDebuggee;";
-
-    private String DEBUGGEE_CLASS_NAME = "org.apache.harmony.jpda.tests.jdwp.MultiSession.SingleStepDebuggee";
-
     @Override
     protected String getDebuggeeClassName() {
-        return DEBUGGEE_CLASS_NAME;
+        return SingleStepDebuggee.class.getName();
     }
 
     /**
@@ -68,7 +64,7 @@ public class SingleStepTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         //find checked method
-        long refTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeSignature);
+        long refTypeID = debuggeeWrapper.vmMirror.getClassID(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/ObjectReference/DisableCollectionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/DisableCollectionTest.java
index 6c85642..3b45ac2 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/DisableCollectionTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/DisableCollectionTest.java
@@ -42,11 +42,9 @@ public class DisableCollectionTest extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ObjectReference::DisableCollection command";
 
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/DisableCollectionDebuggee;";
-
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.DisableCollectionDebuggee";
+        return DisableCollectionDebuggee.class.getName();
     }
 
     /**
@@ -65,7 +63,7 @@ public class DisableCollectionTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         finalSyncMessage = "TO_FINISH";
 
-        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/ObjectReference/EnableCollectionTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
index 0df0c1a..c1a8004 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
@@ -43,11 +43,10 @@ public class EnableCollectionTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ObjectReference::EnableCollection command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.EnableCollectionDebuggee";
+        return EnableCollectionDebuggee.class.getName();
     }
 
     /**
@@ -65,7 +64,7 @@ public class EnableCollectionTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         finalSyncMessage = "TO_FINISH";
 
-        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/ObjectReference/GetValues002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Test.java
index a3d1c1a..641bba9 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Test.java
@@ -40,11 +40,10 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class GetValues002Test extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ObjectReference::GetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues002Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.GetValues002Debuggee";
+        return GetValues002Debuggee.class.getName();
     }
 
     /**
@@ -60,7 +59,7 @@ public class GetValues002Test extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Test.java
index 6d784a4..d2b84d5 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Test.java
@@ -41,11 +41,10 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class GetValues003Test extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ObjectReference::GetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.GetValues003Debuggee";
+        return GetValues003Debuggee.class.getName();
     }
 
     /**
@@ -62,7 +61,7 @@ public class GetValues003Test extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java
index 5bcc955..7d86429 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesTest.java
@@ -40,11 +40,10 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class GetValuesTest extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ObjectReference::GetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValuesDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.GetValuesDebuggee";
+        return GetValuesDebuggee.class.getName();
     }
 
     /**
@@ -60,7 +59,7 @@ public class GetValuesTest extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod002Test.java
index 7364c96..a8cdff4 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod002Test.java
@@ -34,7 +34,7 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class InvokeMethod002Test extends JDWPSyncTestCase {
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.InvokeMethod002Debuggee";
+        return InvokeMethod002Debuggee.class.getName();
     }
 
     /**
@@ -50,8 +50,7 @@ public class InvokeMethod002Test extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Get debuggee class ID.
-        String debuggeeClassSig = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod002Debuggee;";
-        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeClassSig);
+        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
         assertTrue("Failed to find debuggee class", debuggeeTypeID != 0);
 
         // Set METHOD_ENTRY event request so application is suspended.
@@ -126,8 +125,8 @@ public class InvokeMethod002Test extends JDWPSyncTestCase {
         assertTrue("Field is null", receiverObjectID != 0);
 
         // Get test class ID.
-        String testClassSig = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod002Debuggee$TestClass;";
-        long testTypeID = debuggeeWrapper.vmMirror.getClassID(testClassSig);
+        long testTypeID = debuggeeWrapper.vmMirror.getClassID(
+                getClassSignature(InvokeMethod002Debuggee.TestClass.class));
         assertTrue("Failed to find test class", testTypeID != 0);
 
         // Get test method ID.
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod003Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod003Test.java
index 2cc7203..a9d4197 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod003Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod003Test.java
@@ -34,7 +34,7 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class InvokeMethod003Test extends JDWPSyncTestCase {
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.InvokeMethod003Debuggee";
+        return InvokeMethod003Debuggee.class.getName();
     }
 
     /**
@@ -52,8 +52,7 @@ public class InvokeMethod003Test extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Get debuggee class ID.
-        String debuggeeClassSig = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod003Debuggee;";
-        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeClassSig);
+        long debuggeeTypeID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
         assertTrue("Failed to find debuggee class", debuggeeTypeID != 0);
 
         // Set METHOD_ENTRY event request so application is suspended.
@@ -128,8 +127,8 @@ public class InvokeMethod003Test extends JDWPSyncTestCase {
         assertTrue("Field is null", receiverObjectID != 0);
 
         // Get test class ID.
-        String testClassSig = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/InvokeMethod003Debuggee$TestClass;";
-        long testTypeID = debuggeeWrapper.vmMirror.getClassID(testClassSig);
+        long testTypeID = debuggeeWrapper.vmMirror.getClassID(
+                getClassSignature(InvokeMethod003Debuggee.TestClass.class));
         assertTrue("Failed to find test class", testTypeID != 0);
 
         // Get java.lang.Object class ID.
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/IsCollectedTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/IsCollectedTest.java
index 939dacd..755a8eb 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/IsCollectedTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/IsCollectedTest.java
@@ -42,11 +42,9 @@ public class IsCollectedTest extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ObjectReference.IsCollected command";
 
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/IsCollectedDebuggee;";
-
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.IsCollectedDebuggee";
+        return IsCollectedDebuggee.class.getName();
     }
 
     /**
@@ -67,7 +65,7 @@ public class IsCollectedTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         finalSyncMessage = "TO_FINISH";
 
-        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/ObjectReference/MonitorInfoTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/MonitorInfoTest.java
index 7457393..b1267eb 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/MonitorInfoTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/MonitorInfoTest.java
@@ -40,11 +40,10 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class MonitorInfoTest extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ObjectReference.MonitorInfo command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/MonitorInfoDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.MonitorInfoDebuggee";
+        return MonitorInfoDebuggee.class.getName();
     }
 
     /**
@@ -67,7 +66,7 @@ public class MonitorInfoTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         finalSyncMessage = "TO_FINISH";
 
-        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/ObjectReference/ReferenceTypeTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferenceTypeTest.java
index d24f021..412cc5f 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferenceTypeTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferenceTypeTest.java
@@ -42,11 +42,10 @@ public class ReferenceTypeTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ObjectReference.ReferenceType command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferenceTypeDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.ReferenceTypeDebuggee";
+        return ReferenceTypeDebuggee.class.getName();
     }
 
     /**
@@ -67,7 +66,7 @@ public class ReferenceTypeTest extends JDWPSyncTestCase {
         CommandPacket classesBySignatureCommand = new CommandPacket(
                 JDWPCommands.VirtualMachineCommandSet.CommandSetID,
                 JDWPCommands.VirtualMachineCommandSet.ClassesBySignatureCommand);
-        classesBySignatureCommand.setNextValueAsString(debuggeeSignature);
+        classesBySignatureCommand.setNextValueAsString(getDebuggeeClassSignature());
 
         ReplyPacket classesBySignatureReply = debuggeeWrapper.vmMirror.performCommand(classesBySignatureCommand);
         classesBySignatureCommand = null;
@@ -129,8 +128,8 @@ public class ReferenceTypeTest extends JDWPSyncTestCase {
                 JDWPConstants.Tag.STRING_TAG,
         };
         String expectedSignatures[] = {
-                "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/Class_ReferenceType001;",
-                "[Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferenceTypeDebuggee;",
+                getClassSignature(Class_ReferenceType001.class),
+                "[" + getClassSignature(ReferenceTypeDebuggee.class),
                 "[Ljava/lang/String;",
                 "Ljava/lang/String;",
         };
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferringObjectsTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferringObjectsTest.java
index d89b5fe..03b407e 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferringObjectsTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferringObjectsTest.java
@@ -36,15 +36,13 @@ public class ReferringObjectsTest extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ObjectReference.ReferringObjects command";
 
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferringObjectsDebuggee;";
+    static final String referreeObjSignature = getClassSignature(ReferringObjectsReferree001.class);
 
-    static final String referreeObjSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferringObjectsReferree001;";
-
-    static final String referrerObjSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/ReferringObjectsReferrer001;";
+    static final String referrerObjSignature = getClassSignature(ReferringObjectsReferrer001.class);
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.ReferringObjectsDebuggee";
+        return ReferringObjectsDebuggee.class.getName();
     }
 
     /**
@@ -96,7 +94,7 @@ public class ReferringObjectsTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         // Get the number of referrer objects in ReferringObjectsDebuggee
-        long debuggeeRefTypeID = getClassIDBySignature(debuggeeSignature);
+        long debuggeeRefTypeID = getClassIDBySignature(getDebuggeeClassSignature());
         long referringObjNumID = debuggeeWrapper.vmMirror.getFieldID(
                 debuggeeRefTypeID, "referringObjNum");
         long[] fieldIDs = new long[1];
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues002Test.java
index 50f9080..ec5708f 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues002Test.java
@@ -42,11 +42,10 @@ public class SetValues002Test extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ObjectReference.SetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues002Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.SetValues002Debuggee";
+        return SetValues002Debuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class SetValues002Test extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues003Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues003Test.java
index e13841a..8a01c37 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues003Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues003Test.java
@@ -42,11 +42,10 @@ public class SetValues003Test extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ObjectReference.SetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues003Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.SetValues003Debuggee";
+        return SetValues003Debuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class SetValues003Test extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Test.java
index 976d14b..1244f2f 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Test.java
@@ -43,11 +43,10 @@ public class SetValues004Test extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ObjectReference.SetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.SetValues004Debuggee";
+        return SetValues004Debuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class SetValues004Test extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValuesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValuesTest.java
index 2db2059..8c39462 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValuesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValuesTest.java
@@ -42,11 +42,10 @@ public class SetValuesTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ObjectReference.SetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValuesDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ObjectReference.SetValuesDebuggee";
+        return SetValuesDebuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class SetValuesTest extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassObjectTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassObjectTest.java
index cfa0178..f9228f5 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassObjectTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassObjectTest.java
@@ -40,11 +40,10 @@ public class ClassObjectTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.ClassObject command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassObjectDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.ClassObjectDebuggee";
+        return ClassObjectDebuggee.class.getName();
     }
 
     /**
@@ -60,13 +59,13 @@ public class ClassObjectTest extends JDWPSyncTestCase {
         //int testStatus = testStatusPassed;
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        long refTypeID = getClassIDBySignature(debuggeeSignature);
+        long refTypeID = getClassIDBySignature(getDebuggeeClassSignature());
 
         logWriter.println("=> Debuggee class = " + getDebuggeeClassName());
         logWriter.println("=> referenceTypeID for Debuggee class = " + refTypeID);
 
-        String debuggeeExtraClassSignature
-            = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/ClassObjectDebuggee_ExtraClass;";
+        String debuggeeExtraClassSignature =
+                getClassSignature(ClassObjectDebuggee_ExtraClass.class);
 
         long debuggeeExtraClassRefTypeID = getClassIDBySignature(debuggeeExtraClassSignature);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsTest.java
index ce454f5..b025cef 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsTest.java
@@ -40,11 +40,10 @@ public class FieldsTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.Fields command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.FieldsDebuggee";
+        return FieldsDebuggee.class.getName();
     }
 
     /**
@@ -60,7 +59,7 @@ public class FieldsTest extends JDWPSyncTestCase {
         int testStatus = testStatusPassed;
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        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/FieldsWithGenericTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsWithGenericTest.java
index 9b67139..1f47002 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsWithGenericTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsWithGenericTest.java
@@ -40,11 +40,10 @@ public class FieldsWithGenericTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.FieldsWithGeneric command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/FieldsWithGenericDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.FieldsWithGenericDebuggee";
+        return FieldsWithGenericDebuggee.class.getName();
     }
 
     /**
@@ -61,7 +60,7 @@ public class FieldsWithGenericTest extends JDWPSyncTestCase {
         int testStatus = testStatusPassed;
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        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/GetValues002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues002Test.java
index 3e7a54a..7ce74fa 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues002Test.java
@@ -42,11 +42,10 @@ public class GetValues002Test extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.GetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues002Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.GetValues002Debuggee";
+        return GetValues002Debuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class GetValues002Test extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues003Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues003Test.java
index eee4820..8cf1ee2 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues003Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues003Test.java
@@ -39,12 +39,11 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class GetValues003Test extends JDWPSyncTestCase {
 
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues003Debuggee;";
-    static final String chekedClassSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/RFGetValues003CheckedClass;";
+    static final String chekedClassSignature = getClassSignature(RFGetValues003CheckedClass.class);
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.GetValues003Debuggee";
+        return GetValues003Debuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class GetValues003Test extends JDWPSyncTestCase {
         ("\n=> Get debuggeeRefTypeID for debuggee class = " + getDebuggeeClassName() + "...");
         long debuggeeRefTypeID = 0;
         try {
-            debuggeeRefTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeSignature);
+            debuggeeRefTypeID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
         } catch ( Throwable thrown) {
             logWriter.println("## FAILURE: Can not get debuggeeRefTypeID:");
             logWriter.println("## Exception: " + thrown);
@@ -71,8 +70,8 @@ public class GetValues003Test extends JDWPSyncTestCase {
         }
         if ( debuggeeRefTypeID == -1 ) {
             logWriter.println("## FAILURE: Can not get debuggeeRefTypeID for given signature!");
-            logWriter.println("## Signature = |" + debuggeeSignature + "|");
-            fail("Can not get debuggeeRefTypeID for given signature:<" + debuggeeSignature + ">");
+            logWriter.println("## Signature = |" + getDebuggeeClassSignature() + "|");
+            fail("Can not get debuggeeRefTypeID for given signature:<" + getDebuggeeClassSignature() + ">");
         }
         logWriter.println("=> debuggeeRefTypeID = " + debuggeeRefTypeID);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues004Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues004Test.java
index 2e355a1..e761f4b 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues004Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues004Test.java
@@ -39,12 +39,11 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
  */
 public class GetValues004Test extends JDWPSyncTestCase {
 
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues004Debuggee;";
-    static final String anotherClassSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/RFGetValues004AnotherClass;";
+    static final String anotherClassSignature = getClassSignature(RFGetValues004AnotherClass.class);
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.GetValues004Debuggee";
+        return GetValues004Debuggee.class.getName();
     }
 
     /**
@@ -95,7 +94,7 @@ public class GetValues004Test extends JDWPSyncTestCase {
         ("\n=> Get debuggeeRefTypeID for debuggee class = " + getDebuggeeClassName() + "...");
         long debuggeeRefTypeID = 0;
         try {
-            debuggeeRefTypeID = debuggeeWrapper.vmMirror.getClassID(debuggeeSignature);
+            debuggeeRefTypeID = debuggeeWrapper.vmMirror.getClassID(getDebuggeeClassSignature());
         } catch ( Throwable thrown) {
             logWriter.println("## FAILURE: Can not get debuggeeRefTypeID:");
             logWriter.println("## Exception: " + thrown);
@@ -103,8 +102,8 @@ public class GetValues004Test extends JDWPSyncTestCase {
         }
         if ( debuggeeRefTypeID == -1 ) {
             logWriter.println("## FAILURE: Can not get debuggeeRefTypeID for given signature!");
-            logWriter.println("## Signature = |" + debuggeeSignature + "|");
-            fail("Can not get debuggeeRefTypeID for given signature:<" + debuggeeSignature + ">");
+            logWriter.println("## Signature = |" + getDebuggeeClassSignature() + "|");
+            fail("Can not get debuggeeRefTypeID for given signature:<" + getDebuggeeClassSignature() + ">");
         }
         logWriter.println("=> debuggeeRefTypeID = " + debuggeeRefTypeID);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Test.java
index 9955874..fad7c9e 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Test.java
@@ -41,11 +41,10 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class GetValues005Test extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ReferenceType.GetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.GetValues005Debuggee";
+        return GetValues005Debuggee.class.getName();
     }
 
     /**
@@ -61,7 +60,7 @@ public class GetValues005Test extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": START...");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        long debuggeeRefTypeID = getClassIDBySignature(debuggeeSignature);
+        long debuggeeRefTypeID = getClassIDBySignature(getDebuggeeClassSignature());
 
         logWriter.println("=> Debuggee class = " + getDebuggeeClassName());
         logWriter.println("=> referenceTypeID for Debuggee class = " + debuggeeRefTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValuesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValuesTest.java
index fbfd5be..2ba6118 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValuesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValuesTest.java
@@ -42,11 +42,10 @@ public class GetValuesTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.GetValues command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValuesDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.GetValuesDebuggee";
+        return GetValuesDebuggee.class.getName();
     }
 
     /**
@@ -62,7 +61,7 @@ public class GetValuesTest extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
@@ -78,7 +77,7 @@ public class GetValuesTest extends JDWPSyncTestCase {
         String checkedFieldSignatures[] = {
                 "I",
                 "J",
-                "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValuesDebuggee;",
+                getClassSignature(GetValuesDebuggee.class),
                 "Ljava/lang/String;",
                 "[I",
         };
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InstancesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InstancesTest.java
index 79a4315..be3e4d2 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InstancesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InstancesTest.java
@@ -38,16 +38,14 @@ public class InstancesTest extends JDWPSyncTestCase {
 
     static String thisTestName;
 
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/InstancesDebuggee;";
-
-    static final String mockClassSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/MockClass;";
+    static final String mockClassSignature = getClassSignature(MockClass.class);
 
     static final String stringSignature = "Ljava/lang/String;";
 
     static final String intArraySignature = "[I";
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.InstancesDebuggee";
+        return InstancesDebuggee.class.getName();
     }
 
     /**
@@ -63,7 +61,7 @@ public class InstancesTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         long mockClassRefTypeID = getClassIDBySignature(mockClassSignature);
-        long debuggeeRefTypeID = getClassIDBySignature(debuggeeSignature);
+        long debuggeeRefTypeID = getClassIDBySignature(getDebuggeeClassSignature());
 
         //Get the number of reachable objects in debuggee class
         long reachableObjNumID = debuggeeWrapper.vmMirror.getFieldID(
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InterfacesTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InterfacesTest.java
index 7a1e1af..1ac6412 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InterfacesTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/InterfacesTest.java
@@ -40,11 +40,10 @@ public class InterfacesTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.Interfaces command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/InterfacesDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.InterfacesDebuggee";
+        return InterfacesDebuggee.class.getName();
     }
 
     /**
@@ -59,7 +58,7 @@ public class InterfacesTest extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": START...");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        String checkedClassSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/CheckedClass_Interfaces001;";
+        String checkedClassSignature = getClassSignature(CheckedClass_Interfaces001.class);
         long refTypeID = getClassIDBySignature(checkedClassSignature);
 
         logWriter.println("=> Debuggee class = " + getDebuggeeClassName());
@@ -80,8 +79,8 @@ public class InterfacesTest extends JDWPSyncTestCase {
         logWriter.println("=> Returned interfaces number = " + returnedInterfacesNumber);
 
         String interfacesSignatures[] = {
-                "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/Interface_1_Interfaces001;",
-                "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/Interface_2_Interfaces001;",
+                getClassSignature(Interface_1_Interfaces001.class),
+                getClassSignature(Interface_2_Interfaces001.class),
         };
 
         boolean interfacesFound[] = {
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsTest.java
index e7c91e3..71e5ff5 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsTest.java
@@ -40,11 +40,10 @@ public class MethodsTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.Methods command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.MethodsDebuggee";
+        return MethodsDebuggee.class.getName();
     }
 
     /**
@@ -60,7 +59,7 @@ public class MethodsTest extends JDWPSyncTestCase {
         int testStatus = testStatusPassed;
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        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/MethodsWithGenericTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsWithGenericTest.java
index 19792a2..ffd3fce 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsWithGenericTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsWithGenericTest.java
@@ -40,11 +40,10 @@ public class MethodsWithGenericTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.MethodsWithGeneric command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/MethodsWithGenericDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.MethodsWithGenericDebuggee";
+        return MethodsWithGenericDebuggee.class.getName();
     }
 
     /**
@@ -61,7 +60,7 @@ public class MethodsWithGenericTest extends JDWPSyncTestCase {
         String failMessage = "";
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        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/Signature002Test.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/Signature002Test.java
index 84fd23d..e491a73 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/Signature002Test.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/Signature002Test.java
@@ -40,11 +40,10 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
 public class Signature002Test extends JDWPSyncTestCase {
 
     static final String thisCommandName = "ReferenceType.Signature command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/Signature002Debuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.Signature002Debuggee";
+        return Signature002Debuggee.class.getName();
     }
 
     /**
@@ -63,7 +62,7 @@ public class Signature002Test extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         finalSyncMessage = "TO_FINISH";
 
-        long debuggeeRefTypeID = getClassIDBySignature(debuggeeSignature);
+        long debuggeeRefTypeID = getClassIDBySignature(getDebuggeeClassSignature());
 
         logWriter.println("=> Debuggee class = " + getDebuggeeClassName());
         logWriter.println("=> referenceTypeID for Debuggee class = " + debuggeeRefTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureWithGenericTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureWithGenericTest.java
index e0a31f9..a7b2b78 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureWithGenericTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureWithGenericTest.java
@@ -40,12 +40,11 @@ public class SignatureWithGenericTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.SignatureWithGeneric command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/SignatureWithGenericDebuggee;";
     static final String debuggeeGenericSignature = "";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.SignatureWithGenericDebuggee";
+        return SignatureWithGenericDebuggee.class.getName();
     }
 
     /**
@@ -60,7 +59,7 @@ public class SignatureWithGenericTest extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
@@ -79,7 +78,7 @@ public class SignatureWithGenericTest extends JDWPSyncTestCase {
         String returnedGenericSignature = signatureWithGenericReply.getNextValueAsString();
 
         assertString(thisCommandName + " returned invalid signature,",
-                debuggeeSignature, returnedSignature);
+                getDebuggeeClassSignature(), returnedSignature);
         assertString(thisCommandName + " returned invalid generic signature,",
                 debuggeeGenericSignature, returnedGenericSignature);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceFileTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceFileTest.java
index 1064d73..78179e8 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceFileTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceFileTest.java
@@ -40,11 +40,10 @@ public class SourceFileTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.SourceFile command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/SourceFileDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.SourceFileDebuggee";
+        return SourceFileDebuggee.class.getName();
     }
 
     /**
@@ -60,7 +59,7 @@ public class SourceFileTest extends JDWPSyncTestCase {
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         finalSyncMessage = JPDADebuggeeSynchronizer.SGNL_CONTINUE;
 
-        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/StatusTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/StatusTest.java
index aa1238d..5bc0caf 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/StatusTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/StatusTest.java
@@ -40,11 +40,10 @@ public class StatusTest extends JDWPSyncTestCase {
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
     static final String thisCommandName = "ReferenceType.Status command";
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/ReferenceType/StatusDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ReferenceType.StatusDebuggee";
+        return StatusDebuggee.class.getName();
     }
 
     /**
@@ -59,7 +58,7 @@ public class StatusTest extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": 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 = " + refTypeID);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/JDWPStackTraceBaseTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/JDWPStackTraceBaseTest.java
index 4bae4ac..09a6aa3 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/JDWPStackTraceBaseTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/JDWPStackTraceBaseTest.java
@@ -36,7 +36,7 @@ public class JDWPStackTraceBaseTest extends JDWPStackFrameTestCase {
     Frame.Variable[] varInfos;
 
     String varSignatures[] = {
-            "Lorg/apache/harmony/jpda/tests/jdwp/StackFrame/StackTraceDebuggee;",
+            getClassSignature(StackTraceDebuggee.class),
             "Z",
             "I",
             "Ljava/lang/String;"
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ResumeTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ResumeTest.java
index 9c9ec1c..6f07e6e 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ResumeTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/ResumeTest.java
@@ -40,12 +40,10 @@ public class ResumeTest extends JDWPSyncTestCase {
 
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
-    static final String debuggeeSignature =
-            "Lorg/apache/harmony/jpda/tests/jdwp/ThreadReference/ResumeDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ThreadReference.ResumeDebuggee";
+        return ResumeDebuggee.class.getName();
     }
 
     /**
@@ -68,7 +66,7 @@ public class ResumeTest extends JDWPSyncTestCase {
         } catch (NumberFormatException exception) {
             logWriter.println
                 ("## FAILURE: Exception while getting number of started threads from debuggee = " + exception);
-            setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             printErrorAndFail("\n## Can NOT get number of started threads from debuggee! ");
         }
         testedThreadsNumber++; // to add debuggee main thread
@@ -92,7 +90,7 @@ public class ResumeTest extends JDWPSyncTestCase {
         } catch (ReplyErrorCodeException exception) {
             logWriter.println
                 ("## FAILURE: Exception in vmMirror.getAllThreadID() = " + exception);
-            setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             printErrorAndFail("\n## Can NOT get all ThreadID in debuggee! ");
         }
         int threads = allThreadIDReply.getNextValueAsInt();
@@ -125,7 +123,7 @@ public class ResumeTest extends JDWPSyncTestCase {
             }
         }
         if ( testedThreadNotFound ) {
-            setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             printErrorAndFail("\n## Some of tested threads are not found!");
         }
 
@@ -158,7 +156,7 @@ public class ResumeTest extends JDWPSyncTestCase {
         }
 
         if ( resumeCommandFailed ) {
-            setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             printErrorAndFail("\n## Error found out while ThreadReference.Resume command performing!");
         }
 
@@ -172,7 +170,7 @@ public class ResumeTest extends JDWPSyncTestCase {
         reply = debuggeeWrapper.vmMirror.performCommand(packet);
         int errorCode = reply.getErrorCode();
         if ( errorCode !=  JDWPConstants.Error.NONE ) {
-            setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             logWriter.println("## FAILURE: VirtualMachine.Suspend command returns error = " + errorCode
                     + "(" + JDWPConstants.Error.getName(errorCode) + ")");
             printErrorAndFail("## VirtualMachine.Suspend command FAILED!");
@@ -257,7 +255,7 @@ public class ResumeTest extends JDWPSyncTestCase {
         reply = debuggeeWrapper.vmMirror.performCommand(packet);
         errorCode = reply.getErrorCode();
         if ( errorCode !=  JDWPConstants.Error.NONE ) {
-            setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             logWriter.println("## FAILURE: VirtualMachine.Resume command returns error = " + errorCode
                 + "(" + JDWPConstants.Error.getName(errorCode) + ")");
             printErrorAndFail("## VirtualMachine.Resume command FAILED!");
@@ -275,7 +273,7 @@ public class ResumeTest extends JDWPSyncTestCase {
             errorMessage = errorMessage + "## Error found out while ThreadReference.Resume command performing!\n";
         }
         if ( ! errorMessage.equals("") ) {
-            setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             printErrorAndFail("\ntestResume001 FAILED:\n" + errorMessage);
         }
 
@@ -432,7 +430,7 @@ public class ResumeTest extends JDWPSyncTestCase {
             errorMessage = errorMessage + "## Unexpected suspendStatus found out!\n";
         }
 
-        setStaticIntField(debuggeeSignature, ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+        setStaticIntField(getDebuggeeClassSignature(), ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
         if ( ! errorMessage.equals("") ) {
             printErrorAndFail("\ntestResume001 FAILED:\n" + errorMessage);
         }
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/SuspendCountTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/SuspendCountTest.java
index 59a9c1e..1b3b462 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/SuspendCountTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ThreadReference/SuspendCountTest.java
@@ -41,12 +41,10 @@ public class SuspendCountTest extends JDWPSyncTestCase {
 
     static final int testStatusPassed = 0;
     static final int testStatusFailed = -1;
-    static final String debuggeeSignature =
-            "Lorg/apache/harmony/jpda/tests/jdwp/ThreadReference/SuspendCountDebuggee;";
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.ThreadReference.SuspendCountDebuggee";
+        return SuspendCountDebuggee.class.getName();
     }
 
     /**
@@ -299,7 +297,7 @@ public class SuspendCountTest extends JDWPSyncTestCase {
             }
         }
         if ( testedThreadsIDs[testedThreadsNumber] == 0 ) {
-            setStaticIntField(debuggeeSignature, SuspendCountDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), SuspendCountDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             logWriter.println("## FAILURE: Debuggee main thread is not found out among debuggee threads!");
             logWriter.println("##          Thread name = " + testedThreadsNames[testedThreadsNumber]);
             printErrorAndFail("\nCan NOT found out debuggee main thread!");
@@ -312,7 +310,7 @@ public class SuspendCountTest extends JDWPSyncTestCase {
         ReplyPacket reply = debuggeeWrapper.vmMirror.performCommand(packet);
         int errorCode = reply.getErrorCode();
         if ( errorCode !=  JDWPConstants.Error.NONE ) {
-            setStaticIntField(debuggeeSignature, SuspendCountDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+            setStaticIntField(getDebuggeeClassSignature(), SuspendCountDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
             logWriter.println("## FAILURE: VirtualMachine.Suspend command returns error = " + errorCode
                     + "(" + JDWPConstants.Error.getName(errorCode) + ")");
             printErrorAndFail("\nVirtualMachine.Suspend command FAILED!");
@@ -370,7 +368,7 @@ public class SuspendCountTest extends JDWPSyncTestCase {
             }
         }
 
-        setStaticIntField(debuggeeSignature, SuspendCountDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
+        setStaticIntField(getDebuggeeClassSignature(), SuspendCountDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
 
         if ( suspendCountCommandFailed ) {
             errorMessage = "## Error found out while ThreadReference.SuspendCount command performing!\n";
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/InstanceCountsTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/InstanceCountsTest.java
index 952a5fb..36ced84 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/InstanceCountsTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/InstanceCountsTest.java
@@ -34,15 +34,13 @@ public class InstanceCountsTest extends JDWPSyncTestCase {
 
     static final String thisCommandName = "VirtualMachine.InstanceCounts command ";
 
-    static final String mockClass1Signature = "Lorg/apache/harmony/jpda/tests/jdwp/VirtualMachine/MockClass1;";
+    static final String mockClass1Signature = getClassSignature(MockClass1.class);
 
-    static final String mockClass2Signature = "Lorg/apache/harmony/jpda/tests/jdwp/VirtualMachine/MockClass2;";
-
-    static final String debuggeeSignature = "Lorg/apache/harmony/jpda/tests/jdwp/VirtualMachine/InstanceCountsDebuggee;";
+    static final String mockClass2Signature = getClassSignature(MockClass2.class);
 
     @Override
     protected String getDebuggeeClassName() {
-        return "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.InstanceCountsDebuggee";
+        return InstanceCountsDebuggee.class.getName();
     }
 
     /**
@@ -58,7 +56,7 @@ public class InstanceCountsTest extends JDWPSyncTestCase {
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": START...");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
-        long debuggeeRefTypeID = getClassIDBySignature(debuggeeSignature);
+        long debuggeeRefTypeID = getClassIDBySignature(getDebuggeeClassSignature());
         long mockClassRefTypeIDOfClass1 = getClassIDBySignature(mockClass1Signature);
         long mockClassRefTypeIDOfClass2 = getClassIDBySignature(mockClass2Signature);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ResumeTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ResumeTest.java
index 813b934..633739c 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ResumeTest.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/ResumeTest.java
@@ -41,9 +41,6 @@ import java.util.List;
  */
 public class ResumeTest extends JDWPSyncTestCase {
 
-    static final String debuggeeSignature =
-        "Lorg/apache/harmony/jpda/tests/jdwp/VirtualMachine/ResumeDebuggee;";
-
     @Override
     protected String getDebuggeeClassName() {
         return ResumeDebuggee.class.getName();
@@ -53,7 +50,7 @@ public class ResumeTest extends JDWPSyncTestCase {
     protected void internalTearDown() {
         // We need to finish the tested threads before detaching.
         logWriter.println("Finish debuggee tested threads");
-        setStaticIntField(debuggeeSignature,
+        setStaticIntField(getDebuggeeClassSignature(),
                 ResumeDebuggee.TO_FINISH_DEBUGGEE_FIELD_NAME, 99);
         super.internalTearDown();
     }