Avoid future implicit toString (like first case removed in previous commit)

1 files changed, 19 insertions, 35 deletions

diff --git a/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java
index cce0a4402e7..002b974d3da 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/StringFieldValueTestCase.java
@@ -18,77 +18,61 @@ public class StringFieldValueTestCase {
         new StringFieldValue("\r");
         new StringFieldValue("\n");
         for (int c = 0x20; c < MIN_SURROGATE; c++) {
-            new StringFieldValue("" + Character.toChars(c)[0]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = MAX_SURROGATE + 1; c < 0xFDD0; c++) {
-            new StringFieldValue("" + Character.toChars(c)[0]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0xFDE0; c < 0xFFFE; c++) {
-            new StringFieldValue("" + Character.toChars(c)[0]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x10000; c < 0x1FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x20000; c < 0x2FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x30000; c < 0x3FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x40000; c < 0x4FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x50000; c < 0x5FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x60000; c < 0x6FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x70000; c < 0x7FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x80000; c < 0x8FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x90000; c < 0x9FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0xA0000; c < 0xAFFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0xB0000; c < 0xBFFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0xC0000; c < 0xCFFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0xD0000; c < 0xDFFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0xE0000; c < 0xEFFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0xF0000; c < 0xFFFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
         for (int c = 0x100000; c < 0x10FFFE; c++) {
-            char[] chars = Character.toChars(c);
-            new StringFieldValue("" + chars[0] + chars[1]);
+            new StringFieldValue(new String(Character.toChars(c)));
         }
     }