Test cleanup

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/core/BaseTest.java

@@ -575,7 +575,7 @@ protected static byte[] utf8Bytes(String str) {
         return str.getBytes(StandardCharsets.UTF_8);
     }
 
-    protected static String fromUTF8(ByteArrayOutputStream bytes) {
+    protected static String utf8String(ByteArrayOutputStream bytes) {
         return new String(bytes.toByteArray(), StandardCharsets.UTF_8);
     }
 
@@ -623,11 +623,7 @@ protected String fieldNameFor(int index)
     }
 
     protected int[] calcQuads(String word) {
-        try {
-            return calcQuads(word.getBytes("UTF-8"));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        return calcQuads(utf8Bytes(word));
     }
 
     protected int[] calcQuads(byte[] wordBytes) {

src/test/java/com/fasterxml/jackson/core/io/UTF8WriterTest.java

@@ -31,7 +31,7 @@ public void testSimple() throws Exception
         // and thus should have 3 times contents
         byte[] data = out.toByteArray();
         assertEquals(3*10, data.length);
-        String act = out.toString("UTF-8");
+        String act = utf8String(out);
         assertEquals(15, act.length());
 
         assertEquals(3 * str.length(), act.length());
@@ -53,7 +53,7 @@ public void testSimpleAscii() throws Exception
         byte[] data = out.toByteArray();
         // one 2-byte encoded char
         assertEquals(ch.length+1, data.length);
-        String act = out.toString("UTF-8");
+        String act = utf8String(out);
         assertEquals(str, act);
     }
 

src/test/java/com/fasterxml/jackson/core/json/GeneratorFeaturesTest.java

@@ -148,7 +148,7 @@ public void testBigDecimalAsPlainString() throws Exception
         g = f.createGenerator(bos);
         g.writeNumber(ENG);
         g.close();
-        assertEquals(q("100"), bos.toString("UTF-8"));
+        assertEquals(q("100"), utf8String(bos));
     }
 
     // [core#315]
@@ -234,7 +234,7 @@ private String _writeNumbers(JsonFactory f, boolean useBytes) throws IOException
         g.writeEndArray();
         g.close();
 
-        return useBytes ? bytes.toString("UTF-8") : sw.toString();
+        return useBytes ? utf8String(bytes) : sw.toString();
     }
 
     // for [core#246]
@@ -283,7 +283,7 @@ private void _testFieldNameQuotingEnabled(JsonFactory f, boolean useBytes,
         gen.writeEndObject();
         gen.close();
 
-        String json = useBytes ? bytes.toString("UTF-8") : sw.toString();
+        String json = useBytes ? utf8String(bytes) : sw.toString();
         assertEquals(exp, json);
     }
 
@@ -390,7 +390,7 @@ private void _testHexOutput(JsonFactory f, boolean useBytes,
         g.flush();
         g.close();
 
-        String result = useBytes ? fromUTF8(bytes) : sw.toString();
+        String result = useBytes ? utf8String(bytes) : sw.toString();
         assertEquals(exp, result);
 
         g.close();

src/test/java/com/fasterxml/jackson/core/write/GeneratorBasicTest.java

@@ -45,7 +45,7 @@ public void testStringWrite() throws Exception
                     JsonParser jp = JSON_F.createParser(new ByteArrayInputStream(bout.toByteArray()));
 
                     JsonToken t = jp.nextToken();
-                    assertNotNull("Document \""+bout.toString("UTF-8")+"\" yielded no tokens", t);
+                    assertNotNull("Document \""+utf8String(bout)+"\" yielded no tokens", t);
                     assertEquals(JsonToken.VALUE_STRING, t);
                     assertEquals(input, jp.getText());
                     assertEquals(null, jp.nextToken());
@@ -149,7 +149,7 @@ private void _testRootIntsWrite(boolean useBytes) throws Exception
          gen.writeNumber(-13);
          gen.close();
 
-         String docStr = useBytes ? bytes.toString("UTF-8") : sw.toString();
+         String docStr = useBytes ? utf8String(bytes) : sw.toString();
 
          try {
              JsonParser jp = createParserUsingReader(docStr);
@@ -195,7 +195,7 @@ public void _testFieldValueWrites(boolean useBytes) throws Exception
         gen.writeEndObject();
         gen.close();
 
-        String docStr = useBytes ? bytes.toString("UTF-8") : sw.toString();
+        String docStr = useBytes ? utf8String(bytes) : sw.toString();
 
         assertEquals("{\"short\":3,\"int\":3,\"long\":3,\"big\":1707,\"double\":0.25,\"float\":-0.25,\"decimal\":17.07}",
                 docStr.trim());
@@ -342,7 +342,7 @@ private void doTestIntValueWrite(boolean pad, boolean useBytes) throws Exception
                     gen.writeRaw(" ");
                 }
                 gen.close();
-                docStr = bytes.toString("UTF-8");
+                docStr = utf8String(bytes);
                 p = JSON_F.createParser(bytes.toByteArray());
             } else {
                 StringWriter sw = new StringWriter();
@@ -398,7 +398,7 @@ private void doTestLongValueWrite(boolean pad, boolean useBytes) throws Exceptio
                     gen.writeRaw(" ");
                 }
                 gen.close();
-                docStr = bytes.toString("UTF-8");
+                docStr = utf8String(bytes);
                 p = JSON_F.createParser(bytes.toByteArray());
             } else {
                 StringWriter sw = new StringWriter();

src/test/java/com/fasterxml/jackson/core/write/GeneratorMiscTest.java

@@ -248,7 +248,7 @@ public void testAsEmbedded() throws Exception
         g = JSON_F.createGenerator(bytes);
         g.writeEmbeddedObject(null);
         g.close();
-        assertEquals("null", bytes.toString("UTF-8"));
+        assertEquals("null", utf8String(bytes));
 
         // also, for fun, try illegal unknown thingy
 

src/test/java/com/fasterxml/jackson/core/write/UTF8GeneratorTest.java

@@ -96,7 +96,7 @@ public void testFilteringWithEscapedChars() throws Exception
 
         gen.writeFieldName("escapes");
 
-        final byte[] raw = SAMPLE_WITH_QUOTES.toString().getBytes("UTF-8");
+        final byte[] raw = utf8Bytes(SAMPLE_WITH_QUOTES);
         gen.writeUTF8String(raw, 0, raw.length);
 
         gen.writeEndObject();