Minor test reordering

FasterXML · Apr 5, 2023 · 0de50fb · 0de50fb
1 parent 2850895
commit 0de50fb
Showing 1 changed file with 60 additions and 54 deletions.
diff --git a/src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java b/src/test/java/com/fasterxml/jackson/core/read/NumberParsingTest.java
@@ -440,6 +440,66 @@ public void testBigNumbers() throws Exception
         }
     }
 
+    /*
+    /**********************************************************************
+    /* Tests, int/long/BigInteger via E-notation (engineering)
+    /**********************************************************************
+     */
+
+    public void testBigIntegerWithENotation() throws Exception {
+        final String DOC = "1e5 ";
+
+        final int[] modes = new int[]{
+                MODE_INPUT_STREAM,
+                MODE_INPUT_STREAM_THROTTLED,
+                MODE_READER,
+                MODE_READER_THROTTLED,
+                MODE_DATA_INPUT
+        };
+        for (int mode : modes) {
+            try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
+                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+                assertEquals(100000L, p.getBigIntegerValue().longValue());
+            }
+        }
+    }
+
+    public void testLongWithENotation() throws Exception {
+        final String DOC = "1e5 ";
+
+        final int[] modes = new int[]{
+                MODE_INPUT_STREAM,
+                MODE_INPUT_STREAM_THROTTLED,
+                MODE_READER,
+                MODE_READER_THROTTLED,
+                MODE_DATA_INPUT
+        };
+        for (int mode : modes) {
+            try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
+                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+                assertEquals(100000L, p.getLongValue());
+            }
+        }
+    }
+
+    public void testIntWithENotation() throws Exception {
+        final String DOC = "1e5 ";
+
+        final int[] modes = new int[]{
+                MODE_INPUT_STREAM,
+                MODE_INPUT_STREAM_THROTTLED,
+                MODE_READER,
+                MODE_READER_THROTTLED,
+                MODE_DATA_INPUT
+        };
+        for (int mode : modes) {
+            try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
+                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
+                assertEquals(100000, p.getIntValue());
+            }
+        }
+    }
+
     /*
     /**********************************************************************
     /* Tests, floating point (basic)
@@ -881,60 +941,6 @@ public void testNegativeMaxNumberLength() {
         }
     }
 
-    public void testBigIntegerWithENotation() throws Exception {
-        final String DOC = "1e5";
-
-        // TODO broken for MODE_DATA_INPUT
-        final int[] modes = new int[]{
-                MODE_INPUT_STREAM,
-                MODE_INPUT_STREAM_THROTTLED,
-                MODE_READER,
-                MODE_READER_THROTTLED
-        };
-        for (int mode : modes) {
-            try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
-                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
-                assertEquals(100000L, p.getBigIntegerValue().longValue());
-            }
-        }
-    }
-
-    public void testLongWithENotation() throws Exception {
-        final String DOC = "1e5";
-
-        // TODO broken for MODE_DATA_INPUT
-        final int[] modes = new int[]{
-                MODE_INPUT_STREAM,
-                MODE_INPUT_STREAM_THROTTLED,
-                MODE_READER,
-                MODE_READER_THROTTLED
-        };
-        for (int mode : modes) {
-            try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
-                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
-                assertEquals(100000L, p.getLongValue());
-            }
-        }
-    }
-
-    public void testIntWithENotation() throws Exception {
-        final String DOC = "1e5";
-
-        // TODO broken for MODE_DATA_INPUT
-        final int[] modes = new int[]{
-                MODE_INPUT_STREAM,
-                MODE_INPUT_STREAM_THROTTLED,
-                MODE_READER,
-                MODE_READER_THROTTLED
-        };
-        for (int mode : modes) {
-            try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
-                assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
-                assertEquals(100000, p.getIntValue());
-            }
-        }
-    }
-
     /*
     /**********************************************************
     /* Helper methods