diff --git a/UPGRADE_SUMMARY.md b/UPGRADE_SUMMARY.md index 53b61b3..c64acf6 100644 --- a/UPGRADE_SUMMARY.md +++ b/UPGRADE_SUMMARY.md @@ -7,7 +7,7 @@ Using GitHub Copilot successfully updated the project to use Java 21 with modern ### Build & Testing Tools - **JaCoCo**: 0.8.2 → 0.8.12 (Java 21 compatibility fix) -- **JUnit**: 4.13.1 → 4.13.2 (security patches) +- **JUnit**: 4.13.2 → 5.10.1 (Junit 5 migration) - **Mockito**: 3.12.4 → 5.11.0 (major version upgrade) ### Logging @@ -52,7 +52,7 @@ Updated for Checkstyle 9.x/10.x compatibility: ## Known Issues & Future Work 1. **Checkstyle Violations**: 157 javadoc-related violations need to be addressed in a separate effort -2. **JUnit 5 Migration**: Attempted but blocked by Eclipse/Takari compiler access restrictions with JUnit 5 annotations +~~2. **JUnit 5 Migration**: Attempted but blocked by Eclipse/Takari compiler access restrictions with JUnit 5 annotations~~ 3. **Deprecated API Usage**: Some test code uses deprecated Integer constructor (Java 9+) 4. **Java Agent Warnings**: Dynamic agent loading warnings from Mockito/ByteBuddy (Java 21 feature) diff --git a/pom.xml b/pom.xml index 081d124..154f676 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ false false - 4.13.2 + 5.10.1 5.11.0 2.0.12 1.5.3 @@ -67,8 +67,14 @@ - junit - junit + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine ${junit.version} test @@ -82,6 +88,21 @@ + + + + + + io.takari.maven.plugins + takari-lifecycle-plugin + true + + jdt + + -J--add-opens=java.base/java.lang=ALL-UNNAMED + + + org.jacoco @@ -108,6 +129,12 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + org.apache.maven.plugins diff --git a/src/test/java/com/walmartlabs/x12/SegmentIteratorTest.java b/src/test/java/com/walmartlabs/x12/SegmentIteratorTest.java index f4836a2..a4871d6 100644 --- a/src/test/java/com/walmartlabs/x12/SegmentIteratorTest.java +++ b/src/test/java/com/walmartlabs/x12/SegmentIteratorTest.java @@ -16,25 +16,26 @@ package com.walmartlabs.x12; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.NoSuchElementException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; public class SegmentIteratorTest { - @Test(expected = IllegalArgumentException.class) + @Test public void test_with_null_list() { List segmentLines = null; - new SegmentIterator(segmentLines); + assertThrows(IllegalArgumentException.class, () -> new SegmentIterator(segmentLines)); } @Test diff --git a/src/test/java/com/walmartlabs/x12/X12SegmentTest.java b/src/test/java/com/walmartlabs/x12/X12SegmentTest.java index b75a56d..1b8925c 100644 --- a/src/test/java/com/walmartlabs/x12/X12SegmentTest.java +++ b/src/test/java/com/walmartlabs/x12/X12SegmentTest.java @@ -16,10 +16,10 @@ package com.walmartlabs.x12; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class X12SegmentTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/DTMDateTimeReferenceParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/DTMDateTimeReferenceParserTest.java index cad5f34..7063b0c 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/DTMDateTimeReferenceParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/DTMDateTimeReferenceParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.DTMDateTimeReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DTMDateTimeReferenceParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/FOBRelatedInstructionsParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/FOBRelatedInstructionsParserTest.java index 560876e..b47f41e 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/FOBRelatedInstructionsParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/FOBRelatedInstructionsParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.FOBRelatedInstructions; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class FOBRelatedInstructionsParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/LINItemIdentificationParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/LINItemIdentificationParserTest.java index b699541..7ed0167 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/LINItemIdentificationParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/LINItemIdentificationParserTest.java @@ -18,12 +18,12 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.LINItemIdentification; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class LINItemIdentificationParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/N1PartyIdentificationParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/N1PartyIdentificationParserTest.java index 2ca8592..3afc9a3 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/N1PartyIdentificationParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/N1PartyIdentificationParserTest.java @@ -21,16 +21,16 @@ import com.walmartlabs.x12.common.segment.N1PartyIdentification; import com.walmartlabs.x12.common.segment.N3PartyLocation; import com.walmartlabs.x12.common.segment.N4GeographicLocation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class N1PartyIdentificationParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/PIDPartyIdentificationParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/PIDPartyIdentificationParserTest.java index d3e75f2..52fe335 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/PIDPartyIdentificationParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/PIDPartyIdentificationParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.PIDProductIdentification; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PIDPartyIdentificationParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/PKGPackagingParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/PKGPackagingParserTest.java index dc6ac97..8161a5a 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/PKGPackagingParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/PKGPackagingParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.PKGPackaging; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PKGPackagingParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/REFReferenceInformationParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/REFReferenceInformationParserTest.java index d72734e..12f6947 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/REFReferenceInformationParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/REFReferenceInformationParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.REFReferenceInformation; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class REFReferenceInformationParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/TD1CarrierDetailParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/TD1CarrierDetailParserTest.java index 420951b..35d4a92 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/TD1CarrierDetailParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/TD1CarrierDetailParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.TD1CarrierDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TD1CarrierDetailParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/TD3CarrierDetailParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/TD3CarrierDetailParserTest.java index df7a9b3..f1f9787 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/TD3CarrierDetailParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/TD3CarrierDetailParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.TD3CarrierDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TD3CarrierDetailParserTest { diff --git a/src/test/java/com/walmartlabs/x12/common/segment/parser/TD5CarrierDetailParserTest.java b/src/test/java/com/walmartlabs/x12/common/segment/parser/TD5CarrierDetailParserTest.java index 746a369..f26b1fd 100644 --- a/src/test/java/com/walmartlabs/x12/common/segment/parser/TD5CarrierDetailParserTest.java +++ b/src/test/java/com/walmartlabs/x12/common/segment/parser/TD5CarrierDetailParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.common.segment.TD5CarrierDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class TD5CarrierDetailParserTest { diff --git a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParseValidateTest.java b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParseValidateTest.java index 24626b8..ca07ea7 100644 --- a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParseValidateTest.java +++ b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParseValidateTest.java @@ -21,24 +21,24 @@ import com.walmartlabs.x12.types.InvoiceType; import com.walmartlabs.x12.types.ProductQualifier; import com.walmartlabs.x12.types.UnitMeasure; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultDex894ParseValidateTest { private DefaultDex894Parser dexParser; private DefaultDex894Validator dexValidator; - @Before + @BeforeEach public void init() { dexParser = new DefaultDex894Parser(); dexValidator = new DefaultDex894Validator(); diff --git a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserDxsSegmentTest.java b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserDxsSegmentTest.java index 66c1e4b..7ce64e5 100644 --- a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserDxsSegmentTest.java +++ b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserDxsSegmentTest.java @@ -18,16 +18,17 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.exceptions.X12ParserException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class DefaultDex894ParserDxsSegmentTest { DefaultDex894Parser dexParser; - @Before + @BeforeEach public void init() { dexParser = new DefaultDex894Parser(); } @@ -121,11 +122,11 @@ public void testParseApplicationTrailerWithMissingControlNumber() { assertEquals(new Integer(2), dex.getNumberOfTransactions()); } - @Test(expected = X12ParserException.class) + @Test public void testParseApplicationTrailerWithInvalidCount() { Dex894 dex = new Dex894(); X12Segment segment = new X12Segment("DXE*1*DX"); - dexParser.parseApplicationTrailer(segment, dex); + assertThrows(X12ParserException.class, () -> dexParser.parseApplicationTrailer(segment, dex)); } } diff --git a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTest.java b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTest.java index f2b822c..5aebbd5 100644 --- a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTest.java +++ b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTest.java @@ -18,18 +18,19 @@ import com.walmartlabs.x12.exceptions.X12ParserException; import com.walmartlabs.x12.testing.util.X12DocumentTestData; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; public class DefaultDex894ParserTest { DefaultDex894Parser dexParser; - @Before + @BeforeEach public void init() { dexParser = new DefaultDex894Parser(); } @@ -46,28 +47,28 @@ public void testParsingShipment_empty() throws IOException { assertNull(dexParser.parse(dexTransmission)); } - @Test(expected = X12ParserException.class) + @Test public void testParsingShipment_invalid() throws IOException { String dexTransmission = "invalid"; - dexParser.parse(dexTransmission); + assertThrows(X12ParserException.class, () -> dexParser.parse(dexTransmission)); } - @Test(expected = X12ParserException.class) + @Test public void testParsingShipmentWithMissingDxe() throws IOException { byte[] dexBytes = X12DocumentTestData.readFileAsBytes("src/test/resources/dex/894/dex.sample.missing.dxe.txt"); - dexParser.parse(new String(dexBytes)); + assertThrows(X12ParserException.class, () -> dexParser.parse(new String(dexBytes))); } - @Test(expected = X12ParserException.class) + @Test public void testParsingShipmentWithMismatchedTransactions() throws IOException { byte[] dexBytes = X12DocumentTestData.readFileAsBytes("src/test/resources/dex/894/dex.sample.mismatched.st.txt"); - dexParser.parse(new String(dexBytes)); + assertThrows(X12ParserException.class, () -> dexParser.parse(new String(dexBytes))); } - @Test(expected = X12ParserException.class) + @Test public void testParsingInvalidSegments() throws IOException { byte[] dexBytes = X12DocumentTestData.readFileAsBytes("src/test/resources/dex/894/dex.sample.invalid.segments.txt"); - dexParser.parse(new String(dexBytes)); + assertThrows(X12ParserException.class, () -> dexParser.parse(new String(dexBytes))); } } \ No newline at end of file diff --git a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTransactionTest.java b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTransactionTest.java index a4d67c0..972dc04 100644 --- a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTransactionTest.java +++ b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ParserTransactionTest.java @@ -20,16 +20,17 @@ import com.walmartlabs.x12.exceptions.X12ParserException; import com.walmartlabs.x12.types.InvoiceType; import com.walmartlabs.x12.types.UnitMeasure; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class DefaultDex894ParserTransactionTest { DefaultDex894Parser dexParser; - @Before + @BeforeEach public void init() { dexParser = new DefaultDex894Parser(); } @@ -65,11 +66,11 @@ public void testParseTransactionSetHeaderMissingIdCode() { } - @Test(expected = X12ParserException.class) + @Test public void testParseTransactionSetHeaderWrongSegmentIdentifier() { Dex894TransactionSet dexTx = new Dex894TransactionSet(); X12Segment segment = new X12Segment("XX*894*569145629"); - dexParser.parseTransactionSetHeader(segment, dexTx); + assertThrows(X12ParserException.class, () -> dexParser.parseTransactionSetHeader(segment, dexTx)); } /* @@ -135,11 +136,11 @@ public void testParseG82WithMissingDebitCreditFlag() { assertEquals("20171116", dexTx.getTransactionDate()); } - @Test(expected = X12ParserException.class) + @Test public void testParseG82WrongSegmentId() { Dex894TransactionSet dexTx = new Dex894TransactionSet(); X12Segment segment = new X12Segment("G89*D*8327063806*051957769*004615*182737015*PL1124*20171116"); - dexParser.parseG82(segment, dexTx); + assertThrows(X12ParserException.class, () -> dexParser.parseG82(segment, dexTx)); } /* @@ -205,11 +206,11 @@ public void testParseG83WithDescription() { assertEquals(null, dexItem.getInnerPackCount()); } - @Test(expected = X12ParserException.class) + @Test public void testParseG83WrongSegmentId() { Dex894Item dexItem = new Dex894Item(); X12Segment segment = new X12Segment("XX*1*48*EA*001410008547****1.83"); - dexParser.parseG83(segment, dexItem); + assertThrows(X12ParserException.class, () -> dexParser.parseG83(segment, dexItem)); } /* @@ -223,11 +224,11 @@ public void testParseG85() { assertEquals("A238", dexTx.getIntegrityCheckValue()); } - @Test(expected = X12ParserException.class) + @Test public void testParseG856WrongSegmentId() { Dex894TransactionSet dexTx = new Dex894TransactionSet(); X12Segment segment = new X12Segment("XX*A238"); - dexParser.parseG85(segment, dexTx); + assertThrows(X12ParserException.class, () -> dexParser.parseG85(segment, dexTx)); } /* @@ -241,11 +242,11 @@ public void testParseG86() { assertEquals("C91456300976", dexTx.getElectronicSignature()); } - @Test(expected = X12ParserException.class) + @Test public void testParseG86WrongSegmentId() { Dex894TransactionSet dexTx = new Dex894TransactionSet(); X12Segment segment = new X12Segment("XX*C91456300976"); - dexParser.parseG86(segment, dexTx); + assertThrows(X12ParserException.class, () -> dexParser.parseG86(segment, dexTx)); } /* @@ -278,18 +279,18 @@ public void testParseTransactionSetTrailerMissingSegmentCount() { assertEquals("569145629", dexTx.getTrailerControlNumber()); } - @Test(expected = X12ParserException.class) + @Test public void testParseTransactionSetTrailerWrongSegmentCount() { Dex894TransactionSet dexTx = new Dex894TransactionSet(); X12Segment segment = new X12Segment("SE*XX*569145629"); - dexParser.parseTransactionSetTrailer(segment, dexTx); + assertThrows(X12ParserException.class, () -> dexParser.parseTransactionSetTrailer(segment, dexTx)); } - @Test(expected = X12ParserException.class) + @Test public void testParseTransactionSetTrailerWrongSegmentIdentifier() { Dex894TransactionSet dexTx = new Dex894TransactionSet(); X12Segment segment = new X12Segment("XX*10*569145629"); - dexParser.parseTransactionSetTrailer(segment, dexTx); + assertThrows(X12ParserException.class, () -> dexParser.parseTransactionSetTrailer(segment, dexTx)); } } diff --git a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ValidatorTest.java b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ValidatorTest.java index 31294cb..c448796 100644 --- a/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ValidatorTest.java +++ b/src/test/java/com/walmartlabs/x12/dex/dx894/DefaultDex894ValidatorTest.java @@ -19,8 +19,8 @@ import com.walmartlabs.x12.exceptions.X12ErrorDetail; import com.walmartlabs.x12.types.ProductQualifier; import com.walmartlabs.x12.types.UnitMeasure; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.util.ArrayList; @@ -28,15 +28,15 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class DefaultDex894ValidatorTest { private DefaultDex894Validator dexValidator; - @Before + @BeforeEach public void init() { dexValidator = new DefaultDex894Validator(); } diff --git a/src/test/java/com/walmartlabs/x12/rule/TrailerSegmentCountX12RuleTest.java b/src/test/java/com/walmartlabs/x12/rule/TrailerSegmentCountX12RuleTest.java index 90fdf49..2aa814f 100644 --- a/src/test/java/com/walmartlabs/x12/rule/TrailerSegmentCountX12RuleTest.java +++ b/src/test/java/com/walmartlabs/x12/rule/TrailerSegmentCountX12RuleTest.java @@ -19,35 +19,33 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.exceptions.X12ParserException; import com.walmartlabs.x12.util.SourceToSegmentUtil; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; -public class TrailerSegmentCountX12RuleTest { +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; - @Rule - public ExpectedException exception = ExpectedException.none(); +public class TrailerSegmentCountX12RuleTest { private TrailerSegmentCountX12Rule rule; - @Before + @BeforeEach public void init() { rule = new TrailerSegmentCountX12Rule(); } - @Test(expected = IllegalArgumentException.class) + @Test public void test_verify_null() { List segmentList = null; - rule.verify(segmentList); + assertThrows(IllegalArgumentException.class, () -> rule.verify(segmentList)); } - @Test(expected = IllegalArgumentException.class) + @Test public void test_verify_empty() { List segmentList = null; - rule.verify(segmentList); + assertThrows(IllegalArgumentException.class, () -> rule.verify(segmentList)); } @Test @@ -153,11 +151,9 @@ public void test_one_group_missing_group_count() { .append("IEA**000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("incorrect number of groups on IEA trailer"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("incorrect number of groups on IEA trailer")); } @Test @@ -191,11 +187,9 @@ public void test_one_group_alpha_group_count() { .append("IEA*A*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("Invalid numeric value"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("Invalid numeric value")); } @Test @@ -236,11 +230,9 @@ public void test_two_group_mismatch_control_numbers() { .append("IEA*2*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("groups seem to be misaligned"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("groups seem to be misaligned")); } @Test @@ -275,11 +267,9 @@ public void test_one_group_incorrect_group_count() { .append("IEA*10*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("incorrect number of groups on IEA trailer"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("incorrect number of groups on IEA trailer")); } @Test @@ -313,11 +303,9 @@ public void test_one_group_missing_isa() { .append("IEA*1*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("missing IEA segment"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("missing IEA segment")); } @Test @@ -349,11 +337,9 @@ public void test_one_group_missing_iea() { .append("\r\n") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("missing IEA segment"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("missing IEA segment")); } @Test @@ -387,11 +373,9 @@ public void test_one_group_missing_gs() { .append("IEA*1*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("groups seem to be misaligned"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("groups seem to be misaligned")); } @Test @@ -423,11 +407,9 @@ public void test_one_group_missing_ge() { .append("IEA*1*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("incorrect number of groups on IEA trailer"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("incorrect number of groups on IEA trailer")); } @@ -462,11 +444,9 @@ public void test_one_group_alpha_transaction_count() { .append("IEA*1*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("Invalid numeric value"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("Invalid numeric value")); } @Test @@ -500,11 +480,9 @@ public void test_one_group_missing_transaction_count() { .append("IEA*1*000000049") .toString(); - exception.expect(X12ParserException.class); - exception.expectMessage("incorrect number of transactions on group"); - List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule.verify(segmentList); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> rule.verify(segmentList)); + assertTrue(thrown.getMessage().contains("incorrect number of transactions on group")); } } diff --git a/src/test/java/com/walmartlabs/x12/rule/UniqueDocumentX12RuleTest.java b/src/test/java/com/walmartlabs/x12/rule/UniqueDocumentX12RuleTest.java index f821713..cbc7590 100644 --- a/src/test/java/com/walmartlabs/x12/rule/UniqueDocumentX12RuleTest.java +++ b/src/test/java/com/walmartlabs/x12/rule/UniqueDocumentX12RuleTest.java @@ -19,22 +19,26 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.exceptions.X12ParserException; import com.walmartlabs.x12.util.SourceToSegmentUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertThrows; + public class UniqueDocumentX12RuleTest { private UniqueDocumentX12Rule rule; - @Test(expected = IllegalArgumentException.class) + @Test public void test_verify_null() { List segmentList = null; - rule = new UniqueDocumentX12Rule("BSN", 2, 3); - rule.verify(segmentList); + assertThrows(IllegalArgumentException.class, () -> { + rule = new UniqueDocumentX12Rule("BSN", 2, 3); + rule.verify(segmentList); + }); } @Test @@ -85,7 +89,7 @@ public void test_no_duplicates_mix_document() { } - @Test(expected = X12ParserException.class) + @Test public void test_duplicates_mix_document() { String sourceData = new StringBuilder() .append("ISA*01*0000000000*01*0000000000*ZZ*ABCDEFGHIJKLMNO*ZZ*123456789012345*101127*1719*U*00400*000000049*0*P*>") @@ -126,11 +130,13 @@ public void test_duplicates_mix_document() { List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule = new UniqueDocumentX12Rule("BSN", 2, 3); - rule.verify(segmentList); + assertThrows(X12ParserException.class, () -> { + rule = new UniqueDocumentX12Rule("BSN", 2, 3); + rule.verify(segmentList); + }); } - @Test(expected = X12ParserException.class) + @Test public void test_duplicates_po_document() { String sourceData = new StringBuilder() .append("ISA*01*0000000000*01*0000000000*ZZ*ABCDEFGHIJKLMNO*ZZ*123456789012345*101127*1719*U*00400*000000049*0*P*>") @@ -165,8 +171,10 @@ public void test_duplicates_po_document() { List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule = new UniqueDocumentX12Rule("BEG", 3, 4); - rule.verify(segmentList); + assertThrows(X12ParserException.class, () -> { + rule = new UniqueDocumentX12Rule("BEG", 3, 4); + rule.verify(segmentList); + }); } @Test @@ -201,7 +209,7 @@ public void test_no_duplicates_no_document_number_or_date() { rule.verify(segmentList); } - @Test(expected = X12ParserException.class) + @Test public void test_duplicates_no_document_number() { String sourceData = new StringBuilder() .append("ISA*01*0000000000*01*0000000000*ZZ*ABCDEFGHIJKLMNO*ZZ*123456789012345*101127*1719*U*00400*000000049*0*P*>") @@ -229,8 +237,10 @@ public void test_duplicates_no_document_number() { List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule = new UniqueDocumentX12Rule("BSN", 2, 3); - rule.verify(segmentList); + assertThrows(X12ParserException.class, () -> { + rule = new UniqueDocumentX12Rule("BSN", 2, 3); + rule.verify(segmentList); + }); } @Test @@ -265,7 +275,7 @@ public void test_no_duplicates_no_document_date() { rule.verify(segmentList); } - @Test(expected = X12ParserException.class) + @Test public void test_duplicates_no_document_date() { String sourceData = new StringBuilder() .append("ISA*01*0000000000*01*0000000000*ZZ*ABCDEFGHIJKLMNO*ZZ*123456789012345*101127*1719*U*00400*000000049*0*P*>") @@ -293,8 +303,10 @@ public void test_duplicates_no_document_date() { List segmentList = SourceToSegmentUtil.splitSourceDataIntoSegments(sourceData.trim()); - rule = new UniqueDocumentX12Rule("BSN", 2, 3); - rule.verify(segmentList); + assertThrows(X12ParserException.class, () -> { + rule = new UniqueDocumentX12Rule("BSN", 2, 3); + rule.verify(segmentList); + }); } } diff --git a/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserNoRegisteredTransactionSetParserTest.java b/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserNoRegisteredTransactionSetParserTest.java index ff3c3dd..704bb00 100644 --- a/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserNoRegisteredTransactionSetParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserNoRegisteredTransactionSetParserTest.java @@ -21,19 +21,19 @@ import com.walmartlabs.x12.standard.txset.TransactionSetParser; import com.walmartlabs.x12.testing.util.AssertBaseDocumentUtil; import com.walmartlabs.x12.testing.util.X12DocumentTestData; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * tests various use cases for the StandardX12Parser @@ -42,12 +42,9 @@ */ public class StandardX12ParserNoRegisteredTransactionSetParserTest { - @Rule - public ExpectedException exception = ExpectedException.none(); - private StandardX12Parser standardParser; - @Before + @BeforeEach public void init() { standardParser = new StandardX12Parser(); } @@ -75,41 +72,29 @@ public void test_parsingValidDocumentWithNoTransactionSetParser() { @Test public void test_parsingWhenEnvelopeHeaderIsInvalid() { String sourceData = X12DocumentTestData.readFile("src/test/resources/x12.wrong.ISA.txt"); - - exception.expect(X12ParserException.class); - exception.expectMessage("Invalid EDI X12 message: must be wrapped in ISA/ISE"); - - standardParser.parse(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> standardParser.parse(sourceData)); + assertTrue(thrown.getMessage().contains("Invalid EDI X12 message: must be wrapped in ISA/ISE")); } @Test public void test_parsingWhenEnvelopeHeaderIsMissing() { String sourceData = X12DocumentTestData.readFile("src/test/resources/x12.missing.ISA.txt"); - - exception.expect(X12ParserException.class); - exception.expectMessage("Invalid EDI X12 message: must be wrapped in ISA/ISE"); - - standardParser.parse(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> standardParser.parse(sourceData)); + assertTrue(thrown.getMessage().contains("Invalid EDI X12 message: must be wrapped in ISA/ISE")); } @Test public void test_parsingWhenEnvelopeTrailerIsMissing() { String sourceData = "ISA*01*0000000000*01*0000000000*ZZ*ABCDEFGHIJKLMNO*ZZ*123456789012345*101127*1719*U*00400*000000049*0*P*>"; - - exception.expect(X12ParserException.class); - exception.expectMessage("Invalid EDI X12 message: must be wrapped in ISA/ISE"); - - standardParser.parse(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> standardParser.parse(sourceData)); + assertTrue(thrown.getMessage().contains("Invalid EDI X12 message: must be wrapped in ISA/ISE")); } @Test public void test_parsingWhenGroupHeaderIsInvalid() { String sourceData = X12DocumentTestData.readFile("src/test/resources/x12.wrong.GS.txt"); - - exception.expect(X12ParserException.class); - exception.expectMessage("expected one segment but found another"); - - standardParser.parse(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> standardParser.parse(sourceData)); + assertTrue(thrown.getMessage().contains("expected one segment but found another")); } @Test diff --git a/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserUsingX12BaseDocumentTest.java b/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserUsingX12BaseDocumentTest.java index 45a0461..52686a8 100644 --- a/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserUsingX12BaseDocumentTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/StandardX12ParserUsingX12BaseDocumentTest.java @@ -24,16 +24,16 @@ import com.walmartlabs.x12.testing.util.X12DocumentTestData; import com.walmartlabs.x12.testing.util.txset.aaa.AaaChainableTransactionSetParser; import com.walmartlabs.x12.testing.util.txset.bbb.BbbChainableTransactionSetParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; /** * diff --git a/src/test/java/com/walmartlabs/x12/standard/X12LoopTest.java b/src/test/java/com/walmartlabs/x12/standard/X12LoopTest.java index a7bf51e..de21013 100644 --- a/src/test/java/com/walmartlabs/x12/standard/X12LoopTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/X12LoopTest.java @@ -16,10 +16,10 @@ package com.walmartlabs.x12.standard; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class X12LoopTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/AbstractTransactionSetParserChainableTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/AbstractTransactionSetParserChainableTest.java index 4518b91..c9acf52 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/AbstractTransactionSetParserChainableTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/AbstractTransactionSetParserChainableTest.java @@ -24,15 +24,15 @@ import com.walmartlabs.x12.testing.util.txset.bbb.TypeBbbTransactionSet; import com.walmartlabs.x12.testing.util.txset.ccc.CccUnchainableTransactionSetParser; import com.walmartlabs.x12.testing.util.txset.ccc.TypeCccTransactionSet; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class AbstractTransactionSetParserChainableTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/Asn856ParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/Asn856ParserTest.java index 89603fb..7f37194 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/Asn856ParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/Asn856ParserTest.java @@ -24,21 +24,21 @@ import com.walmartlabs.x12.standard.StandardX12Parser; import com.walmartlabs.x12.standard.X12Group; import com.walmartlabs.x12.testing.util.X12DocumentTestData; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class Asn856ParserTest { private StandardX12Parser asnParser; - @Before + @BeforeEach public void init() { asnParser = new StandardX12Parser(); asnParser.registerTransactionSetParser(new DefaultAsn856TransactionSetParser()); diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserEntireTxSetTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserEntireTxSetTest.java index 184b555..e4315df 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserEntireTxSetTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserEntireTxSetTest.java @@ -38,22 +38,22 @@ import com.walmartlabs.x12.standard.txset.asn856.segment.MANMarkNumber; import com.walmartlabs.x12.standard.txset.asn856.segment.PRFPurchaseOrderReference; import com.walmartlabs.x12.standard.txset.asn856.segment.SN1ItemDetail; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultAsn856TransactionSetParserEntireTxSetTest { private DefaultAsn856TransactionSetParser txParser; - @Before + @BeforeEach public void init() { txParser = new DefaultAsn856TransactionSetParser(); } diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserPerishableTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserPerishableTest.java index 0e0a091..80d375d 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserPerishableTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserPerishableTest.java @@ -40,22 +40,22 @@ import com.walmartlabs.x12.standard.txset.asn856.segment.MANMarkNumber; import com.walmartlabs.x12.standard.txset.asn856.segment.PRFPurchaseOrderReference; import com.walmartlabs.x12.standard.txset.asn856.segment.SN1ItemDetail; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultAsn856TransactionSetParserPerishableTest { private DefaultAsn856TransactionSetParser txParser; - @Before + @BeforeEach public void init() { txParser = new DefaultAsn856TransactionSetParser(); } diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserTest.java index d09e404..639e96e 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/DefaultAsn856TransactionSetParserTest.java @@ -31,25 +31,25 @@ import com.walmartlabs.x12.standard.txset.asn856.loop.Tare; import com.walmartlabs.x12.standard.txset.asn856.segment.MANMarkNumber; import com.walmartlabs.x12.standard.txset.asn856.segment.PRFPurchaseOrderReference; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class DefaultAsn856TransactionSetParserTest { private DefaultAsn856TransactionSetParser txParser; - @Before + @BeforeEach public void init() { txParser = new DefaultAsn856TransactionSetParser(); } diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/loop/ShipmentTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/loop/ShipmentTest.java index c41ff7e..25bdbbd 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/loop/ShipmentTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/loop/ShipmentTest.java @@ -17,10 +17,10 @@ package com.walmartlabs.x12.standard.txset.asn856.loop; import com.walmartlabs.x12.standard.X12Loop; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ShipmentTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/MANMarkNumberParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/MANMarkNumberParserTest.java index 93adc77..1f7819e 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/MANMarkNumberParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/MANMarkNumberParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.standard.txset.asn856.segment.MANMarkNumber; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class MANMarkNumberParserTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PALPalletTypeParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PALPalletTypeParserTest.java index 7930ecc..081f356 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PALPalletTypeParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PALPalletTypeParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.standard.txset.asn856.segment.PALPalletType; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PALPalletTypeParserTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PO4ItemPhysicalDetailParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PO4ItemPhysicalDetailParserTest.java index e8698b6..554b6c6 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PO4ItemPhysicalDetailParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PO4ItemPhysicalDetailParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.standard.txset.asn856.segment.PO4ItemPhysicalDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PO4ItemPhysicalDetailParserTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PRFPurchaseOrderReferenceParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PRFPurchaseOrderReferenceParserTest.java index e2b1268..b8d4ea2 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PRFPurchaseOrderReferenceParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/PRFPurchaseOrderReferenceParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.standard.txset.asn856.segment.PRFPurchaseOrderReference; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class PRFPurchaseOrderReferenceParserTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/SN1ItemDetailParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/SN1ItemDetailParserTest.java index 7ef3d3f..19630dd 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/SN1ItemDetailParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/asn856/segment/parser/SN1ItemDetailParserTest.java @@ -18,11 +18,11 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.standard.txset.asn856.segment.SN1ItemDetail; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class SN1ItemDetailParserTest { diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericParserTest.java index d9afd1a..9927fec 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericParserTest.java @@ -25,14 +25,14 @@ import com.walmartlabs.x12.standard.StandardX12Parser; import com.walmartlabs.x12.standard.X12Group; import com.walmartlabs.x12.standard.X12Loop; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; /** * test the Generic Transaction Set parser when registered with the Standard X12 @@ -43,7 +43,7 @@ public class GenericParserTest { private StandardX12Parser standardParser; - @Before + @BeforeEach public void init() { standardParser = new StandardX12Parser(); standardParser.registerTransactionSetParser(new GenericTransactionSetParser()); diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericTransactionSetParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericTransactionSetParserTest.java index 9fd3ac4..9fa4b27 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericTransactionSetParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/generic/GenericTransactionSetParserTest.java @@ -6,25 +6,25 @@ import com.walmartlabs.x12.exceptions.X12ParserException; import com.walmartlabs.x12.standard.X12Group; import com.walmartlabs.x12.standard.X12Loop; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class GenericTransactionSetParserTest { private GenericTransactionSetParser txParser; - @Before + @BeforeEach public void init() { txParser = new GenericTransactionSetParser(); } diff --git a/src/test/java/com/walmartlabs/x12/standard/txset/po850/DefaultPo850TransactionSetParserTest.java b/src/test/java/com/walmartlabs/x12/standard/txset/po850/DefaultPo850TransactionSetParserTest.java index 9f7802f..4f12677 100644 --- a/src/test/java/com/walmartlabs/x12/standard/txset/po850/DefaultPo850TransactionSetParserTest.java +++ b/src/test/java/com/walmartlabs/x12/standard/txset/po850/DefaultPo850TransactionSetParserTest.java @@ -3,23 +3,23 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.X12TransactionSet; import com.walmartlabs.x12.standard.X12Group; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultPo850TransactionSetParserTest { private DefaultPo850TransactionSetParser txParser; - @Before + @BeforeEach public void init() { txParser = new DefaultPo850TransactionSetParser(); } diff --git a/src/test/java/com/walmartlabs/x12/testing/util/AssertBaseDocumentUtil.java b/src/test/java/com/walmartlabs/x12/testing/util/AssertBaseDocumentUtil.java index 5c608fa..819a9dc 100644 --- a/src/test/java/com/walmartlabs/x12/testing/util/AssertBaseDocumentUtil.java +++ b/src/test/java/com/walmartlabs/x12/testing/util/AssertBaseDocumentUtil.java @@ -25,10 +25,10 @@ import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * diff --git a/src/test/java/com/walmartlabs/x12/testing/util/X12DocumentTestData.java b/src/test/java/com/walmartlabs/x12/testing/util/X12DocumentTestData.java index baf3182..275adb6 100644 --- a/src/test/java/com/walmartlabs/x12/testing/util/X12DocumentTestData.java +++ b/src/test/java/com/walmartlabs/x12/testing/util/X12DocumentTestData.java @@ -4,7 +4,7 @@ import java.nio.file.Files; import java.nio.file.Paths; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public final class X12DocumentTestData { diff --git a/src/test/java/com/walmartlabs/x12/testing/util/txset/aaa/AaaChainableTransactionSetParser.java b/src/test/java/com/walmartlabs/x12/testing/util/txset/aaa/AaaChainableTransactionSetParser.java index b68c925..a6efd69 100644 --- a/src/test/java/com/walmartlabs/x12/testing/util/txset/aaa/AaaChainableTransactionSetParser.java +++ b/src/test/java/com/walmartlabs/x12/testing/util/txset/aaa/AaaChainableTransactionSetParser.java @@ -23,8 +23,8 @@ import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class AaaChainableTransactionSetParser extends AbstractTransactionSetParserChainable { diff --git a/src/test/java/com/walmartlabs/x12/testing/util/txset/bbb/BbbChainableTransactionSetParser.java b/src/test/java/com/walmartlabs/x12/testing/util/txset/bbb/BbbChainableTransactionSetParser.java index cb9960e..85875c4 100644 --- a/src/test/java/com/walmartlabs/x12/testing/util/txset/bbb/BbbChainableTransactionSetParser.java +++ b/src/test/java/com/walmartlabs/x12/testing/util/txset/bbb/BbbChainableTransactionSetParser.java @@ -23,8 +23,8 @@ import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class BbbChainableTransactionSetParser extends AbstractTransactionSetParserChainable { diff --git a/src/test/java/com/walmartlabs/x12/testing/util/txset/ccc/CccUnchainableTransactionSetParser.java b/src/test/java/com/walmartlabs/x12/testing/util/txset/ccc/CccUnchainableTransactionSetParser.java index f5b3240..cd10b46 100644 --- a/src/test/java/com/walmartlabs/x12/testing/util/txset/ccc/CccUnchainableTransactionSetParser.java +++ b/src/test/java/com/walmartlabs/x12/testing/util/txset/ccc/CccUnchainableTransactionSetParser.java @@ -26,8 +26,8 @@ import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * is NOT extending {@link AbstractTransactionSetParserChainable} diff --git a/src/test/java/com/walmartlabs/x12/types/ProductQualifierTest.java b/src/test/java/com/walmartlabs/x12/types/ProductQualifierTest.java index 5024763..2eac52f 100644 --- a/src/test/java/com/walmartlabs/x12/types/ProductQualifierTest.java +++ b/src/test/java/com/walmartlabs/x12/types/ProductQualifierTest.java @@ -16,9 +16,9 @@ package com.walmartlabs.x12.types; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ProductQualifierTest { diff --git a/src/test/java/com/walmartlabs/x12/types/UnitMeasureTest.java b/src/test/java/com/walmartlabs/x12/types/UnitMeasureTest.java index f8ac6b2..a6f1f39 100644 --- a/src/test/java/com/walmartlabs/x12/types/UnitMeasureTest.java +++ b/src/test/java/com/walmartlabs/x12/types/UnitMeasureTest.java @@ -16,9 +16,9 @@ package com.walmartlabs.x12.types; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class UnitMeasureTest { diff --git a/src/test/java/com/walmartlabs/x12/types/WeightQualifierTest.java b/src/test/java/com/walmartlabs/x12/types/WeightQualifierTest.java index 641f02c..0bb65f0 100644 --- a/src/test/java/com/walmartlabs/x12/types/WeightQualifierTest.java +++ b/src/test/java/com/walmartlabs/x12/types/WeightQualifierTest.java @@ -16,9 +16,9 @@ package com.walmartlabs.x12.types; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class WeightQualifierTest { diff --git a/src/test/java/com/walmartlabs/x12/util/ConversionUtilTest.java b/src/test/java/com/walmartlabs/x12/util/ConversionUtilTest.java index 2da5bdd..fc808b8 100644 --- a/src/test/java/com/walmartlabs/x12/util/ConversionUtilTest.java +++ b/src/test/java/com/walmartlabs/x12/util/ConversionUtilTest.java @@ -17,9 +17,10 @@ package com.walmartlabs.x12.util; import com.walmartlabs.x12.exceptions.X12ParserException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; public class ConversionUtilTest { @@ -38,9 +39,9 @@ public void test_convertStringToInteger_Number() { assertEquals(new Integer(1), ConversionUtil.convertStringToInteger("1")); } - @Test(expected = X12ParserException.class) + @Test public void test_convertStringToInteger_Alpha() { - ConversionUtil.convertStringToInteger("X"); + assertThrows(X12ParserException.class, () -> ConversionUtil.convertStringToInteger("X")); } @Test @@ -63,8 +64,8 @@ public void test_convertStringToBigDecimal_Negative_Number() { assertEquals("-1.00", ConversionUtil.convertStringToBigDecimal("-1", 2).toString()); } - @Test(expected = X12ParserException.class) + @Test public void test_convertStringToBigDecimal_Alpha() { - ConversionUtil.convertStringToBigDecimal("X", 2); + assertThrows(X12ParserException.class, () -> ConversionUtil.convertStringToBigDecimal("X", 2)); } } diff --git a/src/test/java/com/walmartlabs/x12/util/SourceToSegmentUtilTest.java b/src/test/java/com/walmartlabs/x12/util/SourceToSegmentUtilTest.java index 42cc580..cf1bf06 100644 --- a/src/test/java/com/walmartlabs/x12/util/SourceToSegmentUtilTest.java +++ b/src/test/java/com/walmartlabs/x12/util/SourceToSegmentUtilTest.java @@ -18,8 +18,8 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.testing.util.X12DocumentTestData; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -27,17 +27,17 @@ import java.util.List; import java.util.regex.PatternSyntaxException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; public class SourceToSegmentUtilTest { private String sourceDataFromFile; - @Before + @BeforeEach public void init() throws IOException { sourceDataFromFile = X12DocumentTestData.readFile("src/test/resources/dex/894/dex.sample.1.txt"); } diff --git a/src/test/java/com/walmartlabs/x12/util/X12ParsingUtilTest.java b/src/test/java/com/walmartlabs/x12/util/X12ParsingUtilTest.java index adc4938..d5d1f8d 100644 --- a/src/test/java/com/walmartlabs/x12/util/X12ParsingUtilTest.java +++ b/src/test/java/com/walmartlabs/x12/util/X12ParsingUtilTest.java @@ -17,16 +17,16 @@ package com.walmartlabs.x12.util; import com.walmartlabs.x12.X12Segment; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class X12ParsingUtilTest { diff --git a/src/test/java/com/walmartlabs/x12/util/checksum/BarCodeMod10ChecksumTest.java b/src/test/java/com/walmartlabs/x12/util/checksum/BarCodeMod10ChecksumTest.java index 8e57a3e..7b3098e 100644 --- a/src/test/java/com/walmartlabs/x12/util/checksum/BarCodeMod10ChecksumTest.java +++ b/src/test/java/com/walmartlabs/x12/util/checksum/BarCodeMod10ChecksumTest.java @@ -16,18 +16,20 @@ package com.walmartlabs.x12.util.checksum; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BarCodeMod10ChecksumTest { Checksum util; - @Before + @BeforeEach public void init() { util = new BarCodeMod10Checksum(); } @@ -61,11 +63,13 @@ public void test_generateChecksumDigit_empty() { } - @Test (expected = NumberFormatException.class) + @Test public void test_generateChecksumDigit_nonNumber() { String number = "A123"; - String checkDigit = util.generateChecksumDigit(number); - assertNull(checkDigit); + NumberFormatException thrown = assertThrows(NumberFormatException.class, () -> util.generateChecksumDigit(number)); + String message = thrown.getMessage(); + // JDK NumberFormatException message typically includes the non-numeric character only + assertTrue(message == null || message.contains("A")); } @Test diff --git a/src/test/java/com/walmartlabs/x12/util/checksum/LuhnMod10ChecksumTest.java b/src/test/java/com/walmartlabs/x12/util/checksum/LuhnMod10ChecksumTest.java index 55a7951..681fb10 100644 --- a/src/test/java/com/walmartlabs/x12/util/checksum/LuhnMod10ChecksumTest.java +++ b/src/test/java/com/walmartlabs/x12/util/checksum/LuhnMod10ChecksumTest.java @@ -16,18 +16,20 @@ package com.walmartlabs.x12.util.checksum; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class LuhnMod10ChecksumTest { Checksum util; - @Before + @BeforeEach public void init() { util = new LuhnMod10Checksum(); } @@ -60,11 +62,13 @@ public void test_generateChecksumDigit_empty() { assertNull(checkDigit); } - @Test (expected = NumberFormatException.class) + @Test public void test_generateChecksumDigit_nonNumber() { String number = "A123"; - String checkDigit = util.generateChecksumDigit(number); - assertNull(checkDigit); + NumberFormatException thrown = assertThrows(NumberFormatException.class, () -> util.generateChecksumDigit(number)); + String message = thrown.getMessage(); + // JDK NumberFormatException message typically includes the non-numeric character only + assertTrue(message == null || message.contains("A")); } @Test diff --git a/src/test/java/com/walmartlabs/x12/util/crc/DefaultCrc16Test.java b/src/test/java/com/walmartlabs/x12/util/crc/DefaultCrc16Test.java index d7807f1..54459da 100644 --- a/src/test/java/com/walmartlabs/x12/util/crc/DefaultCrc16Test.java +++ b/src/test/java/com/walmartlabs/x12/util/crc/DefaultCrc16Test.java @@ -17,19 +17,19 @@ package com.walmartlabs.x12.util.crc; import com.walmartlabs.x12.dex.dx894.DefaultDex894Validator; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultCrc16Test { CyclicRedundancyCheck crcUtil; - @Before + @BeforeEach public void init() { crcUtil = new DefaultCrc16(); } diff --git a/src/test/java/com/walmartlabs/x12/util/loop/X12LoopUtilTest.java b/src/test/java/com/walmartlabs/x12/util/loop/X12LoopUtilTest.java index c2e75f5..cb4c91c 100644 --- a/src/test/java/com/walmartlabs/x12/util/loop/X12LoopUtilTest.java +++ b/src/test/java/com/walmartlabs/x12/util/loop/X12LoopUtilTest.java @@ -19,17 +19,17 @@ import com.walmartlabs.x12.X12Segment; import com.walmartlabs.x12.exceptions.X12ErrorDetail; import com.walmartlabs.x12.standard.X12Loop; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class X12LoopUtilTest { diff --git a/src/test/java/com/walmartlabs/x12/util/split/X12TransactionSplitterTest.java b/src/test/java/com/walmartlabs/x12/util/split/X12TransactionSplitterTest.java index 8eafdc7..0c38c7a 100644 --- a/src/test/java/com/walmartlabs/x12/util/split/X12TransactionSplitterTest.java +++ b/src/test/java/com/walmartlabs/x12/util/split/X12TransactionSplitterTest.java @@ -20,10 +20,8 @@ import com.walmartlabs.x12.exceptions.X12ParserException; import com.walmartlabs.x12.rule.X12Rule; import com.walmartlabs.x12.testing.util.X12DocumentTestData; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; @@ -31,18 +29,16 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class X12TransactionSplitterTest { - @Rule - public ExpectedException exception = ExpectedException.none(); - private X12TransactionSplitter splitter; - @Before + @BeforeEach public void init() { splitter = new X12TransactionSplitter(); } @@ -97,11 +93,8 @@ public void test_split_sourceData_missing_ISA() throws IOException { .append("\r\n") .append("IEA*2*000000049") .toString(); - - exception.expect(X12ParserException.class); - exception.expectMessage("expected ISA segment but got G"); - - splitter.split(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); + assertTrue(thrown.getMessage().contains("expected ISA segment but got G")); } @Test @@ -120,11 +113,8 @@ public void test_split_sourceData_missing_IEA() throws IOException { .append("GE*1*00") // missing IEA .toString(); - - exception.expect(X12ParserException.class); - exception.expectMessage("expected IEA segment but got ISA"); - - splitter.split(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); + assertTrue(thrown.getMessage().contains("expected IEA segment but got ISA")); } @Test @@ -143,11 +133,8 @@ public void test_split_sourceData_missing_GS() throws IOException { .append("\r\n") .append("IEA*2*000000049") .toString(); - - exception.expect(X12ParserException.class); - exception.expectMessage("expected GS segment but got ST"); - - splitter.split(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); + assertTrue(thrown.getMessage().contains("expected GS segment but got ST")); } @Test @@ -166,11 +153,8 @@ public void test_split_sourceData_missing_GE() throws IOException { //missing GE .append("IEA*2*000000049") .toString(); - - exception.expect(X12ParserException.class); - exception.expectMessage("expected ST segment but got IEA"); - - splitter.split(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); + assertTrue(thrown.getMessage().contains("expected ST segment but got IEA")); } @Test @@ -189,11 +173,8 @@ public void test_split_sourceData_missing_ST() throws IOException { .append("\r\n") .append("IEA*2*000000049") .toString(); - - exception.expect(X12ParserException.class); - exception.expectMessage("expected ST segment but got TEST"); - - splitter.split(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); + assertTrue(thrown.getMessage().contains("expected ST segment but got TEST")); } @Test @@ -212,11 +193,8 @@ public void test_split_sourceData_missing_SE() throws IOException { .append("\r\n") .append("IEA*2*000000049") .toString(); - - exception.expect(X12ParserException.class); - exception.expectMessage("expected SE segment but got IEA"); - - splitter.split(sourceData); + X12ParserException thrown = assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); + assertTrue(thrown.getMessage().contains("expected SE segment but got IEA")); } @Test @@ -362,7 +340,7 @@ public void test_split_sourceData_two_groups_four_documents() throws IOException assertEquals(expectedDocFour, docFour); } - @Test(expected = X12ParserException.class) + @Test public void test_split_sourceData_one_group_one_document_rules_fail() throws IOException { String sourceData = X12DocumentTestData.readFile("src/test/resources/x12.base.one.txt"); @@ -372,8 +350,7 @@ public void test_split_sourceData_one_group_one_document_rules_fail() throws IOE .verify(ArgumentMatchers.anyList()); splitter.registerX12Rule(mockRule); - - splitter.split(sourceData); + assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); } @Test @@ -492,12 +469,7 @@ public void test_split_sourceData_one_group_two_documents_rules_multi_fail() thr splitter.registerX12Rule(mockRuleBoom); splitter.registerX12Rule(mockRuleThree); - try { - splitter.split(sourceData); - fail("expected X12ParserException"); - } catch (X12ParserException e) { - // expected - } + assertThrows(X12ParserException.class, () -> splitter.split(sourceData)); Mockito.verify(mockRuleOne, Mockito.times(1)).verify(ArgumentMatchers.anyList()); Mockito.verify(mockRuleTwo, Mockito.times(1)).verify(ArgumentMatchers.anyList()); diff --git a/src/test/java/sample/parser/X12SampleTest.java b/src/test/java/sample/parser/X12SampleTest.java index e8a64b0..4633a1b 100644 --- a/src/test/java/sample/parser/X12SampleTest.java +++ b/src/test/java/sample/parser/X12SampleTest.java @@ -21,23 +21,23 @@ import com.walmartlabs.x12.X12Validator; import com.walmartlabs.x12.exceptions.X12ErrorDetail; import com.walmartlabs.x12.exceptions.X12ParserException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; public class X12SampleTest { X12Parser x12Parser; X12Validator x12Validator; - @Before + @BeforeEach public void init() { x12Parser = new SampleX12Parser(); x12Validator = new SampleX12Validator(); diff --git a/src/test/java/sample/standard/asn/X12StandardParserWithAsnSampleTest.java b/src/test/java/sample/standard/asn/X12StandardParserWithAsnSampleTest.java index 6187d95..07b6168 100644 --- a/src/test/java/sample/standard/asn/X12StandardParserWithAsnSampleTest.java +++ b/src/test/java/sample/standard/asn/X12StandardParserWithAsnSampleTest.java @@ -34,16 +34,16 @@ import com.walmartlabs.x12.standard.txset.asn856.segment.PRFPurchaseOrderReference; import com.walmartlabs.x12.standard.txset.asn856.segment.SN1ItemDetail; import com.walmartlabs.x12.testing.util.X12DocumentTestData; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import sample.standard.generic.X12StandardParserWithGenericSampleTest; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * this sample shows how to use the {@link StandardX12Parser} @@ -60,7 +60,7 @@ public class X12StandardParserWithAsnSampleTest { StandardX12Parser x12Parser; - @Before + @BeforeEach public void init() { x12Parser = new StandardX12Parser(); x12Parser.registerTransactionSetParser(new DefaultAsn856TransactionSetParser()); diff --git a/src/test/java/sample/standard/generic/X12StandardParserWithGenericSampleTest.java b/src/test/java/sample/standard/generic/X12StandardParserWithGenericSampleTest.java index c117735..5982109 100644 --- a/src/test/java/sample/standard/generic/X12StandardParserWithGenericSampleTest.java +++ b/src/test/java/sample/standard/generic/X12StandardParserWithGenericSampleTest.java @@ -27,15 +27,15 @@ import com.walmartlabs.x12.standard.txset.generic.GenericTransactionSet; import com.walmartlabs.x12.standard.txset.generic.GenericTransactionSetParser; import com.walmartlabs.x12.testing.util.X12DocumentTestData; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * this sample shows how to use the {@link StandardX12Parser} @@ -50,7 +50,7 @@ public class X12StandardParserWithGenericSampleTest { StandardX12Parser x12Parser; - @Before + @BeforeEach public void init() { x12Parser = new StandardX12Parser(); x12Parser.registerTransactionSetParser(new GenericTransactionSetParser());