More inclusive language fixes

Bug: 161896447
Bug: 161850439
Bug: 161336379
Test: art/test.py --host
Change-Id: I1519e22d40cb28f243dd75b12d455cfa844726fc

1 files changed, 9 insertions, 9 deletions

diff --git a/test/988-method-trace/gen_srcs.py b/test/988-method-trace/gen_srcs.py
index 225f41b5b6..697b17f9f7 100755
--- a/test/988-method-trace/gen_srcs.py
+++ b/test/988-method-trace/gen_srcs.py
@@ -179,8 +179,8 @@ class MethodInfo:
   def __str__(self):
     return "MethodInfo " + str(self.__dict__)
 
-  def dummy_parameters(self):
-    dummy_values = {
+  def placeholder_parameters(self):
+    placeholder_values = {
      'boolean' : 'false',
      'byte' : '(byte)0',
      'char' : "'x'",
@@ -191,14 +191,14 @@ class MethodInfo:
      'double' : '0.0'
     }
 
-    def object_dummy(name):
+    def object_placeholder(name):
       if name == "java.lang.String":
         return '"hello"'
       else:
         return "(%s)null" %(name)
-    return [ dummy_values.get(param, object_dummy(param)) for param in self.parameters ]
+    return [ placeholder_values.get(param, object_placeholder(param)) for param in self.parameters ]
 
-  def dummy_instance_value(self):
+  def placeholder_instance_value(self):
     return KLASS_INSTANCE_INITIALIZERS.get(self.klass, 'new %s()' %(self.klass))
 
   def is_blacklisted(self):
@@ -257,19 +257,19 @@ def format_receiver_name(method_info):
     receiver = "instance_" + method_info.klass.replace(".", "_")
   return receiver
 
-# Format a dummy call with dummy method parameters to the requested method.
+# Format a placeholder call with placeholder method parameters to the requested method.
 def format_call_to(method_info):
-  dummy_args = ", ".join(method_info.dummy_parameters())
+  placeholder_args = ", ".join(method_info.placeholder_parameters())
   receiver = format_receiver_name(method_info)
 
-  return ("%s.%s(%s);" %(receiver, method_info.method_name, dummy_args))
+  return ("%s.%s(%s);" %(receiver, method_info.method_name, placeholder_args))
 
 # Format a static variable with an instance that could be used as the receiver
 # (or None for non-static methods).
 def format_instance_variable(method_info):
   if method_info.staticness == 'static':
     return None
-  return "static %s %s = %s;" %(method_info.klass, format_receiver_name(method_info), method_info.dummy_instance_value())
+  return "static %s %s = %s;" %(method_info.klass, format_receiver_name(method_info), method_info.placeholder_instance_value())
 
 def format_initialize_klass(method_info):
   return "%s.class.toString();" %(method_info.klass)