From 9f75546ee8fe2ad3ab07fee7bd9503340a5174fe Mon Sep 17 00:00:00 2001 From: CGantert345 <57003061+CGantert345@users.noreply.github.com> Date: Mon, 22 Mar 2021 11:47:46 +0100 Subject: additional tests for time zones fix for fip ticket --- .../uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java | 13 +++++++++---- .../barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java | 15 +++++++++------ .../uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java | 10 ++++++---- .../barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java | 16 ++++++---------- 4 files changed, 30 insertions(+), 24 deletions(-) (limited to 'src/org/uic/barcode/ticket/api/utils') diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java index 5bc419c..d3136e1 100644 --- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java +++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java @@ -881,7 +881,9 @@ public class Api2OpenAsnEncoder { asnData.setTariffs(encodeTariffCollection(document.getTariffs())); - asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) { + asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + } if (document.getClassCode() != ITravelClassType.second){ asnData.setClassCode(convertTravelClass(document.getClassCode())); @@ -1557,8 +1559,9 @@ public class Api2OpenAsnEncoder { } } - - asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) { + asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + } asnData.setClassCode(convertTravelClass(document.getClassCode())); @@ -1691,7 +1694,9 @@ public class Api2OpenAsnEncoder { asnData.setValidityDates(document.getValidFrom(), document.getValidUntil(), issuingDate); - asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) { + asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + } asnData.setExtension(encodeExtension(document.getExtension())); diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java index 48583b9..61bdba1 100644 --- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java +++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoderV2.java @@ -886,8 +886,9 @@ public class Api2OpenAsnEncoderV2 { asnData.setTariffs(encodeTariffCollection(document.getTariffs())); - asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); - + if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) { + asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + } if (document.getClassCode() != ITravelClassType.second && document.getClassCode() != null){ asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name())); } @@ -1562,8 +1563,9 @@ public class Api2OpenAsnEncoderV2 { } } - asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); - + if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) { + asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + } if (document.getClassCode() != null) { asnData.setClassCode(TravelClassType.valueOf(document.getClassCode().name())); } @@ -1697,8 +1699,9 @@ public class Api2OpenAsnEncoderV2 { asnData.setValidityDates(document.getValidFrom(), document.getValidUntil(), issuingDate); - asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); - + if (document.getActivatedDays() != null && !document.getActivatedDays().isEmpty()) { + asnData.addActivatedDays(DateTimeUtils.getActivatedDays(document.getValidFrom(), document.getActivatedDays())); + } asnData.setExtension(encodeExtension(document.getExtension())); return asnDocument; diff --git a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java index 46d2c1b..d203487 100644 --- a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java +++ b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoder.java @@ -1593,9 +1593,9 @@ public class OpenAsn2ApiDecoder { document.setProductOwner(UicEncoderUtils.mapToString(asnDocument.getProductOwnerNum(),asnDocument.getProductOwnerIA5())); document.setReference(UicEncoderUtils.mapToString(asnDocument.getReferenceNum(),asnDocument.getReferenceIA5())); - if (asnDocument.getActivatedDay()!=null && !asnDocument.getActivatedDay().isEmpty()) { - document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); - } + if (asnDocument.getActivatedDay() != null && !asnDocument.getActivatedDay().isEmpty()) { + document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); + } if(asnDocument.getIncludesSupplements()!=null) { document.setIncludesSupplements(asnDocument.getIncludesSupplements()); @@ -1632,7 +1632,9 @@ public class OpenAsn2ApiDecoder { document.setValidUntil(asnDocument.getValidUntilDate(issuingDate)); document.setValidUntilUTCoffset(asnDocument.getValidUntilUTCOffset()); - document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); + if (asnDocument.getActivatedDay() != null && !asnDocument.getActivatedDay().isEmpty()) { + document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); + } document.setExtension(convertExtension(asnDocument.getExtension())); document.setInfoText(asnDocument.getInfoText()); diff --git a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java index c6eac0e..b8ee363 100644 --- a/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java +++ b/src/org/uic/barcode/ticket/api/utils/OpenAsn2ApiDecoderV2.java @@ -1621,9 +1621,9 @@ public class OpenAsn2ApiDecoderV2 { document.setProductOwner(UicEncoderUtils.mapToString(asnDocument.getProductOwnerNum(),asnDocument.getProductOwnerIA5())); document.setReference(UicEncoderUtils.mapToString(asnDocument.getReferenceNum(),asnDocument.getReferenceIA5())); - if (asnDocument.getActivatedDay()!=null && !asnDocument.getActivatedDay().isEmpty()) { - document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); - } + if (asnDocument.getActivatedDay() != null && !asnDocument.getActivatedDay().isEmpty()) { + document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); + } if(asnDocument.getIncludesSupplements()!=null) { document.setIncludesSupplements(asnDocument.getIncludesSupplements()); @@ -1660,13 +1660,9 @@ public class OpenAsn2ApiDecoderV2 { document.setValidUntil(asnDocument.getValidUntilDate(issuingDate)); document.setValidUntilUTCoffset(asnDocument.getValidUntilUTCOffset()); - if (asnDocument.getActivatedDay()!=null && !asnDocument.getActivatedDay().isEmpty()) { - if (document.getValidFrom() != null) { - document.getActivatedDays().addAll(asnDocument.getActivatedDays(document.getValidFrom())); - } else { - document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); - } - } + if (asnDocument.getActivatedDay() != null && !asnDocument.getActivatedDay().isEmpty()) { + document.getActivatedDays().addAll(asnDocument.getActivatedDays(issuingDate)); + } document.setExtension(convertExtension(asnDocument.getExtension())); document.setInfoText(asnDocument.getInfoText()); -- cgit v1.2.3