Fixed UTF const.

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/groovy/datadog/trace/instrumentation/java/lang/invoke/StringConcatFactoryCallSiteTest.groovy

@@ -147,7 +147,9 @@ class StringConcatFactoryCallSiteTest extends InstrumentationSpecification {
     setup:
     StringModule iastModule = Mock(StringModule)
     InstrumentationBridge.registerIastModule(iastModule)
-    final expected = '𠆢Hello𠆢\u0001𠆢World!.'
+    // Explicit escape for non-ASCII symbol to make test independent of container settings.
+    final utfConstant = '\uD840\uDDA2' // 𠆢
+    final expected = "${utfConstant}Hello${utfConstant}\u0001${utfConstant}World!."
 
     when:
     final result = TestStringConcatFactorySuite.plusWithUtfConstants('Hello', 'World!')
@@ -157,8 +159,8 @@ class StringConcatFactoryCallSiteTest extends InstrumentationSpecification {
     1 * iastModule.onStringConcatFactory(
       expected,
       ['Hello', 'World!'] as String[],
-      '𠆢\u0001\u0002\u0001.',
-      ['𠆢\u0001𠆢'] as Object[],
+      "${utfConstant}\u0001\u0002\u0001.",
+      ["${utfConstant}\u0001${utfConstant}"] as Object[],
       [-2, 0, -5, 1, -1] as int[])
     0 * _
   }

dd-java-agent/instrumentation/java/java-lang/java-lang-9.0/src/test/java/foo/bar/TestStringConcatFactorySuite.java

@@ -5,6 +5,8 @@
 import org.slf4j.LoggerFactory;
 
 public abstract class TestStringConcatFactorySuite {
+  // Explicit escape for non-ASCII symbol to make test independent of container settings.
+  private static final String UTF_CONSTANT = "\uD840\uDDA2"; // 𠆢
 
   private static final Logger LOGGER = LoggerFactory.getLogger(TestStringConcatFactorySuite.class);
 
@@ -33,7 +35,8 @@ public static String plusWithConstantsAndTags(final String left, final String ri
 
   public static String plusWithUtfConstants(final String left, final String right) {
     LOGGER.debug("Before string plus {} {}", left, right);
-    final String result = "𠆢" + left + "𠆢\u0001𠆢" + right + ".";
+    final String result =
+        UTF_CONSTANT + left + UTF_CONSTANT + "\u0001" + UTF_CONSTANT + right + ".";
     LOGGER.debug("After string plus {}", result);
     return result;
   }
@@ -50,7 +53,8 @@ public static String stringPlusWithMultipleObjects(final Object... target) {
     LOGGER.debug("Before string plus {}", Arrays.toString(target));
     String result = "";
     for (final Object item : target) {
-      result += item;
+      //noinspection StringConcatenationInLoop
+      result += item; // intentional `+` in loop for test.
     }
     LOGGER.debug("After string plus {}", result);
     return result;

dd-java-agent/instrumentation/java/java-net/java-net-1.8/src/test/groovy/datadog/trace/instrumentation/java/net/URLEncoderCallSiteTest.groovy

@@ -7,6 +7,8 @@ import datadog.trace.api.iast.propagation.PropagationModule
 import foo.bar.TestURLEncoderCallSiteSuite
 
 class URLEncoderCallSiteTest extends InstrumentationSpecification {
+  // Explicit escape for non-ASCII `ståle` to make test independent of container settings.
+  private static final String NON_ASCII_QUERY = 'my test.asp?name=st\u00E5le&car=saab'
 
   @Override
   protected void configurePreAgent() {
@@ -27,9 +29,9 @@ class URLEncoderCallSiteTest extends InstrumentationSpecification {
     0 * _
 
     where:
-    args                                         | expected
-    ['my test.asp?name=ståle&car=saab']          | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
-    ['my test.asp?name=ståle&car=saab', 'UTF-8'] | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
+    args                       | expected
+    [NON_ASCII_QUERY]          | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
+    [NON_ASCII_QUERY, 'UTF-8'] | 'my+test.asp%3Fname%3Dst%C3%A5le%26car%3Dsaab'
   }
 
   void 'test encode with null args'() {