Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrating to Junit 5 #847 #848

Closed
wants to merge 1 commit into from
Closed

Migrating to Junit 5 #847 #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ repositories {
}

dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation(platform('org.junit:junit-bom:5.10.1'))
testImplementation('org.junit.jupiter:junit-jupiter')
testImplementation 'com.jayway.jsonpath:json-path:2.4.0'
testImplementation 'org.mockito:mockito-core:4.2.0'
}
Expand Down
17 changes: 13 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,22 @@
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
178 changes: 90 additions & 88 deletions src/test/java/org/json/NumberConversionUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,173 +1,175 @@
package org.json;

import org.junit.Test;

import java.math.BigDecimal;
import java.math.BigInteger;

import static org.junit.Assert.*;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.*;

public class NumberConversionUtilTest {
class NumberConversionUtilTest {

@Test
public void shouldParseDecimalFractionNumbersWithMultipleLeadingZeros(){
void shouldParseDecimalFractionNumbersWithMultipleLeadingZeros(){
Number number = NumberConversionUtil.stringToNumber("00.10d");
assertEquals("Do not match", 0.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", 0.10f, number.floatValue(),0.0f);
assertEquals("Do not match", 0, number.longValue(),0);
assertEquals("Do not match", 0, number.intValue(),0);
assertEquals(0.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(0.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(0, number.longValue(),0,"Do not match");
assertEquals(0, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseDecimalFractionNumbersWithSingleLeadingZero(){
void shouldParseDecimalFractionNumbersWithSingleLeadingZero(){
Number number = NumberConversionUtil.stringToNumber("0.10d");
assertEquals("Do not match", 0.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", 0.10f, number.floatValue(),0.0f);
assertEquals("Do not match", 0, number.longValue(),0);
assertEquals("Do not match", 0, number.intValue(),0);
assertEquals(0.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(0.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(0, number.longValue(),0,"Do not match");
assertEquals(0, number.intValue(),0,"Do not match");
}


@Test
public void shouldParseDecimalFractionNumbersWithZerosAfterDecimalPoint(){
void shouldParseDecimalFractionNumbersWithZerosAfterDecimalPoint(){
Number number = NumberConversionUtil.stringToNumber("0.010d");
assertEquals("Do not match", 0.010d, number.doubleValue(),0.0d);
assertEquals("Do not match", 0.010f, number.floatValue(),0.0f);
assertEquals("Do not match", 0, number.longValue(),0);
assertEquals("Do not match", 0, number.intValue(),0);
assertEquals(0.010d, number.doubleValue(),0.0d,"Do not match");
assertEquals(0.010f, number.floatValue(),0.0f,"Do not match");
assertEquals(0, number.longValue(),0,"Do not match");
assertEquals(0, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
void shouldParseMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
Number number = NumberConversionUtil.stringToNumber("00200.10d");
assertEquals("Do not match", 200.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", 200.10f, number.floatValue(),0.0f);
assertEquals("Do not match", 200, number.longValue(),0);
assertEquals("Do not match", 200, number.intValue(),0);
assertEquals(200.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(200.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(200, number.longValue(),0,"Do not match");
assertEquals(200, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseMixedDecimalFractionNumbersWithoutLeadingZero(){
void shouldParseMixedDecimalFractionNumbersWithoutLeadingZero(){
Number number = NumberConversionUtil.stringToNumber("200.10d");
assertEquals("Do not match", 200.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", 200.10f, number.floatValue(),0.0f);
assertEquals("Do not match", 200, number.longValue(),0);
assertEquals("Do not match", 200, number.intValue(),0);
assertEquals(200.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(200.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(200, number.longValue(),0,"Do not match");
assertEquals(200, number.intValue(),0,"Do not match");
}


@Test
public void shouldParseMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
void shouldParseMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
Number number = NumberConversionUtil.stringToNumber("200.010d");
assertEquals("Do not match", 200.010d, number.doubleValue(),0.0d);
assertEquals("Do not match", 200.010f, number.floatValue(),0.0f);
assertEquals("Do not match", 200, number.longValue(),0);
assertEquals("Do not match", 200, number.intValue(),0);
assertEquals(200.010d, number.doubleValue(),0.0d,"Do not match");
assertEquals(200.010f, number.floatValue(),0.0f,"Do not match");
assertEquals(200, number.longValue(),0,"Do not match");
assertEquals(200, number.intValue(),0,"Do not match");
}


@Test
public void shouldParseNegativeDecimalFractionNumbersWithMultipleLeadingZeros(){
void shouldParseNegativeDecimalFractionNumbersWithMultipleLeadingZeros(){
Number number = NumberConversionUtil.stringToNumber("-00.10d");
assertEquals("Do not match", -0.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", -0.10f, number.floatValue(),0.0f);
assertEquals("Do not match", -0, number.longValue(),0);
assertEquals("Do not match", -0, number.intValue(),0);
assertEquals(-0.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(-0.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(-0, number.longValue(),0,"Do not match");
assertEquals(-0, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseNegativeDecimalFractionNumbersWithSingleLeadingZero(){
void shouldParseNegativeDecimalFractionNumbersWithSingleLeadingZero(){
Number number = NumberConversionUtil.stringToNumber("-0.10d");
assertEquals("Do not match", -0.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", -0.10f, number.floatValue(),0.0f);
assertEquals("Do not match", -0, number.longValue(),0);
assertEquals("Do not match", -0, number.intValue(),0);
assertEquals(-0.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(-0.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(-0, number.longValue(),0,"Do not match");
assertEquals(-0, number.intValue(),0,"Do not match");
}


@Test
public void shouldParseNegativeDecimalFractionNumbersWithZerosAfterDecimalPoint(){
void shouldParseNegativeDecimalFractionNumbersWithZerosAfterDecimalPoint(){
Number number = NumberConversionUtil.stringToNumber("-0.010d");
assertEquals("Do not match", -0.010d, number.doubleValue(),0.0d);
assertEquals("Do not match", -0.010f, number.floatValue(),0.0f);
assertEquals("Do not match", -0, number.longValue(),0);
assertEquals("Do not match", -0, number.intValue(),0);
assertEquals(-0.010d, number.doubleValue(),0.0d,"Do not match");
assertEquals(-0.010f, number.floatValue(),0.0f,"Do not match");
assertEquals(-0, number.longValue(),0,"Do not match");
assertEquals(-0, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseNegativeMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
void shouldParseNegativeMixedDecimalFractionNumbersWithMultipleLeadingZeros(){
Number number = NumberConversionUtil.stringToNumber("-00200.10d");
assertEquals("Do not match", -200.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", -200.10f, number.floatValue(),0.0f);
assertEquals("Do not match", -200, number.longValue(),0);
assertEquals("Do not match", -200, number.intValue(),0);
assertEquals(-200.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(-200.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(-200, number.longValue(),0,"Do not match");
assertEquals(-200, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseNegativeMixedDecimalFractionNumbersWithoutLeadingZero(){
void shouldParseNegativeMixedDecimalFractionNumbersWithoutLeadingZero(){
Number number = NumberConversionUtil.stringToNumber("-200.10d");
assertEquals("Do not match", -200.10d, number.doubleValue(),0.0d);
assertEquals("Do not match", -200.10f, number.floatValue(),0.0f);
assertEquals("Do not match", -200, number.longValue(),0);
assertEquals("Do not match", -200, number.intValue(),0);
assertEquals(-200.10d, number.doubleValue(),0.0d,"Do not match");
assertEquals(-200.10f, number.floatValue(),0.0f,"Do not match");
assertEquals(-200, number.longValue(),0,"Do not match");
assertEquals(-200, number.intValue(),0,"Do not match");
}


@Test
public void shouldParseNegativeMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
void shouldParseNegativeMixedDecimalFractionNumbersWithZerosAfterDecimalPoint(){
Number number = NumberConversionUtil.stringToNumber("-200.010d");
assertEquals("Do not match", -200.010d, number.doubleValue(),0.0d);
assertEquals("Do not match", -200.010f, number.floatValue(),0.0f);
assertEquals("Do not match", -200, number.longValue(),0);
assertEquals("Do not match", -200, number.intValue(),0);
assertEquals(-200.010d, number.doubleValue(),0.0d,"Do not match");
assertEquals(-200.010f, number.floatValue(),0.0f,"Do not match");
assertEquals(-200, number.longValue(),0,"Do not match");
assertEquals(-200, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseNumbersWithExponents(){
void shouldParseNumbersWithExponents(){
Number number = NumberConversionUtil.stringToNumber("23.45e7");
assertEquals("Do not match", 23.45e7d, number.doubleValue(),0.0d);
assertEquals("Do not match", 23.45e7f, number.floatValue(),0.0f);
assertEquals("Do not match", 2.345E8, number.longValue(),0);
assertEquals("Do not match", 2.345E8, number.intValue(),0);
assertEquals(23.45e7d, number.doubleValue(),0.0d,"Do not match");
assertEquals(23.45e7f, number.floatValue(),0.0f,"Do not match");
assertEquals(2.345E8, number.longValue(),0,"Do not match");
assertEquals(2.345E8, number.intValue(),0,"Do not match");
}


@Test
public void shouldParseNegativeNumbersWithExponents(){
void shouldParseNegativeNumbersWithExponents(){
Number number = NumberConversionUtil.stringToNumber("-23.45e7");
assertEquals("Do not match", -23.45e7d, number.doubleValue(),0.0d);
assertEquals("Do not match", -23.45e7f, number.floatValue(),0.0f);
assertEquals("Do not match", -2.345E8, number.longValue(),0);
assertEquals("Do not match", -2.345E8, number.intValue(),0);
assertEquals(-23.45e7d, number.doubleValue(),0.0d,"Do not match");
assertEquals(-23.45e7f, number.floatValue(),0.0f,"Do not match");
assertEquals(-2.345E8, number.longValue(),0,"Do not match");
assertEquals(-2.345E8, number.intValue(),0,"Do not match");
}

@Test
public void shouldParseBigDecimal(){
void shouldParseBigDecimal(){
Number number = NumberConversionUtil.stringToNumber("19007199254740993.35481234487103587486413587843213584");
assertTrue(number instanceof BigDecimal);
}

@Test
public void shouldParseBigInteger(){
void shouldParseBigInteger(){
Number number = NumberConversionUtil.stringToNumber("1900719925474099335481234487103587486413587843213584");
assertTrue(number instanceof BigInteger);
}

@Test
public void shouldIdentifyPotentialNumber(){
assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112.123"));
assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("112e123"));
assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112.123"));
assertTrue("Does not identify as number", NumberConversionUtil.potentialNumber("-112e23"));
assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("--112.123"));
assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("-a112.123"));
assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("a112.123"));
assertFalse("Does not identify as not number", NumberConversionUtil.potentialNumber("e112.123"));
void shouldIdentifyPotentialNumber(){
assertTrue(NumberConversionUtil.potentialNumber("112.123"), "Does not identify as number");
assertTrue(NumberConversionUtil.potentialNumber("112e123"), "Does not identify as number");
assertTrue(NumberConversionUtil.potentialNumber("-112.123"), "Does not identify as number");
assertTrue(NumberConversionUtil.potentialNumber("-112e23"), "Does not identify as number");
assertFalse(NumberConversionUtil.potentialNumber("--112.123"), "Does not identify as not number");
assertFalse(NumberConversionUtil.potentialNumber("-a112.123"), "Does not identify as not number");
assertFalse(NumberConversionUtil.potentialNumber("a112.123"), "Does not identify as not number");
assertFalse(NumberConversionUtil.potentialNumber("e112.123"), "Does not identify as not number");
}

@Test(expected = NumberFormatException.class)
public void shouldExpectExceptionWhenNumberIsNotFormatted(){
NumberConversionUtil.stringToNumber("112.aa123");
@Test
void shouldExpectExceptionWhenNumberIsNotFormatted(){
assertThrows(NumberFormatException.class, () -> {
NumberConversionUtil.stringToNumber("112.aa123");
});
}


Expand Down