Skip to content

Commit 0de50fb

Browse files
committed
Minor test reordering
1 parent 2850895 commit 0de50fb

File tree

1 file changed

+60
-54
lines changed

1 file changed

+60
-54
lines changed

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

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,66 @@ public void testBigNumbers() throws Exception
440440
}
441441
}
442442

443+
/*
444+
/**********************************************************************
445+
/* Tests, int/long/BigInteger via E-notation (engineering)
446+
/**********************************************************************
447+
*/
448+
449+
public void testBigIntegerWithENotation() throws Exception {
450+
final String DOC = "1e5 ";
451+
452+
final int[] modes = new int[]{
453+
MODE_INPUT_STREAM,
454+
MODE_INPUT_STREAM_THROTTLED,
455+
MODE_READER,
456+
MODE_READER_THROTTLED,
457+
MODE_DATA_INPUT
458+
};
459+
for (int mode : modes) {
460+
try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
461+
assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
462+
assertEquals(100000L, p.getBigIntegerValue().longValue());
463+
}
464+
}
465+
}
466+
467+
public void testLongWithENotation() throws Exception {
468+
final String DOC = "1e5 ";
469+
470+
final int[] modes = new int[]{
471+
MODE_INPUT_STREAM,
472+
MODE_INPUT_STREAM_THROTTLED,
473+
MODE_READER,
474+
MODE_READER_THROTTLED,
475+
MODE_DATA_INPUT
476+
};
477+
for (int mode : modes) {
478+
try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
479+
assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
480+
assertEquals(100000L, p.getLongValue());
481+
}
482+
}
483+
}
484+
485+
public void testIntWithENotation() throws Exception {
486+
final String DOC = "1e5 ";
487+
488+
final int[] modes = new int[]{
489+
MODE_INPUT_STREAM,
490+
MODE_INPUT_STREAM_THROTTLED,
491+
MODE_READER,
492+
MODE_READER_THROTTLED,
493+
MODE_DATA_INPUT
494+
};
495+
for (int mode : modes) {
496+
try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
497+
assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
498+
assertEquals(100000, p.getIntValue());
499+
}
500+
}
501+
}
502+
443503
/*
444504
/**********************************************************************
445505
/* Tests, floating point (basic)
@@ -881,60 +941,6 @@ public void testNegativeMaxNumberLength() {
881941
}
882942
}
883943

884-
public void testBigIntegerWithENotation() throws Exception {
885-
final String DOC = "1e5";
886-
887-
// TODO broken for MODE_DATA_INPUT
888-
final int[] modes = new int[]{
889-
MODE_INPUT_STREAM,
890-
MODE_INPUT_STREAM_THROTTLED,
891-
MODE_READER,
892-
MODE_READER_THROTTLED
893-
};
894-
for (int mode : modes) {
895-
try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
896-
assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
897-
assertEquals(100000L, p.getBigIntegerValue().longValue());
898-
}
899-
}
900-
}
901-
902-
public void testLongWithENotation() throws Exception {
903-
final String DOC = "1e5";
904-
905-
// TODO broken for MODE_DATA_INPUT
906-
final int[] modes = new int[]{
907-
MODE_INPUT_STREAM,
908-
MODE_INPUT_STREAM_THROTTLED,
909-
MODE_READER,
910-
MODE_READER_THROTTLED
911-
};
912-
for (int mode : modes) {
913-
try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
914-
assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
915-
assertEquals(100000L, p.getLongValue());
916-
}
917-
}
918-
}
919-
920-
public void testIntWithENotation() throws Exception {
921-
final String DOC = "1e5";
922-
923-
// TODO broken for MODE_DATA_INPUT
924-
final int[] modes = new int[]{
925-
MODE_INPUT_STREAM,
926-
MODE_INPUT_STREAM_THROTTLED,
927-
MODE_READER,
928-
MODE_READER_THROTTLED
929-
};
930-
for (int mode : modes) {
931-
try (JsonParser p = createParser(jsonFactory(), mode, DOC)) {
932-
assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
933-
assertEquals(100000, p.getIntValue());
934-
}
935-
}
936-
}
937-
938944
/*
939945
/**********************************************************
940946
/* Helper methods

0 commit comments

Comments
 (0)