Enable error prone against all CTS harness subproject
Also fix the issue reported with error build current rules.
Test: make cts javac-check -j64 RUN_ERROR_PRONE=true
Bug: 37854485
Change-Id: If5e9ffd6fbf5caf14e9ef88f2e745c000c6a2df8
(cherry picked from commit e6892fd9b35bad58921b4be7abed92a3dd5fc34e)
diff --git a/common/host-side/tradefed/tests/Android.mk b/common/host-side/tradefed/tests/Android.mk
index 0a61c28..c61594a 100644
--- a/common/host-side/tradefed/tests/Android.mk
+++ b/common/host-side/tradefed/tests/Android.mk
@@ -28,7 +28,7 @@
LOCAL_SUITE_VERSION := 1
LOCAL_MODULE := compatibility-mock-tradefed
-
+include cts/error_prone_rules.mk
include $(BUILD_COMPATIBILITY_SUITE)
# Make the tests
diff --git a/common/host-side/util/Android.mk b/common/host-side/util/Android.mk
index 771e334..23626bd 100644
--- a/common/host-side/util/Android.mk
+++ b/common/host-side/util/Android.mk
@@ -25,7 +25,7 @@
LOCAL_MODULE := compatibility-host-util
LOCAL_MODULE_TAGS := optional
-
+include cts/error_prone_rules.mk
include $(BUILD_HOST_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java b/common/host-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java
index d614caf..38158b4 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/ApiLevelUtil.java
@@ -23,7 +23,7 @@
*/
public class ApiLevelUtil {
- public static String CODENAME = "ro.build.version.codename";
+ public static final String CODENAME = "ro.build.version.codename";
public static boolean isBefore(ITestDevice device, int version)
throws DeviceNotAvailableException {
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java b/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
index a17f17a..3b7f6c8 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/HostInfoStore.java
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
import java.util.List;
public class HostInfoStore extends InfoStore {
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java b/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
index 199b826..2cdcc23 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/PropertyUtil.java
@@ -28,7 +28,7 @@
* Name of read-only property detailing the first API level for which the product was
* shipped. Property should be undefined for factory ROM products.
*/
- public static String FIRST_API_LEVEL = "ro.product.first_api_level";
+ public static final String FIRST_API_LEVEL = "ro.product.first_api_level";
/** Returns whether the device build is the factory ROM */
public static boolean isFactoryROM(ITestDevice device) throws DeviceNotAvailableException {
diff --git a/common/host-side/util/tests/Android.mk b/common/host-side/util/tests/Android.mk
index b5806c7..338d6c3 100644
--- a/common/host-side/util/tests/Android.mk
+++ b/common/host-side/util/tests/Android.mk
@@ -23,5 +23,5 @@
LOCAL_MODULE := compatibility-host-util-tests
LOCAL_MODULE_TAGS := optional
-
+include cts/error_prone_rules.mk
include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java b/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java
index 31dd598..ef0e824 100644
--- a/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java
+++ b/common/host-side/util/tests/src/com/android/compatibility/common/util/DynamicConfigHandlerTest.java
@@ -33,7 +33,7 @@
*/
public class DynamicConfigHandlerTest extends TestCase {
- private static final String localConfig =
+ private static final String LOCAL_CONFIG =
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<dynamicConfig>\n" +
" <entry key=\"test-config-1\">\n" +
@@ -61,7 +61,7 @@
" </entry>\n" +
"</dynamicConfig>\n";
- private static final String overrideJson =
+ private static final String OVERRIDE_JSON =
"{\n" +
" \"dynamicConfigEntries\": {\n" +
" \"override-config-1\": {\n" +
@@ -94,11 +94,11 @@
public void testDynamicConfigHandler() throws Exception {
String module = "test1";
- File localConfigFile = createFileFromStr(localConfig, module);
+ File localConfigFile = createFileFromStr(LOCAL_CONFIG, module);
File mergedFile = null;
try {
mergedFile = DynamicConfigHandler
- .getMergedDynamicConfigFile(localConfigFile, overrideJson, module);
+ .getMergedDynamicConfigFile(localConfigFile, OVERRIDE_JSON, module);
Map<String, List<String>> configMap = DynamicConfig.createConfigMap(mergedFile);
diff --git a/common/util/Android.mk b/common/util/Android.mk
index b6cf927..ae89d37 100644
--- a/common/util/Android.mk
+++ b/common/util/Android.mk
@@ -48,7 +48,7 @@
junit-host \
kxml2-2.3.0 \
platform-test-annotations-host
-
+include cts/error_prone_rules.mk
include $(BUILD_HOST_JAVA_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/common/util/src/com/android/compatibility/common/util/AbiUtils.java b/common/util/src/com/android/compatibility/common/util/AbiUtils.java
index 76c962c..c9c82b7 100644
--- a/common/util/src/com/android/compatibility/common/util/AbiUtils.java
+++ b/common/util/src/com/android/compatibility/common/util/AbiUtils.java
@@ -15,11 +15,6 @@
*/
package com.android.compatibility.common.util;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/**
* Utility class for handling device ABIs
*/
diff --git a/common/util/src/com/android/compatibility/common/util/CaseResult.java b/common/util/src/com/android/compatibility/common/util/CaseResult.java
index 36f77d7..a7c3318 100644
--- a/common/util/src/com/android/compatibility/common/util/CaseResult.java
+++ b/common/util/src/com/android/compatibility/common/util/CaseResult.java
@@ -119,7 +119,7 @@
public void mergeFrom(ICaseResult otherCaseResult) {
if (!otherCaseResult.getName().equals(getName())) {
throw new IllegalArgumentException(String.format(
- "Cannot merge case result with mismatched name. Expected %s, Found %d",
+ "Cannot merge case result with mismatched name. Expected %s, Found %s",
otherCaseResult.getName(), getName()));
}
diff --git a/common/util/src/com/android/compatibility/common/util/InfoStore.java b/common/util/src/com/android/compatibility/common/util/InfoStore.java
index b8014f7..c5a411e 100644
--- a/common/util/src/com/android/compatibility/common/util/InfoStore.java
+++ b/common/util/src/com/android/compatibility/common/util/InfoStore.java
@@ -15,7 +15,6 @@
*/
package com.android.compatibility.common.util;
-import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
diff --git a/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java b/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java
index a7b1153..ce8696b 100644
--- a/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java
+++ b/common/util/src/com/android/compatibility/common/util/MetricsXmlSerializer.java
@@ -19,7 +19,6 @@
import org.xmlpull.v1.XmlSerializer;
import java.io.IOException;
-import java.util.List;
//TODO(stuartscott): Delete file for v2, ReportLog can serialize itself.
/**
diff --git a/common/util/src/com/android/compatibility/common/util/TestStatus.java b/common/util/src/com/android/compatibility/common/util/TestStatus.java
index 744f760..5a9b170 100644
--- a/common/util/src/com/android/compatibility/common/util/TestStatus.java
+++ b/common/util/src/com/android/compatibility/common/util/TestStatus.java
@@ -22,7 +22,7 @@
PASS("pass"),
FAIL("fail");
- private String mValue;
+ private final String mValue;
private TestStatus(String storedValue) {
mValue = storedValue;
diff --git a/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java b/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java
index e498c17..d98bc6d 100644
--- a/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java
+++ b/common/util/src/com/android/compatibility/common/util/TestSuiteFilter.java
@@ -19,7 +19,6 @@
import junit.framework.TestResult;
import junit.framework.TestSuite;
-import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.Set;
diff --git a/common/util/src/com/android/compatibility/common/util/ZipUtil.java b/common/util/src/com/android/compatibility/common/util/ZipUtil.java
index 6cee83a..b44fd46 100644
--- a/common/util/src/com/android/compatibility/common/util/ZipUtil.java
+++ b/common/util/src/com/android/compatibility/common/util/ZipUtil.java
@@ -27,7 +27,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
import java.util.zip.ZipOutputStream;
public class ZipUtil {
diff --git a/common/util/tests/Android.mk b/common/util/tests/Android.mk
index 5e3370b..1aca670 100644
--- a/common/util/tests/Android.mk
+++ b/common/util/tests/Android.mk
@@ -23,5 +23,5 @@
LOCAL_MODULE := compatibility-common-util-tests
LOCAL_MODULE_TAGS := optional
-
+include cts/error_prone_rules.mk
include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java b/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java
index df50d11..99ef733 100644
--- a/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java
+++ b/common/util/tests/src/com/android/compatibility/common/util/DynamicConfigTest.java
@@ -30,7 +30,7 @@
* Unit tests for {@link DynamicConfig}
*/
public class DynamicConfigTest extends TestCase {
- private static final String correctConfig =
+ private static final String CORRECT_CONFIG =
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<dynamicConfig>\n" +
" <entry key=\"test-config-1\">\n" +
@@ -55,7 +55,7 @@
" </entry>\n" +
"</dynamicConfig>\n";
- private static final String configWrongNodeName =
+ private static final String CONFIG_WRONG_NODE_NAME =
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
"<dynamicCsonfig>\n" + //The node name dynamicConfig is intentionally mistyped
" <entry key=\"test-config-1\">\n" +
@@ -82,7 +82,7 @@
public void testCorrectConfig() throws Exception {
DynamicConfig config = new DynamicConfig();
- File file = createFileFromStr(correctConfig);
+ File file = createFileFromStr(CORRECT_CONFIG);
try {
config.initializeConfig(file);
assertEquals("Wrong Config", config.getValue("test-config-1"), "test config 1");
@@ -97,7 +97,7 @@
public void testConfigWithWrongNodeName() throws Exception {
DynamicConfig config = new DynamicConfig();
- File file = createFileFromStr(configWrongNodeName);
+ File file = createFileFromStr(CONFIG_WRONG_NODE_NAME);
try {
config.initializeConfig(file);
fail("Cannot detect error when config file has wrong node name");
diff --git a/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java b/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java
index 49c4045..932db8e 100644
--- a/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java
+++ b/common/util/tests/src/com/android/compatibility/common/util/ResultHandlerTest.java
@@ -224,7 +224,7 @@
writer = new FileWriter(resultFile);
String buildInfo = String.format(XML_BUILD_INFO, DEVICE_A,
EXAMPLE_BUILD_ID, EXAMPLE_BUILD_PRODUCT);
- String summary = String.format(XML_SUMMARY, 2, 1, 1);
+ String summary = String.format(XML_SUMMARY, 2, 1);
String moduleATest = String.format(XML_TEST_PASS, METHOD_1);
String moduleACases = String.format(XML_CASE, CLASS_A, moduleATest);
String moduleA = String.format(XML_MODULE, NAME_A, ABI, DEVICE_A, RUNTIME_A, DONE_A,