Work on #1433: tests, minor improvement to handling (#1435)

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/core/base/ParserBase.java

@@ -900,11 +900,9 @@ protected void _parseNumericValue(int expType) throws IOException
         //    (note: could alternatively see if TextBuffer has aggregated contents, avoid
         //    exception -- but that might be more confusing)
         if (_closed) {
-            _reportError("Internal error: _parseNumericValue called when parser instance closed");
-        }
-
+            ;
         // Int or float?
-        if (_currToken == JsonToken.VALUE_NUMBER_INT) {
+        } else if (_currToken == JsonToken.VALUE_NUMBER_INT) {
             final int len = _intLength;
             // First: optimization for simple int
             if (len <= 9) {

src/test/java/com/fasterxml/jackson/core/read/NumberParsingGetType1433Test.java

@@ -0,0 +1,82 @@
+package com.fasterxml.jackson.core.read;
+
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.core.JUnit5TestBase;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.exc.StreamReadException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class NumberParsingGetType1433Test
+    extends JUnit5TestBase
+{
+    protected JsonFactory jsonFactory() {
+        return sharedStreamFactory();
+    }
+
+    @Test
+    void getNumberType() throws Exception
+    {
+        _getNumberType(MODE_INPUT_STREAM);
+        _getNumberType(MODE_INPUT_STREAM_THROTTLED);
+        _getNumberType(MODE_READER);
+        _getNumberType(MODE_DATA_INPUT);
+    }
+
+    private void _getNumberType(int mode) throws Exception
+    {
+        JsonParser p;
+
+        p = createParser(jsonFactory(), mode, " 123 ");
+        _verifyGetNumberTypeFail(p, "null");
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(JsonParser.NumberType.INT, p.getNumberType());
+        assertNull(p.nextToken());
+        _verifyGetNumberTypeFail(p, "null");
+        p.close();
+        _verifyGetNumberTypeFail(p, "null");
+
+        p = createParser(jsonFactory(), mode, " -9 false ");
+        _verifyGetNumberTypeFail(p, "null");
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(JsonParser.NumberType.INT, p.getNumberType());
+        assertToken(JsonToken.VALUE_FALSE, p.nextToken());
+        _verifyGetNumberTypeFail(p, "VALUE_FALSE");
+        assertNull(p.nextToken());
+        _verifyGetNumberTypeFail(p, "null");
+        p.close();
+        _verifyGetNumberTypeFail(p, "null");
+
+        p = createParser(jsonFactory(), mode, "[123, true]");
+        _verifyGetNumberTypeFail(p, "null");
+        assertToken(JsonToken.START_ARRAY, p.nextToken());
+        _verifyGetNumberTypeFail(p, "START_ARRAY");
+        assertToken(JsonToken.VALUE_NUMBER_INT, p.nextToken());
+        assertEquals(JsonParser.NumberType.INT, p.getNumberType());
+        assertToken(JsonToken.VALUE_TRUE, p.nextToken());
+        _verifyGetNumberTypeFail(p, "VALUE_TRUE");
+        assertToken(JsonToken.END_ARRAY, p.nextToken());
+        _verifyGetNumberTypeFail(p, "END_ARRAY");
+        assertNull(p.nextToken());
+        _verifyGetNumberTypeFail(p, "null");
+        p.close();
+        _verifyGetNumberTypeFail(p, "null");
+    }
+
+    private void _verifyGetNumberTypeFail(JsonParser p, String token) throws Exception
+    {
+        try {
+            p.getNumberType();
+            fail("Should not pass");
+        } catch (StreamReadException e) {
+            verifyException(e, "Current token ("+token+") not numeric, can not use numeric");
+        }
+    }
+    
+}