test refactoring

Author: cowtowncoder

src/test/java/tools/jackson/core/unittest/tofix/async/AsyncTokenBranchErrorTest.java renamed to src/test/java/tools/jackson/core/unittest/json/async/AsyncParserInvalidKeywordsTest.java

@@ -1,4 +1,4 @@
-package tools.jackson.core.unittest.tofix.async;
+package tools.jackson.core.unittest.json.async;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,13 +7,12 @@
 import tools.jackson.core.json.JsonFactory;
 import tools.jackson.core.unittest.async.AsyncTestBase;
 import tools.jackson.core.unittest.testutil.AsyncReaderWrapper;
-import tools.jackson.core.unittest.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
 // Tests for handling token decoding fails for non-Root values
 // (within Object / Array)
-class AsyncTokenBranchErrorTest extends AsyncTestBase
+class AsyncParserInvalidKeywordsTest extends AsyncTestBase
 {
     private final JsonFactory JSON_F = newStreamFactory();
 
@@ -65,32 +64,6 @@ private void _doTestInvalidKeyword(String value)
         }
     }
 
-    @JacksonTestFailureExpected
-    @Test
-    void mangledNonRootInts() throws Exception
-    {
-        try (AsyncReaderWrapper p = _createParser("[ 123true ]")) {
-            assertToken(JsonToken.START_ARRAY, p.nextToken());
-            JsonToken t = p.nextToken();
-            fail("Should have gotten an exception; instead got token: "+t);
-        } catch (StreamReadException e) {
-            verifyException(e, "expected space");
-        }
-    }
-
-    @JacksonTestFailureExpected
-    @Test
-    void mangledNonRootFloats() throws Exception
-    {
-        try (AsyncReaderWrapper p = _createParser("[ 1.5false ]")) {
-            assertToken(JsonToken.START_ARRAY, p.nextToken());
-            JsonToken t = p.nextToken();
-            fail("Should have gotten an exception; instead got token: "+t);
-        } catch (StreamReadException e) {
-            verifyException(e, "expected space");
-        }
-    }
-
     private AsyncReaderWrapper _createParser(String doc)
     {
         return asyncForBytes(JSON_F, 1, _jsonDoc(doc), 1);

src/test/java/tools/jackson/core/unittest/tofix/ParserErrorHandling105Test.java

@@ -17,24 +17,35 @@ class ParserErrorHandling105Test
     @JacksonTestFailureExpected
     @Test
     void mangledIntsBytes() throws Exception {
+        _testMangledNonRootInts(MODE_INPUT_STREAM);
+        _testMangledNonRootInts(MODE_INPUT_STREAM_THROTTLED);
+    }
+
+    @JacksonTestFailureExpected
+    @Test
+    void mangledIntsDataInput() throws Exception {
         // 02-Jun-2017, tatu: Fails to fail; should check whether this is expected
         //   (since DataInput can't do look-ahead)
         _testMangledNonRootInts(MODE_DATA_INPUT);
     }
 
     @JacksonTestFailureExpected
     @Test
-    void mangledFloatsBytes() throws Exception {
-//        _testMangledNonRootFloats(MODE_INPUT_STREAM);
-//        _testMangledNonRootFloats(MODE_INPUT_STREAM_THROTTLED);
+    void mangledIntsChars() throws Exception {
+        _testMangledNonRootInts(MODE_READER);
+    }
 
-        _testMangledNonRootFloats(MODE_DATA_INPUT);
+    @JacksonTestFailureExpected
+    @Test
+    void mangledFloatsBytes() throws Exception {
+        _testMangledNonRootFloats(MODE_INPUT_STREAM);
+        _testMangledNonRootFloats(MODE_INPUT_STREAM_THROTTLED);
     }
 
     @JacksonTestFailureExpected
     @Test
-    void mangledIntsChars() throws Exception {
-        _testMangledNonRootInts(MODE_READER);
+    void mangledFloatsDataInput() throws Exception {
+        _testMangledNonRootFloats(MODE_DATA_INPUT);
     }
 
     @JacksonTestFailureExpected

src/test/java/tools/jackson/core/unittest/tofix/async/AsyncTokenBranchNumberErrorTest.java

@@ -0,0 +1,50 @@
+package tools.jackson.core.unittest.tofix.async;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.core.JsonToken;
+import tools.jackson.core.exc.StreamReadException;
+import tools.jackson.core.json.JsonFactory;
+import tools.jackson.core.unittest.async.AsyncTestBase;
+import tools.jackson.core.unittest.testutil.AsyncReaderWrapper;
+import tools.jackson.core.unittest.testutil.failure.JacksonTestFailureExpected;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+// Tests for handling token decoding fails for non-Root values
+// (within Object / Array)
+class AsyncTokenBranchNumberErrorTest extends AsyncTestBase
+{
+    private final JsonFactory JSON_F = newStreamFactory();
+
+    @JacksonTestFailureExpected
+    @Test
+    void mangledNonRootInts() throws Exception
+    {
+        try (AsyncReaderWrapper p = _createParser("[ 123true ]")) {
+            assertToken(JsonToken.START_ARRAY, p.nextToken());
+            JsonToken t = p.nextToken();
+            fail("Should have gotten an exception; instead got token: "+t);
+        } catch (StreamReadException e) {
+            verifyException(e, "expected space");
+        }
+    }
+
+    @JacksonTestFailureExpected
+    @Test
+    void mangledNonRootFloats() throws Exception
+    {
+        try (AsyncReaderWrapper p = _createParser("[ 1.5false ]")) {
+            assertToken(JsonToken.START_ARRAY, p.nextToken());
+            JsonToken t = p.nextToken();
+            fail("Should have gotten an exception; instead got token: "+t);
+        } catch (StreamReadException e) {
+            verifyException(e, "expected space");
+        }
+    }
+
+    private AsyncReaderWrapper _createParser(String doc)
+    {
+        return asyncForBytes(JSON_F, 1, _jsonDoc(doc), 1);
+    }
+}