Merge "Inclusive Language Fixit: Replace dummy with fake" am: a55f1246f6

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1373176

Change-Id: I91a68106ea4bf367705875e96aa87e88f9b1f589

11 files changed, 21 insertions, 21 deletions

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 3671af3..5991a94 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
@@ -79,8 +79,8 @@ public class CombinedEvents003Test extends CombinedEventsTestCase {
         long runMethodID = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassID, "run");
         logWriter.println("=> runMethodID = " + runMethodID);
 
-        long dummyMethodID = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassID, "dummyMethod");
-        logWriter.println("=> dummyMethodID = " + dummyMethodID);
+        long fakeMethodID = debuggeeWrapper.vmMirror.getMethodID(debuggeeClassID, "fakeMethod");
+        logWriter.println("=> fakeMethodID = " + fakeMethodID);
 
         logWriter.println("");
         logWriter.println("=> Info for tested method '" + methodForEvents + "':");
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java
index de1825a..ecfe84c 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/CombinedExceptionEventsDebuggee.java
@@ -43,7 +43,7 @@ public class CombinedExceptionEventsDebuggee extends SyncDebuggee {
         logWriter.println("-> CombinedExceptionEventsDebuggee: Starting...");
 
         // Preload exception classes
-        new SubDebuggeeException("dummy");
+        new SubDebuggeeException("fake");
 
         synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java
index 57e27b5..14edd22 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionCaughtDebuggee.java
@@ -48,7 +48,7 @@ public class ExceptionCaughtDebuggee extends SyncDebuggee {
         logWriter.println("-- ExceptionCatchDebuggee: STARTED");
 
         // Cause loading of DebuggeeException so it is visible from the test.
-        new DebuggeeException("dummy exception");
+        new DebuggeeException("fake exception");
 
         synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java
index 21152bc..d7f6de2 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionUncaughtDebuggee.java
@@ -44,7 +44,7 @@ public class ExceptionUncaughtDebuggee extends SyncDebuggee {
         logWriter.println("-- ExceptionUncaughtDebuggee: STARTED");
 
         // Cause loading of DebuggeeException so it is visible from the test.
-        new DebuggeeException("dummy exception");
+        new DebuggeeException("fake exception");
 
         synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java
index 2816c4f..5c773c2 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ExceptionWithLocationDebuggee.java
@@ -51,7 +51,7 @@ public class ExceptionWithLocationDebuggee extends SyncDebuggee {
         logWriter.println("ExceptionWithLocationDebuggee: STARTED");
         // load and prepare DebuggeeException class
         @SuppressWarnings("unused")
-        DebuggeeException ex = new DebuggeeException("dummy exception");
+        DebuggeeException ex = new DebuggeeException("fake exception");
 
         synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java
index a1e18a1..a2fb675 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ExceptionDebuggee.java
@@ -39,27 +39,27 @@ public class ExceptionDebuggee extends SyncDebuggee {
     public static void main(String[] args) {
         runDebuggee(ExceptionDebuggee.class);
     }
-    
+
     @Override
     public void run(){
-        
+
         logWriter.println("--> ExceptionDebuggee: STARTED");
         // load and prepare DebuggeeException class
-        DebuggeeException ex = new DebuggeeException("dummy exception");
-        
+        DebuggeeException ex = new DebuggeeException("fake exception");
+
         synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
-        
+
         logWriter.println("--> ExceptionDebuggee: Wait for SGNL_CONTINUE...");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE);
         logWriter.println("--> ExceptionDebuggee: SGNL_CONTINUE has been received!");
-        
+
         try {
             // throw caught exception
             throw new DebuggeeException("Caught debuggee exception");
         } catch (DebuggeeException e) {
             logWriter.println("-- ExceptionDebuggee: Exception: \""+e.getMessage()+"\" was thrown");
         }
-        
+
         synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         logWriter.println("DUMP{" + ex + "}");
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 641bba9..e4fcf01 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
@@ -131,7 +131,7 @@ public class GetValues002Test extends JDWPSyncTestCase {
         assertEquals("Invalid number of values,", checkedFieldsNumber - 1, returnedValuesNumber);
 
         byte expectedFieldTags[] = {
-                0, // dummy
+                0, // placeholder
                 JDWPConstants.Tag.LONG_TAG,
                 JDWPConstants.Tag.INT_TAG,
                 JDWPConstants.Tag.STRING_TAG,
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 7d86429..5339ec2 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
@@ -130,7 +130,7 @@ public class GetValuesTest extends JDWPSyncTestCase {
         assertEquals("Invalid number of values,", checkedFieldsNumber - 1, returnedValuesNumber);
 
         byte expectedFieldTags[] = {
-                0, // dummy
+                0, // fake
                 JDWPConstants.Tag.INT_TAG,
                 JDWPConstants.Tag.LONG_TAG,
                 JDWPConstants.Tag.OBJECT_TAG,
diff --git a/support/src/test/java/tests/support/Support_DummyPKCS12Keystore.java b/support/src/test/java/tests/support/Support_FakePKCS12Keystore.java
index 9dedff3..7a13af4 100644
--- a/support/src/test/java/tests/support/Support_DummyPKCS12Keystore.java
+++ b/support/src/test/java/tests/support/Support_FakePKCS12Keystore.java
@@ -33,9 +33,9 @@ import java.util.Enumeration;
 /**
  * Empty implementation used to enable unit tests to run.
  */
-public class Support_DummyPKCS12Keystore extends KeyStoreSpi {
+public class Support_FakePKCS12Keystore extends KeyStoreSpi {
 
-    public Support_DummyPKCS12Keystore() {
+    public Support_FakePKCS12Keystore() {
         super();
     }
 
diff --git a/support/src/test/java/tests/support/Support_ProviderJCE.java b/support/src/test/java/tests/support/Support_ProviderJCE.java
index 6687a33..7949e51 100644
--- a/support/src/test/java/tests/support/Support_ProviderJCE.java
+++ b/support/src/test/java/tests/support/Support_ProviderJCE.java
@@ -22,7 +22,7 @@ import java.security.PrivilegedAction;
 import java.security.Provider;
 
 /**
- * This class implements a dummy security provider
+ * This class implements a fake security provider
  */
 public class Support_ProviderJCE extends Provider {
     private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@ public class Support_ProviderJCE extends Provider {
             + " DSA key, parameter generation and signing; SHA-1 digest";
 
     /**
-     * Constructs a new instance of the dummy provider.
+     * Constructs a new instance of the fake provider.
      */
     public Support_ProviderJCE() {
         super(NAME, VERSION, INFO);
diff --git a/support/src/test/java/tests/support/Support_ProviderRSA.java b/support/src/test/java/tests/support/Support_ProviderRSA.java
index 4db0043..26fa6f2 100644
--- a/support/src/test/java/tests/support/Support_ProviderRSA.java
+++ b/support/src/test/java/tests/support/Support_ProviderRSA.java
@@ -22,7 +22,7 @@ import java.security.PrivilegedAction;
 import java.security.Provider;
 
 /**
- * This class implements a dummy provider.
+ * This class implements a fake provider.
  */
 public class Support_ProviderRSA extends Provider {
     private static final long serialVersionUID = 1L;
@@ -37,7 +37,7 @@ public class Support_ProviderRSA extends Provider {
             + " DSA key, parameter generation and signing; SHA-1 digest";
 
     /**
-     * Constructs a new instance of the dummy provider.
+     * Constructs a new instance of the fake provider.
      */
     public Support_ProviderRSA() {
         super(NAME, VERSION, INFO);