From 425bd35c736b7e1c0dbe5b3f9162e195b3be6018 Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:02:26 +0100 Subject: - bug fix on TicketType Enum - duplicate function getDocument removed - issuedOnLine null value allowed - maven install added (required renaming of some packages) --- .../test/DynamicFrameDoubleSignatureTest.java | 4 +- .../uic/barcode/test/DynamicFrameLOwLevelTest.java | 3 +- .../uic/barcode/test/DynamicFrameSimpleTest.java | 4 +- src/org/uic/barcode/test/SignatureSplitTest.java | 2 +- .../uic/barcode/test/StaticFrameBarcodeTest.java | 4 +- .../barcode/test/StaticFrameBarcodeTestFCB2.java | 4 +- src/org/uic/barcode/test/TicketLayoutTest.java | 2 +- .../barcode/test/utils/Level2TestDataFactory.java | 3 +- .../test/utils/SimpleDynamicFrameTestBarcode.java | 6 +-- .../barcode/test/utils/SimpleTestTicketLayout.java | 2 +- .../barcode/test/utils/SimpleUICTestTicket.java | 48 +++++++++++----------- 11 files changed, 40 insertions(+), 42 deletions(-) (limited to 'src/org/uic/barcode/test') diff --git a/src/org/uic/barcode/test/DynamicFrameDoubleSignatureTest.java b/src/org/uic/barcode/test/DynamicFrameDoubleSignatureTest.java index e072a2a..aa377e8 100644 --- a/src/org/uic/barcode/test/DynamicFrameDoubleSignatureTest.java +++ b/src/org/uic/barcode/test/DynamicFrameDoubleSignatureTest.java @@ -24,9 +24,9 @@ import org.uic.barcode.dynamicFrame.Constants; import org.uic.barcode.dynamicFrame.DataType; import org.uic.barcode.test.utils.Level2TestDataFactory; import org.uic.barcode.test.utils.SimpleUICTestTicket; +import org.uic.barcode.ticket.EncodingFormatException; +import org.uic.barcode.ticket.api.spec.IUicRailTicket; import org.uic.barcode.utils.AlgorithmNameResolver; -import org.uic.ticket.EncodingFormatException; -import org.uic.ticket.api.spec.IUicRailTicket; public class DynamicFrameDoubleSignatureTest { diff --git a/src/org/uic/barcode/test/DynamicFrameLOwLevelTest.java b/src/org/uic/barcode/test/DynamicFrameLOwLevelTest.java index d3148b2..5dd9668 100644 --- a/src/org/uic/barcode/test/DynamicFrameLOwLevelTest.java +++ b/src/org/uic/barcode/test/DynamicFrameLOwLevelTest.java @@ -19,12 +19,11 @@ import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.spec.ECParameterSpec; import org.junit.Before; import org.junit.Test; +import org.uic.barcode.asn1.uper.UperEncoder; import org.uic.barcode.dynamicFrame.Constants; import org.uic.barcode.dynamicFrame.DynamicFrame; import org.uic.barcode.test.utils.SimpleDynamicFrameTestBarcode; -import net.gcdc.asn1.uper.UperEncoder; - public class DynamicFrameLOwLevelTest { public String algorithmOID = Constants.ECDSA_SHA256; diff --git a/src/org/uic/barcode/test/DynamicFrameSimpleTest.java b/src/org/uic/barcode/test/DynamicFrameSimpleTest.java index 4c131cc..a3a1b0e 100644 --- a/src/org/uic/barcode/test/DynamicFrameSimpleTest.java +++ b/src/org/uic/barcode/test/DynamicFrameSimpleTest.java @@ -21,9 +21,9 @@ import org.uic.barcode.Decoder; import org.uic.barcode.Encoder; import org.uic.barcode.dynamicFrame.Constants; import org.uic.barcode.test.utils.SimpleUICTestTicket; +import org.uic.barcode.ticket.EncodingFormatException; +import org.uic.barcode.ticket.api.spec.IUicRailTicket; import org.uic.barcode.utils.AlgorithmNameResolver; -import org.uic.ticket.EncodingFormatException; -import org.uic.ticket.api.spec.IUicRailTicket; public class DynamicFrameSimpleTest { diff --git a/src/org/uic/barcode/test/SignatureSplitTest.java b/src/org/uic/barcode/test/SignatureSplitTest.java index 2e51525..08fe3ad 100644 --- a/src/org/uic/barcode/test/SignatureSplitTest.java +++ b/src/org/uic/barcode/test/SignatureSplitTest.java @@ -8,7 +8,7 @@ import java.math.BigInteger; import org.junit.Test; import org.uic.barcode.staticFrame.StaticFrame; import org.uic.barcode.test.utils.TestUtils; -import org.uic.ticket.EncodingFormatException; +import org.uic.barcode.ticket.EncodingFormatException; public class SignatureSplitTest { diff --git a/src/org/uic/barcode/test/StaticFrameBarcodeTest.java b/src/org/uic/barcode/test/StaticFrameBarcodeTest.java index de1f5b0..9600191 100644 --- a/src/org/uic/barcode/test/StaticFrameBarcodeTest.java +++ b/src/org/uic/barcode/test/StaticFrameBarcodeTest.java @@ -21,8 +21,8 @@ import org.uic.barcode.dynamicFrame.Constants; import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout; import org.uic.barcode.test.utils.SimpleTestTicketLayout; import org.uic.barcode.test.utils.SimpleUICTestTicket; -import org.uic.ticket.EncodingFormatException; -import org.uic.ticket.api.spec.IUicRailTicket; +import org.uic.barcode.ticket.EncodingFormatException; +import org.uic.barcode.ticket.api.spec.IUicRailTicket; /** * The Class StaticFrameBarcodeTest. diff --git a/src/org/uic/barcode/test/StaticFrameBarcodeTestFCB2.java b/src/org/uic/barcode/test/StaticFrameBarcodeTestFCB2.java index 22f7937..048d684 100644 --- a/src/org/uic/barcode/test/StaticFrameBarcodeTestFCB2.java +++ b/src/org/uic/barcode/test/StaticFrameBarcodeTestFCB2.java @@ -21,8 +21,8 @@ import org.uic.barcode.dynamicFrame.Constants; import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout; import org.uic.barcode.test.utils.SimpleTestTicketLayout; import org.uic.barcode.test.utils.SimpleUICTestTicket; -import org.uic.ticket.EncodingFormatException; -import org.uic.ticket.api.spec.IUicRailTicket; +import org.uic.barcode.ticket.EncodingFormatException; +import org.uic.barcode.ticket.api.spec.IUicRailTicket; /** * The Class StaticFrameBarcodeTest. diff --git a/src/org/uic/barcode/test/TicketLayoutTest.java b/src/org/uic/barcode/test/TicketLayoutTest.java index 3cf143e..089c87d 100644 --- a/src/org/uic/barcode/test/TicketLayoutTest.java +++ b/src/org/uic/barcode/test/TicketLayoutTest.java @@ -9,7 +9,7 @@ import org.uic.barcode.staticFrame.UTLAYDataRecord; import org.uic.barcode.staticFrame.ticketLayoutBarcode.TicketLayout; import org.uic.barcode.test.utils.SimpleTestTicketLayout; import org.uic.barcode.test.utils.TestUtils; -import org.uic.ticket.EncodingFormatException; +import org.uic.barcode.ticket.EncodingFormatException; public class TicketLayoutTest { diff --git a/src/org/uic/barcode/test/utils/Level2TestDataFactory.java b/src/org/uic/barcode/test/utils/Level2TestDataFactory.java index a361561..b1eb0f5 100644 --- a/src/org/uic/barcode/test/utils/Level2TestDataFactory.java +++ b/src/org/uic/barcode/test/utils/Level2TestDataFactory.java @@ -1,9 +1,8 @@ package org.uic.barcode.test.utils; +import org.uic.barcode.asn1.datatypesimpl.OctetString; import org.uic.barcode.dynamicFrame.DataType; -import net.gcdc.asn1.datatypesimpl.OctetString; - public class Level2TestDataFactory { public static DataType getLevel2SimpleTestData() { diff --git a/src/org/uic/barcode/test/utils/SimpleDynamicFrameTestBarcode.java b/src/org/uic/barcode/test/utils/SimpleDynamicFrameTestBarcode.java index 1782ca6..af7dcd0 100644 --- a/src/org/uic/barcode/test/utils/SimpleDynamicFrameTestBarcode.java +++ b/src/org/uic/barcode/test/utils/SimpleDynamicFrameTestBarcode.java @@ -8,9 +8,9 @@ import org.uic.barcode.dynamicFrame.DynamicFrame; import org.uic.barcode.dynamicFrame.Level1DataType; import org.uic.barcode.dynamicFrame.Level2DataType; import org.uic.barcode.dynamicFrame.SequenceOfDataType; -import org.uic.ticket.EncodingFormatException; -import org.uic.ticket.api.asn.omv1.UicRailTicketData; -import org.uic.ticket.api.test.SimpleUicTestTicket; +import org.uic.barcode.ticket.EncodingFormatException; +import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData; +import org.uic.barcode.ticket.api.test.SimpleUicTestTicket; public class SimpleDynamicFrameTestBarcode { diff --git a/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java b/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java index ca888e7..b1b6422 100644 --- a/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java +++ b/src/org/uic/barcode/test/utils/SimpleTestTicketLayout.java @@ -17,7 +17,7 @@ public class SimpleTestTicketLayout { element.setLine(1); element.setHeight(1); element.setWidth(20); - element.setText("Müller"); + element.setText("Müller"); layout.addLayoutElement(element); return layout; diff --git a/src/org/uic/barcode/test/utils/SimpleUICTestTicket.java b/src/org/uic/barcode/test/utils/SimpleUICTestTicket.java index 3f38515..be34535 100644 --- a/src/org/uic/barcode/test/utils/SimpleUICTestTicket.java +++ b/src/org/uic/barcode/test/utils/SimpleUICTestTicket.java @@ -4,30 +4,30 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import org.uic.ticket.api.impl.SimpleCardReference; -import org.uic.ticket.api.impl.SimpleControlDetail; -import org.uic.ticket.api.impl.SimpleCustomerStatusDescription; -import org.uic.ticket.api.impl.SimpleExtension; -import org.uic.ticket.api.impl.SimpleIssuingDetail; -import org.uic.ticket.api.impl.SimpleOpenTicket; -import org.uic.ticket.api.impl.SimpleStationPassage; -import org.uic.ticket.api.impl.SimpleTicketLink; -import org.uic.ticket.api.impl.SimpleToken; -import org.uic.ticket.api.impl.SimpleTraveler; -import org.uic.ticket.api.impl.SimpleTravelerDetail; -import org.uic.ticket.api.impl.SimpleUicRailTicket; -import org.uic.ticket.api.spec.ICardReference; -import org.uic.ticket.api.spec.IControlDetail; -import org.uic.ticket.api.spec.ICustomerStatusDescription; -import org.uic.ticket.api.spec.IExtension; -import org.uic.ticket.api.spec.IIssuingDetail; -import org.uic.ticket.api.spec.ILinkMode; -import org.uic.ticket.api.spec.IOpenTicket; -import org.uic.ticket.api.spec.IStationPassage; -import org.uic.ticket.api.spec.ITicketLink; -import org.uic.ticket.api.spec.IToken; -import org.uic.ticket.api.spec.ITraveler; -import org.uic.ticket.api.spec.IUicRailTicket; +import org.uic.barcode.ticket.api.impl.SimpleCardReference; +import org.uic.barcode.ticket.api.impl.SimpleControlDetail; +import org.uic.barcode.ticket.api.impl.SimpleCustomerStatusDescription; +import org.uic.barcode.ticket.api.impl.SimpleExtension; +import org.uic.barcode.ticket.api.impl.SimpleIssuingDetail; +import org.uic.barcode.ticket.api.impl.SimpleOpenTicket; +import org.uic.barcode.ticket.api.impl.SimpleStationPassage; +import org.uic.barcode.ticket.api.impl.SimpleTicketLink; +import org.uic.barcode.ticket.api.impl.SimpleToken; +import org.uic.barcode.ticket.api.impl.SimpleTraveler; +import org.uic.barcode.ticket.api.impl.SimpleTravelerDetail; +import org.uic.barcode.ticket.api.impl.SimpleUicRailTicket; +import org.uic.barcode.ticket.api.spec.ICardReference; +import org.uic.barcode.ticket.api.spec.IControlDetail; +import org.uic.barcode.ticket.api.spec.ICustomerStatusDescription; +import org.uic.barcode.ticket.api.spec.IExtension; +import org.uic.barcode.ticket.api.spec.IIssuingDetail; +import org.uic.barcode.ticket.api.spec.ILinkMode; +import org.uic.barcode.ticket.api.spec.IOpenTicket; +import org.uic.barcode.ticket.api.spec.IStationPassage; +import org.uic.barcode.ticket.api.spec.ITicketLink; +import org.uic.barcode.ticket.api.spec.IToken; +import org.uic.barcode.ticket.api.spec.ITraveler; +import org.uic.barcode.ticket.api.spec.IUicRailTicket; public class SimpleUICTestTicket { -- cgit v1.2.3