Initialize targetSdk to 0 instead of -1

Tests for the compat config were failing for non-targetSdk gated
changes, due to differences between default values of
enableAfterTargetSdk.
Also, add toString() method to simplify debugging future failures.

Bug: 150755469
Test: atest CompatChangesValidConfigTest
Change-Id: I62ae84da27e5ad0660fc982c6666507f126facbc

1 files changed, 22 insertions, 3 deletions

diff --git a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java
index 75941a3e6a3..f9bdc2204aa 100644
--- a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java
+++ b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java
@@ -62,9 +62,9 @@ public final class CompatChangesValidConfigTest extends CompatChangeGatingTestCa
         }
 
         static Change fromString(String line) {
-            long changeId = -1;
+            long changeId = 0;
             String changeName;
-            int targetSdk = -1;
+            int targetSdk = 0;
             boolean disabled = false;
             boolean hasOverrides = false;
 
@@ -100,7 +100,7 @@ public final class CompatChangesValidConfigTest extends CompatChangeGatingTestCa
             Element element = (Element) node;
             long changeId = Long.parseLong(element.getAttribute("id"));
             String changeName = element.getAttribute("name");
-            int targetSdk = -1;
+            int targetSdk = 0;
             if (element.hasAttribute("enableAfterTargetSdk")) {
                 targetSdk = Integer.parseInt(element.getAttribute("enableAfterTargetSdk"));
             }
@@ -130,6 +130,25 @@ public final class CompatChangesValidConfigTest extends CompatChangeGatingTestCa
                 && this.disabled == that.disabled
                 && this.hasOverrides == that.hasOverrides;
         }
+        @Override
+        public String toString() {
+            final StringBuilder sb = new StringBuilder();
+            sb.append("ChangeId(" + changeId);
+            if (changeName != null && !changeName.isEmpty()) {
+                sb.append("; name=" + changeName);
+            }
+            if (targetSdk != 0) {
+                sb.append("; enableAfterTargetSdk=" + targetSdk);
+            }
+            if (disabled) {
+                sb.append("; disabled");
+            }
+            if (hasOverrides) {
+                sb.append("; packageOverrides={something}");
+            }
+            sb.append(")");
+            return sb.toString();
+        }
     }
 
     /**