commit a82a72b225432e60226c4552f7af4e9504f6a8d7
author Søren Gjesse <sgjesse@google.com> Thu Mar 04 12:17:27 2021 +0100
committer Søren Gjesse <sgjesse@google.com> Thu Mar 04 11:18:08 2021 +0000
tree c9a2b586ca16825407ecc301f47a1c827666b195
parent e96b8dceca340ce6a4357a9ef8c2867264316c6f

Fix Java 9 backport test for Dalvik

Bug: 181533278
Change-Id: If75383b29cb8971fe8d5d6c5aa95a86daf432846

src/test/examplesJava9/backport/IntegerBackportJava9Main.java

diff --git a/src/test/examplesJava9/backport/IntegerBackportJava9Main.java b/src/test/examplesJava9/backport/IntegerBackportJava9Main.java
index 10c86f2..30e9086 100644
--- a/src/test/examplesJava9/backport/IntegerBackportJava9Main.java
+++ b/src/test/examplesJava9/backport/IntegerBackportJava9Main.java
@@ -22,10 +22,10 @@
   };
 
   public static void main(String[] args) {
-    testParseIntegerSubsequenceWithRadix();
+    testParseIntegerSubsequenceWithRadix(args.length == 0 || !args[0].startsWith("4."));
   }
 
-  private static void testParseIntegerSubsequenceWithRadix() {
+  private static void testParseIntegerSubsequenceWithRadix(boolean supportsPlusPrefix) {
     for (int value : interestingValues) {
       for (int radix = Character.MIN_RADIX; radix <= Character.MAX_RADIX; radix++) {
         for (String prefix : new String[] {"", "x", "xxx"}) {
@@ -34,7 +34,7 @@
             int start = prefix.length();
             int end = valueString.length() - postfix.length();
             assertEquals(valueString, value, Integer.parseInt(valueString, start, end, radix));
-            if (value > 0) {
+            if (value > 0 && supportsPlusPrefix) {
               valueString = prefix + '+' + Long.toString(value, radix) + postfix;
               end++;
               assertEquals(valueString, value, Integer.parseInt(valueString, start, end, radix));