commit 8b984156ec83f162ea96d1d6d95eadf11410c816
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 04 10:54:58 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 04 10:54:58 2022 +0000
tree e14aa4850793e7a12d29b358a9b77c9d60efd461
parent ce1cb4c507338c3ea6e6db998f500b11a5cb02b1
parent a0b56fdedb21c8125e667849561e825e46f9eb78

Merge "Fix ImplicitStringConcatMany when run with jacoco"

ojluni/src/test/java/lang/String/concat/ImplicitStringConcatMany.java

diff --git a/ojluni/src/test/java/lang/String/concat/ImplicitStringConcatMany.java b/ojluni/src/test/java/lang/String/concat/ImplicitStringConcatMany.java
index cf0a121..8a209f3 100644
--- a/ojluni/src/test/java/lang/String/concat/ImplicitStringConcatMany.java
+++ b/ojluni/src/test/java/lang/String/concat/ImplicitStringConcatMany.java
@@ -137,6 +137,10 @@
         for (Field f : ImplicitStringConcatMany.class.getDeclaredFields()) {
             if (Modifier.isStatic(f.getModifiers())) {
                 String name = f.getName();
+                // Android-added: jacoco injects static fields and crashes (b/203822631).
+                if (f.getType() != String.class || !isConcatStringFieldName(name)) {
+                    continue;
+                }
                 try {
                     f.set(null, name);
                 } catch (IllegalAccessException e) {
@@ -146,6 +150,17 @@
         }
     }
 
+
+    // Android-added: jacoco injects static fields and crashes (b/203822631).
+    static boolean isConcatStringFieldName(String name) {
+        // String fields in the test are named 's[0-9]{3}'
+        return (name.length() == 4 &&
+                name.charAt(0) == 's' &&
+                Character.isDigit(name.charAt(1)) &&
+                Character.isDigit(name.charAt(2)) &&
+                Character.isDigit(name.charAt(3)));
+    }
+
     @Test
     public void testImplicitStringConcatMany() {
         String res =