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/asn/omv2/FIPTicketData.java  | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/org/uic/barcode/ticket/api/asn/omv2/FIPTicketData.java')

diff --git a/src/org/uic/barcode/ticket/api/asn/omv2/FIPTicketData.java b/src/org/uic/barcode/ticket/api/asn/omv2/FIPTicketData.java
index dbf35e2..c6a98e4 100644
--- a/src/org/uic/barcode/ticket/api/asn/omv2/FIPTicketData.java
+++ b/src/org/uic/barcode/ticket/api/asn/omv2/FIPTicketData.java
@@ -29,12 +29,15 @@ import org.uic.barcode.asn1.datatypes.Asn1Default;
 import org.uic.barcode.asn1.datatypes.Asn1Optional;
 import org.uic.barcode.asn1.datatypes.CharacterRestriction;
 import org.uic.barcode.asn1.datatypes.FieldOrder;
+import org.uic.barcode.asn1.datatypes.HasExtensionMarker;
 import org.uic.barcode.asn1.datatypes.IntRange;
 import org.uic.barcode.asn1.datatypes.RestrictedString;
+import org.uic.barcode.asn1.datatypes.Sequence;
 import org.uic.barcode.asn1.datatypesimpl.SequenceOfStringIA5;
-import org.uic.barcode.ticket.api.asn.omv1.SequenceOfActivatedDays;
 import org.uic.barcode.ticket.api.utils.DateTimeUtils;
 
+@Sequence
+@HasExtensionMarker
 public class FIPTicketData extends Object {
 	public FIPTicketData() {
 	}
@@ -256,7 +259,7 @@ public class FIPTicketData extends Object {
 	
 	public Date getValidFromDate(Date issuingDate){
 		
-		return DateTimeUtils.getDate(issuingDate, this.validFromDay,null);
+		return DateTimeUtils.getDate(issuingDate, this.validFromDay,0L);
 		
 	}
 	
@@ -273,7 +276,7 @@ public class FIPTicketData extends Object {
 		}		
 		
 		
-		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, null);
+		return DateTimeUtils.getDate(issuingDate, this.validFromDay + this.validUntilDay, 1439L);
 		
 	}
 	
@@ -305,6 +308,12 @@ public class FIPTicketData extends Object {
 		
 	}
 	
+	/**
+	 * Gets the activated days.
+	 *
+	 * @param issuingDate the issuing date
+	 * @return the activated days
+	 */
 	public Collection<Date> getActivatedDays(Date issuingDate) {
 		
 		if (this.activatedDay == null) return null;
@@ -313,7 +322,7 @@ public class FIPTicketData extends Object {
 		
 		for (Long diff: this.getActivatedDay()) {
 			
-			Date day = DateTimeUtils.getDate(issuingDate, diff, null);
+			Date day = DateTimeUtils.getDate(this.getValidFromDate(issuingDate), diff, null);
 			
 			if (day != null) {
 				dates.add(day);
-- 
cgit v1.2.3