Fix the issues highlighted by ArrayToString
Added the following to the CtsJdwp target:
LOCAL_ERROR_PRONE_FLAGS += -XepPatchChecks:ArrayToString -XepPatchLocation:IN_PLACE
Ran the following to make the changes - there were some issues
so fixed some manually:
make -j32 javac-check-CtsJdwp RUN_ERROR_PRONE=true
Updated the build file to prevent ArrayToString issues being
added again.
Bug: 37995059
Test: make java-check-CtsJdwp RUN_ERROR_PRONE=true
Change-Id: I7da7793949a3ba99367216a1982b347168c0cd8b
diff --git a/jdwp/Android.mk b/jdwp/Android.mk
index 4fe4066..a2adcd9 100644
--- a/jdwp/Android.mk
+++ b/jdwp/Android.mk
@@ -35,6 +35,7 @@
LOCAL_NO_EMMA_COMPILE := true
LOCAL_CTS_TEST_PACKAGE := android.jdwp
LOCAL_CTS_TARGET_RUNTIME_ARGS := $(cts_jdwp_test_target_runtime_args)
+LOCAL_ERROR_PRONE_FLAGS := -Xep:ArrayToString:ERROR
include $(BUILD_CTS_TARGET_JAVA_LIBRARY)
include $(CLEAR_VARS)
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayType/NewInstanceDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayType/NewInstanceDebuggee.java
index 9c5d2d5..7659c7b 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayType/NewInstanceDebuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ArrayType/NewInstanceDebuggee.java
@@ -28,6 +28,8 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
import org.apache.harmony.jpda.tests.share.SyncDebuggee;
+import java.util.Arrays;
+
/**
* Debuggee for JDWP NewInstanceTest unit test which
* exercises ArrayType.NewInstance command.
@@ -44,7 +46,7 @@
logWriter.println("-> array of classes "+ clazz[0].name + " is created");
synchronizer.sendMessage(JPDADebuggeeSynchronizer.SGNL_READY);
logWriter.println("-> Hello World");
- logWriter.println("DUMP{" + checkString + checkInt + ia + ca + "}");
+ logWriter.println("DUMP{" + Arrays.toString(checkString) + Arrays.toString(checkInt) + Arrays.toString(ia) + Arrays.toString(ca) + "}");
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE);
}
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Debuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Debuggee.java
index 7adaed6..858f2a5 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Debuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/GetValues003Debuggee.java
@@ -28,6 +28,8 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
import org.apache.harmony.jpda.tests.share.SyncDebuggee;
+import java.util.Arrays;
+
public class GetValues003Debuggee extends SyncDebuggee {
static GetValues003Debuggee testedObject;
@@ -69,8 +71,8 @@
testedObject.classLoaderField = null;
logWriter.println("\n--> Debuggee: GetValues003Debuggee: Before ObjectReference::GetValues command:");
- logWriter.println("--> intArrayField value = " + testedObject.intArrayField);
- logWriter.println("--> objectArrayField value = " + testedObject.objectArrayField);
+ logWriter.println("--> intArrayField value = " + Arrays.toString(testedObject.intArrayField));
+ logWriter.println("--> objectArrayField value = " + Arrays.toString(testedObject.objectArrayField));
logWriter.println("--> objectField value = " + testedObject.objectField);
logWriter.println("--> stringField value = " + testedObject.stringField);
logWriter.println("--> threadField value = " + testedObject.threadField);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Debuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Debuggee.java
index c2b50d2..0e6f9e1 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Debuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/SetValues004Debuggee.java
@@ -28,6 +28,8 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
import org.apache.harmony.jpda.tests.share.SyncDebuggee;
+import java.util.Arrays;
+
public class SetValues004Debuggee extends SyncDebuggee {
static String passedStatus = "PASSED";
@@ -63,8 +65,8 @@
testedObject.classLoaderField = testedObject.classField.getClassLoader();
logWriter.println("\n--> Debuggee: SetValues004Debuggee: Before ObjectReference::SetValues command:");
- logWriter.println("--> intArrayField value = " + testedObject.intArrayField);
- logWriter.println("--> objectArrayField value = " + testedObject.objectArrayField);
+ logWriter.println("--> intArrayField value = " + Arrays.toString(testedObject.intArrayField));
+ logWriter.println("--> objectArrayField value = " + Arrays.toString(testedObject.objectArrayField));
logWriter.println("--> objectField value = " + testedObject.objectField);
logWriter.println("--> stringField value = " + testedObject.stringField);
logWriter.println("--> threadField value = " + testedObject.threadField);
@@ -76,7 +78,7 @@
synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_CONTINUE);
logWriter.println("\n--> Debuggee: SetValues004Debuggee: After ObjectReference::SetValues command:");
- logWriter.println("--> intArrayField value = " + testedObject.intArrayField);
+ logWriter.println("--> intArrayField value = " + Arrays.toString(testedObject.intArrayField));
if ( testedObject.intArrayField != null ) {
logWriter.println("##> Debuggee: FAILURE: Unexpected value");
logWriter.println("##> Expected value = " + null);
@@ -85,7 +87,7 @@
logWriter.println("--> Debuggee: OK. Expected value");
}
- logWriter.println("--> objectArrayField value = " + testedObject.objectArrayField);
+ logWriter.println("--> objectArrayField value = " + Arrays.toString(testedObject.objectArrayField));
if ( testedObject.objectArrayField != null ) {
logWriter.println("##> Debuggee: FAILURE: Unexpected value");
logWriter.println("##> Expected value = " + null);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Debuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Debuggee.java
index dad70a6..1b88509 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Debuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/ReferenceType/GetValues005Debuggee.java
@@ -28,6 +28,8 @@
import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
import org.apache.harmony.jpda.tests.share.SyncDebuggee;
+import java.util.Arrays;
+
public class GetValues005Debuggee extends SyncDebuggee {
static int intArrayField[]; // JDWP_TAG_ARRAY = 91
@@ -66,8 +68,8 @@
classLoaderField = null;
logWriter.println("\n--> Debuggee: GetValues005Debuggee: Before ReferenceType::GetValues command:");
- logWriter.println("--> intArrayField value = " + intArrayField);
- logWriter.println("--> objectArrayField value = " + objectArrayField);
+ logWriter.println("--> intArrayField value = " + Arrays.toString(intArrayField));
+ logWriter.println("--> objectArrayField value = " + Arrays.toString(objectArrayField));
logWriter.println("--> objectField value = " + objectField);
logWriter.println("--> stringField value = " + stringField);
logWriter.println("--> threadField value = " + threadField);
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/StackTrace002Debuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/StackTrace002Debuggee.java
index f05d2c5..4a25285 100644
--- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/StackTrace002Debuggee.java
+++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/StackFrame/StackTrace002Debuggee.java
@@ -24,6 +24,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Arrays;
/**
* Debuggee for GetValues002Test and SetValues002Test.
@@ -544,7 +545,7 @@
}
public void breakpointArray(int[] param) {
- logWriter.println("breakpointArray(param=\"" + param + "\")");
+ logWriter.println("breakpointArray(param=\"" + Arrays.toString(param) + "\")");
synchronizeWithTest();
}
