17 files changed, 2207 insertions, 32 deletions

diff --git a/src/org/uic/barcode/ticket/api/asn/omv1/CustomerCardData.java b/src/org/uic/barcode/ticket/api/asn/omv1/CustomerCardData.java
index d0c5710..d67f857 100644
--- a/src/org/uic/barcode/ticket/api/asn/omv1/CustomerCardData.java
+++ b/src/org/uic/barcode/ticket/api/asn/omv1/CustomerCardData.java
@@ -21,7 +21,6 @@ package org.uic.barcode.ticket.api.asn.omv1;
 

 import java.util.Calendar;

 import java.util.Date;

-import java.util.TimeZone;

 

 import org.uic.barcode.asn1.datatypes.Asn1BigInteger;

 import org.uic.barcode.asn1.datatypes.Asn1Optional;

@@ -252,7 +251,6 @@ public class CustomerCardData extends Object {
 		untilCal.setTime(untilDate);

 			

 		int untildays = untilCal.get(Calendar.DAY_OF_YEAR);

-		

 		int yearDiff = untilCal.get(Calendar.YEAR) - fromCal.get(Calendar.YEAR);

 		

 		this.validUntilYear = new Long( yearDiff);

@@ -262,14 +260,15 @@ public class CustomerCardData extends Object {
 	

 	public Date getValidFromDate (){

 		

-		if (this.validFromYear == null || this.validFromYear == 0) return null;

+		if (this.validFromYear == null || this.validFromDay == null) return null;

 			

 			Calendar cal = Calendar.getInstance();

 			cal.clear();

-			cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+			//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 			cal.set(Calendar.YEAR, this.validFromYear.intValue());

 			cal.set(Calendar.DAY_OF_YEAR, this.validFromDay.intValue());

-

+			cal.set(Calendar.MINUTE,0);

+			cal.set(Calendar.HOUR_OF_DAY,0);

 			return cal.getTime();

 			

 	}

@@ -277,17 +276,18 @@ public class CustomerCardData extends Object {
 	

 	public Date getValidUntilDate (){

 		

-		if (this.validUntilYear == null || this.validUntilYear == 0) return null;

+		if (this.validUntilYear == null || this.validUntilDay == null) return null;

 			

 			Calendar cal = Calendar.getInstance();

 			cal.clear();

-			cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+			//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 			cal.set(Calendar.YEAR, this.validFromYear.intValue());

 			if (this.validUntilYear != null) {

 				cal.add(Calendar.YEAR, this.validUntilYear.intValue());

 			}

 			cal.set(Calendar.DAY_OF_YEAR, this.validUntilDay.intValue());

-

+			cal.set(Calendar.MINUTE,59);

+			cal.set(Calendar.HOUR_OF_DAY,23);

 			return cal.getTime();

 		

 		}

diff --git a/src/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java b/src/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java
index 8119502..8142ee1 100644
--- a/src/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java
+++ b/src/org/uic/barcode/ticket/api/asn/omv1/ParkingGroundData.java
@@ -47,7 +47,7 @@ public class ParkingGroundData extends Object {
 

 	@FieldOrder(order = 2)

 	@RestrictedString(CharacterRestriction.IA5String)

-	public String parkingGroundId;

+	public String parkingGroundId = "";

 

 	@FieldOrder(order = 3)

 	@IntRange(minValue=0,maxValue=370)

@@ -335,7 +335,7 @@ public class ParkingGroundData extends Object {
 	

 	public Date getFromParkingDate(Date issuingDate){

 		

-		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate, null);

+		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate, 0L);

 		

 	}

 

@@ -343,7 +343,7 @@ public class ParkingGroundData extends Object {
 		

 		if ( this.toParkingDate == null) return null;

 		

-		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate + this.toParkingDate, null);

+		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate + this.toParkingDate, 1439L);

 		

 	}

 

diff --git a/src/org/uic/barcode/ticket/api/asn/omv1/VoucherData.java b/src/org/uic/barcode/ticket/api/asn/omv1/VoucherData.java
index f721201..ab9eaea 100644
--- a/src/org/uic/barcode/ticket/api/asn/omv1/VoucherData.java
+++ b/src/org/uic/barcode/ticket/api/asn/omv1/VoucherData.java
@@ -21,7 +21,6 @@ package org.uic.barcode.ticket.api.asn.omv1;
 

 import java.util.Calendar;

 import java.util.Date;

-import java.util.TimeZone;

 

 import org.uic.barcode.asn1.datatypes.Asn1BigInteger;

 import org.uic.barcode.asn1.datatypes.Asn1Optional;

@@ -287,9 +286,11 @@ public class VoucherData extends Object {
 		

 		Calendar cal = Calendar.getInstance();

 		cal.clear();

-		cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+		//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 		cal.set(Calendar.YEAR, this.validFromYear.intValue());

 		cal.set(Calendar.DAY_OF_YEAR, this.validFromDay.intValue());

+		cal.set(Calendar.MINUTE,0);

+		cal.set(Calendar.HOUR_OF_DAY,0);

 

 		return cal.getTime();

 		

@@ -301,9 +302,11 @@ public class VoucherData extends Object {
 		

 		Calendar cal = Calendar.getInstance();

 		cal.clear();

-		cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+		//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 		cal.set(Calendar.YEAR, this.validUntilYear.intValue());

 		cal.set(Calendar.DAY_OF_YEAR, this.validUntilDay.intValue());

+		cal.set(Calendar.MINUTE,59);

+		cal.set(Calendar.HOUR_OF_DAY,23);

 

 		return cal.getTime();

 		

diff --git a/src/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java b/src/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java
index 4302f44..6ea31c1 100644
--- a/src/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java
+++ b/src/org/uic/barcode/ticket/api/asn/omv2/CustomerCardData.java
@@ -262,14 +262,15 @@ public class CustomerCardData extends Object {
 	

 	public Date getValidFromDate (){

 		

-		if (this.validFromYear == null || this.validFromYear == 0) return null;

+		if (this.validFromYear == null || this.validFromDay == null) return null;

 			

 			Calendar cal = Calendar.getInstance();

 			cal.clear();

-			cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+			//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 			cal.set(Calendar.YEAR, this.validFromYear.intValue());

 			cal.set(Calendar.DAY_OF_YEAR, this.validFromDay.intValue());

-

+			cal.set(Calendar.MINUTE,0);

+			cal.set(Calendar.HOUR_OF_DAY,0);

 			return cal.getTime();

 			

 	}

@@ -277,17 +278,18 @@ public class CustomerCardData extends Object {
 	

 	public Date getValidUntilDate (){

 		

-		if (this.validUntilYear == null || this.validUntilYear == 0) return null;

+		if (this.validUntilYear == null || this.validUntilDay == null) return null;

 			

 			Calendar cal = Calendar.getInstance();

 			cal.clear();

-			cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+			//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 			cal.set(Calendar.YEAR, this.validFromYear.intValue());

 			if (this.validUntilYear != null) {

 				cal.add(Calendar.YEAR, this.validUntilYear.intValue());

 			}

 			cal.set(Calendar.DAY_OF_YEAR, this.validUntilDay.intValue());

-

+			cal.set(Calendar.MINUTE,59);

+			cal.set(Calendar.HOUR_OF_DAY,23);

 			return cal.getTime();

 		

 		}

diff --git a/src/org/uic/barcode/ticket/api/asn/omv2/ParkingGroundData.java b/src/org/uic/barcode/ticket/api/asn/omv2/ParkingGroundData.java
index 4f6f6d8..0eec185 100644
--- a/src/org/uic/barcode/ticket/api/asn/omv2/ParkingGroundData.java
+++ b/src/org/uic/barcode/ticket/api/asn/omv2/ParkingGroundData.java
@@ -47,7 +47,7 @@ public class ParkingGroundData extends Object {
 

 	@FieldOrder(order = 2)

 	@RestrictedString(CharacterRestriction.IA5String)

-	public String parkingGroundId;

+	public String parkingGroundId = "";

 

 	@FieldOrder(order = 3)

 	@IntRange(minValue=0,maxValue=370)

@@ -335,7 +335,7 @@ public class ParkingGroundData extends Object {
 	

 	public Date getFromParkingDate(Date issuingDate){

 		

-		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate, null);

+		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate, 0L);

 		

 	}

 

@@ -343,7 +343,7 @@ public class ParkingGroundData extends Object {
 		

 		if ( this.toParkingDate == null) return null;

 		

-		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate + this.toParkingDate, null);

+		return DateTimeUtils.getDate(issuingDate, this.fromParkingDate + this.toParkingDate, 1439L);

 		

 	}

 

diff --git a/src/org/uic/barcode/ticket/api/asn/omv2/VoucherData.java b/src/org/uic/barcode/ticket/api/asn/omv2/VoucherData.java
index 458b040..1395976 100644
--- a/src/org/uic/barcode/ticket/api/asn/omv2/VoucherData.java
+++ b/src/org/uic/barcode/ticket/api/asn/omv2/VoucherData.java
@@ -21,7 +21,6 @@ package org.uic.barcode.ticket.api.asn.omv2;
 

 import java.util.Calendar;

 import java.util.Date;

-import java.util.TimeZone;

 

 import org.uic.barcode.asn1.datatypes.Asn1BigInteger;

 import org.uic.barcode.asn1.datatypes.Asn1Optional;

@@ -287,9 +286,11 @@ public class VoucherData extends Object {
 		

 		Calendar cal = Calendar.getInstance();

 		cal.clear();

-		cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+		//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 		cal.set(Calendar.YEAR, this.validFromYear.intValue());

 		cal.set(Calendar.DAY_OF_YEAR, this.validFromDay.intValue());

+		cal.set(Calendar.MINUTE,0);

+		cal.set(Calendar.HOUR_OF_DAY,0);

 

 		return cal.getTime();

 		

@@ -301,9 +302,11 @@ public class VoucherData extends Object {
 		

 		Calendar cal = Calendar.getInstance();

 		cal.clear();

-		cal.setTimeZone(TimeZone.getTimeZone("UTC"));

+		//cal.setTimeZone(TimeZone.getTimeZone("UTC"));

 		cal.set(Calendar.YEAR, this.validUntilYear.intValue());

 		cal.set(Calendar.DAY_OF_YEAR, this.validUntilDay.intValue());

+		cal.set(Calendar.MINUTE,59);

+		cal.set(Calendar.HOUR_OF_DAY,23);

 

 		return cal.getTime();

 		

diff --git a/src/org/uic/barcode/ticket/api/test/CustomerCardTimeZoneTestV1.java b/src/org/uic/barcode/ticket/api/test/CustomerCardTimeZoneTestV1.java
new file mode 100644
index 0000000..315774e
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/CustomerCardTimeZoneTestV1.java
@@ -0,0 +1,312 @@
+package org.uic.barcode.ticket.api.test;

+

+import java.io.IOException;

+import java.text.DateFormat;

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.TimeZone;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+import org.uic.barcode.asn1.uper.UperEncoder;

+import org.uic.barcode.ticket.EncodingFormatException;

+import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData;

+import org.uic.barcode.ticket.api.spec.ICustomerCard;

+import org.uic.barcode.ticket.api.spec.IUicRailTicket;

+import org.uic.barcode.ticket.api.test.testtickets.CustomerCardTestTicketV1;

+import org.uic.barcode.ticket.api.utils.Api2OpenAsnEncoder;

+import org.uic.barcode.ticket.api.utils.OpenAsn2ApiDecoder;

+

+

+/**

+ * The Class CustomerCardTestV1.

+ * 

+ * 

+ * 

+ */

+public class CustomerCardTimeZoneTestV1 {

+	

+	/** The low level encoded test ticket test case 1 . */

+	private byte[] encoded1 = null;

+	

+	/** The low level encoded test ticket test case 2 . */

+	private byte[] encoded2 = null;

+	

+	/** The low level encoded test ticket test case 3 . */

+	private byte[] encoded3 = null;

+    

+    /** The decoder. */

+    OpenAsn2ApiDecoder decoder = new OpenAsn2ApiDecoder();

+    

+    /** The encoder. */

+    Api2OpenAsnEncoder encoder = new Api2OpenAsnEncoder();

+    

+    /** The API ticket low level encoded for case 1. */

+    IUicRailTicket iTicketDecodedFromAsn1Case1 = null;

+    

+    /** The API ticket low level encoded for case 2. */

+    IUicRailTicket iTicketDecodedFromAsn1Case2 = null;

+    

+    /** The API ticket low level encoded for case 3. */

+    IUicRailTicket iTicketDecodedFromAsn1Case3 = null;

+    

+    

+    /** The ticket decoded 1. */

+    IUicRailTicket iTicketDecodedCase1 = null;

+    

+    /** The i ticket decoded 2. */

+    IUicRailTicket iTicketDecodedCase2 = null;

+    

+    /** The i ticket decoded 3. */

+    IUicRailTicket iTicketDecodedCase3 = null;

+    

+    byte[] encodedInTimeZone1 = null;

+    byte[] encodedInTimeZone2 = null;

+    byte[] encodedInTimeZone3 = null;    

+    

+    String issuingDate1 = null;

+    String issuingDate2 = null;

+    String issuingDate3 = null;

+    

+    String validFromDate1 = null;

+    String validFromDate2 = null;

+    String validFromDate3 = null;

+    

+    String validUntilDate1 = null;

+    String validUntilDate2 = null;

+    String validUntilDate3 = null;

+    

+    TimeZone defaulttimeZone = null;

+    

+	/**

+	 * Prepare tickets.

+	 */

+	@Before public void prepare() {

+		

+		defaulttimeZone = TimeZone.getDefault();

+		

+    	UicRailTicketData ticket1 =  CustomerCardTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket2 =  CustomerCardTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket3 =  CustomerCardTestTicketV1.getUicTestTicket();

+    	

+    	//encode in UTC time zone

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+    	

+        encoded1 = UperEncoder.encode(ticket1);

+        encoded2 = UperEncoder.encode(ticket2);

+        encoded3 = UperEncoder.encode(ticket3);

+		

+	}

+	

+	/**

+	 * clean up

+	 */

+	@After public void resetTimeZone() {

+		TimeZone.setDefault(defaulttimeZone);

+	}

+	

+    

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone CET

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+			

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+		

+		encode("CET");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 CET 2022" )); 

+        

+        

+    }    

+		

+

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testGMTCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+				

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2021.03.24-23:59");

+			

+		encode("GMT");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+         

+    }    

+	

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETGMTencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+			

+		encode("CET");	

+		decode("GMT");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 12:30:00 GMT 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 00:30:00 GMT 2021" ));

+        assert(issuingDate3.equals("Wed Mar 03 23:30:00 GMT 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 GMT 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 GMT 2022" )); 

+        

+        

+    }    

+

+	private void decodedDateToStrings() {

+

+        issuingDate1 = iTicketDecodedCase1.getIssuerDetails().getIssuingDate().toString();

+        issuingDate2 = iTicketDecodedCase2.getIssuerDetails().getIssuingDate().toString();

+        issuingDate3 = iTicketDecodedCase3.getIssuerDetails().getIssuingDate().toString();

+  

+        validFromDate1 = ((ICustomerCard) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate2 = ((ICustomerCard) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate3 = ((ICustomerCard) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidFrom().toString();

+

+        validUntilDate1 = ((ICustomerCard) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate2 = ((ICustomerCard) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate3 = ((ICustomerCard) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidUntil().toString();

+

+        

+ 	}

+

+	

+	private void setValidFromDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((ICustomerCard) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidFrom(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidFrom(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidFrom(date);			

+	}

+

+	private void setValidUntilDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((ICustomerCard) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidUntil(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidUntil(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidUntil(date);

+	}

+

+

+	/**

+	 * Encode in Time Zone

+	 */

+	private void encode(String timeZone) {

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+        try {

+        	encodedInTimeZone1 = encoder.encode(iTicketDecodedFromAsn1Case1);

+        	encodedInTimeZone2 = encoder.encode(iTicketDecodedFromAsn1Case2);

+        	encodedInTimeZone3 = encoder.encode(iTicketDecodedFromAsn1Case3);

+		} catch (EncodingFormatException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	/**

+	 * Decode in Time Zone

+	 */

+	private void decode(String timeZone) {	

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+	

+        try {

+        	iTicketDecodedCase1 = decoder.decodeFromAsn(encodedInTimeZone1);

+        	iTicketDecodedCase2 = decoder.decodeFromAsn(encodedInTimeZone2);

+        	iTicketDecodedCase3 = decoder.decodeFromAsn(encodedInTimeZone3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		} 

+	}

+	

+	

+	/**

+	 * Encode decode.

+	 */

+	private void decodeTestTicketUTC() {

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+		try {

+			iTicketDecodedFromAsn1Case1 = decoder.decodeFromAsn(encoded1);

+			iTicketDecodedFromAsn1Case2 = decoder.decodeFromAsn(encoded2);

+			iTicketDecodedFromAsn1Case3 = decoder.decodeFromAsn(encoded3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		}

+		

+	}

+

+}

diff --git a/src/org/uic/barcode/ticket/api/test/CustomerCardTimeZoneTestV2.java b/src/org/uic/barcode/ticket/api/test/CustomerCardTimeZoneTestV2.java
new file mode 100644
index 0000000..e8857ab
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/CustomerCardTimeZoneTestV2.java
@@ -0,0 +1,312 @@
+package org.uic.barcode.ticket.api.test;

+

+import java.io.IOException;

+import java.text.DateFormat;

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.TimeZone;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+import org.uic.barcode.asn1.uper.UperEncoder;

+import org.uic.barcode.ticket.EncodingFormatException;

+import org.uic.barcode.ticket.api.asn.omv2.UicRailTicketData;

+import org.uic.barcode.ticket.api.spec.ICustomerCard;

+import org.uic.barcode.ticket.api.spec.IUicRailTicket;

+import org.uic.barcode.ticket.api.test.testtickets.CustomerCardTestTicketV2;

+import org.uic.barcode.ticket.api.utils.Api2OpenAsnEncoderV2;

+import org.uic.barcode.ticket.api.utils.OpenAsn2ApiDecoderV2;

+

+

+/**

+ * The Class CustomerCardTestV1.

+ * 

+ * 

+ * 

+ */

+public class CustomerCardTimeZoneTestV2 {

+	

+	/** The low level encoded test ticket test case 1 . */

+	private byte[] encoded1 = null;

+	

+	/** The low level encoded test ticket test case 2 . */

+	private byte[] encoded2 = null;

+	

+	/** The low level encoded test ticket test case 3 . */

+	private byte[] encoded3 = null;

+    

+    /** The decoder. */

+    OpenAsn2ApiDecoderV2 decoder = new OpenAsn2ApiDecoderV2();

+    

+    /** The encoder. */

+    Api2OpenAsnEncoderV2 encoder = new Api2OpenAsnEncoderV2();

+    

+    /** The API ticket low level encoded for case 1. */

+    IUicRailTicket iTicketDecodedFromAsn1Case1 = null;

+    

+    /** The API ticket low level encoded for case 2. */

+    IUicRailTicket iTicketDecodedFromAsn1Case2 = null;

+    

+    /** The API ticket low level encoded for case 3. */

+    IUicRailTicket iTicketDecodedFromAsn1Case3 = null;

+    

+    

+    /** The ticket decoded 1. */

+    IUicRailTicket iTicketDecodedCase1 = null;

+    

+    /** The i ticket decoded 2. */

+    IUicRailTicket iTicketDecodedCase2 = null;

+    

+    /** The i ticket decoded 3. */

+    IUicRailTicket iTicketDecodedCase3 = null;

+    

+    byte[] encodedInTimeZone1 = null;

+    byte[] encodedInTimeZone2 = null;

+    byte[] encodedInTimeZone3 = null;    

+    

+    String issuingDate1 = null;

+    String issuingDate2 = null;

+    String issuingDate3 = null;

+    

+    String validFromDate1 = null;

+    String validFromDate2 = null;

+    String validFromDate3 = null;

+    

+    String validUntilDate1 = null;

+    String validUntilDate2 = null;

+    String validUntilDate3 = null;

+    

+    TimeZone defaulttimeZone = null;

+    

+	/**

+	 * Prepare tickets.

+	 */

+	@Before public void prepare() {

+		

+		defaulttimeZone = TimeZone.getDefault();

+		

+    	UicRailTicketData ticket1 =  CustomerCardTestTicketV2.getUicTestTicket();

+    	UicRailTicketData ticket2 =  CustomerCardTestTicketV2.getUicTestTicket();

+    	UicRailTicketData ticket3 =  CustomerCardTestTicketV2.getUicTestTicket();

+    	

+    	//encode in UTC time zone

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+    	

+        encoded1 = UperEncoder.encode(ticket1);

+        encoded2 = UperEncoder.encode(ticket2);

+        encoded3 = UperEncoder.encode(ticket3);

+		

+	}

+	

+	/**

+	 * clean up

+	 */

+	@After public void resetTimeZone() {

+		TimeZone.setDefault(defaulttimeZone);

+	}

+	

+    

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone CET

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+			

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+		

+		encode("CET");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 CET 2022" )); 

+        

+        

+    }    

+		

+

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testGMTCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+				

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2021.03.24-23:59");

+			

+		encode("GMT");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+         

+    }    

+	

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETGMTencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+			

+		encode("CET");	

+		decode("GMT");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 12:30:00 GMT 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 00:30:00 GMT 2021" ));

+        assert(issuingDate3.equals("Wed Mar 03 23:30:00 GMT 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 GMT 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 GMT 2022" )); 

+        

+        

+    }    

+

+	private void decodedDateToStrings() {

+

+        issuingDate1 = iTicketDecodedCase1.getIssuerDetails().getIssuingDate().toString();

+        issuingDate2 = iTicketDecodedCase2.getIssuerDetails().getIssuingDate().toString();

+        issuingDate3 = iTicketDecodedCase3.getIssuerDetails().getIssuingDate().toString();

+  

+        validFromDate1 = ((ICustomerCard) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate2 = ((ICustomerCard) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate3 = ((ICustomerCard) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidFrom().toString();

+

+        validUntilDate1 = ((ICustomerCard) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate2 = ((ICustomerCard) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate3 = ((ICustomerCard) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidUntil().toString();

+

+        

+ 	}

+

+	

+	private void setValidFromDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((ICustomerCard) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidFrom(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidFrom(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidFrom(date);			

+	}

+

+	private void setValidUntilDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((ICustomerCard) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidUntil(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidUntil(date);

+		((ICustomerCard) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidUntil(date);

+	}

+

+

+	/**

+	 * Encode in Time Zone

+	 */

+	private void encode(String timeZone) {

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+        try {

+        	encodedInTimeZone1 = encoder.encode(iTicketDecodedFromAsn1Case1);

+        	encodedInTimeZone2 = encoder.encode(iTicketDecodedFromAsn1Case2);

+        	encodedInTimeZone3 = encoder.encode(iTicketDecodedFromAsn1Case3);

+		} catch (EncodingFormatException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	/**

+	 * Decode in Time Zone

+	 */

+	private void decode(String timeZone) {	

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+	

+        try {

+        	iTicketDecodedCase1 = decoder.decodeFromAsn(encodedInTimeZone1);

+        	iTicketDecodedCase2 = decoder.decodeFromAsn(encodedInTimeZone2);

+        	iTicketDecodedCase3 = decoder.decodeFromAsn(encodedInTimeZone3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		} 

+	}

+	

+	

+	/**

+	 * Encode decode.

+	 */

+	private void decodeTestTicketUTC() {

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+		try {

+			iTicketDecodedFromAsn1Case1 = decoder.decodeFromAsn(encoded1);

+			iTicketDecodedFromAsn1Case2 = decoder.decodeFromAsn(encoded2);

+			iTicketDecodedFromAsn1Case3 = decoder.decodeFromAsn(encoded3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		}

+		

+	}

+

+}

diff --git a/src/org/uic/barcode/ticket/api/test/ParkingTimeZoneTestV1.java b/src/org/uic/barcode/ticket/api/test/ParkingTimeZoneTestV1.java
new file mode 100644
index 0000000..0cda25e
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/ParkingTimeZoneTestV1.java
@@ -0,0 +1,312 @@
+package org.uic.barcode.ticket.api.test;

+

+import java.io.IOException;

+import java.text.DateFormat;

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.TimeZone;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+import org.uic.barcode.asn1.uper.UperEncoder;

+import org.uic.barcode.ticket.EncodingFormatException;

+import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData;

+import org.uic.barcode.ticket.api.spec.IParkingGround;

+import org.uic.barcode.ticket.api.spec.IUicRailTicket;

+import org.uic.barcode.ticket.api.test.testtickets.ParkingTestTicketV1;

+import org.uic.barcode.ticket.api.utils.Api2OpenAsnEncoder;

+import org.uic.barcode.ticket.api.utils.OpenAsn2ApiDecoder;

+

+

+/**

+ * The Class ParkingTestV1.

+ * 

+ * 

+ * 

+ */

+public class ParkingTimeZoneTestV1 {

+	

+	/** The low level encoded test ticket test case 1 . */

+	private byte[] encoded1 = null;

+	

+	/** The low level encoded test ticket test case 2 . */

+	private byte[] encoded2 = null;

+	

+	/** The low level encoded test ticket test case 3 . */

+	private byte[] encoded3 = null;

+    

+    /** The decoder. */

+    OpenAsn2ApiDecoder decoder = new OpenAsn2ApiDecoder();

+    

+    /** The encoder. */

+    Api2OpenAsnEncoder encoder = new Api2OpenAsnEncoder();

+    

+    /** The API ticket low level encoded for case 1. */

+    IUicRailTicket iTicketDecodedFromAsn1Case1 = null;

+    

+    /** The API ticket low level encoded for case 2. */

+    IUicRailTicket iTicketDecodedFromAsn1Case2 = null;

+    

+    /** The API ticket low level encoded for case 3. */

+    IUicRailTicket iTicketDecodedFromAsn1Case3 = null;

+    

+    

+    /** The ticket decoded 1. */

+    IUicRailTicket iTicketDecodedCase1 = null;

+    

+    /** The i ticket decoded 2. */

+    IUicRailTicket iTicketDecodedCase2 = null;

+    

+    /** The i ticket decoded 3. */

+    IUicRailTicket iTicketDecodedCase3 = null;

+    

+    byte[] encodedInTimeZone1 = null;

+    byte[] encodedInTimeZone2 = null;

+    byte[] encodedInTimeZone3 = null;    

+    

+    String issuingDate1 = null;

+    String issuingDate2 = null;

+    String issuingDate3 = null;

+    

+    String FromParkingDateDate1 = null;

+    String FromParkingDateDate2 = null;

+    String FromParkingDateDate3 = null;

+    

+    String ToParkingDateDate1 = null;

+    String ToParkingDateDate2 = null;

+    String ToParkingDateDate3 = null;

+    

+    TimeZone defaulttimeZone = null;

+    

+	/**

+	 * Prepare tickets.

+	 */

+	@Before public void prepare() {

+		

+		defaulttimeZone = TimeZone.getDefault();

+		

+    	UicRailTicketData ticket1 =  ParkingTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket2 =  ParkingTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket3 =  ParkingTestTicketV1.getUicTestTicket();

+    	

+    	//encode in UTC time zone

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+    	

+        encoded1 = UperEncoder.encode(ticket1);

+        encoded2 = UperEncoder.encode(ticket2);

+        encoded3 = UperEncoder.encode(ticket3);

+		

+	}

+	

+	/**

+	 * clean up

+	 */

+	@After public void resetTimeZone() {

+		TimeZone.setDefault(defaulttimeZone);

+	}

+	

+    

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone CET

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+			

+		setFromParkingDateDateTo("2021.03.14-00:00");

+		setToParkingDateDateTo("2021.03.24-23:59");

+		

+		encode("CET");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(FromParkingDateDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(ToParkingDateDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+        

+    }    

+		

+

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testGMTCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+				

+		setFromParkingDateDateTo("2021.03.14-00:00");

+		setToParkingDateDateTo("2021.03.24-23:59");

+			

+		encode("GMT");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(FromParkingDateDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(ToParkingDateDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+         

+    }    

+	

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETGMTencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+

+		setFromParkingDateDateTo("2021.03.14-00:00");

+		setToParkingDateDateTo("2021.03.24-23:59");

+			

+		encode("CET");	

+		decode("GMT");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 12:30:00 GMT 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 00:30:00 GMT 2021" ));

+        assert(issuingDate3.equals("Wed Mar 03 23:30:00 GMT 2021" ));        

+       

+        assert(FromParkingDateDate1.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(FromParkingDateDate2.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(FromParkingDateDate3.equals("Sun Mar 14 00:00:00 GMT 2021" )); 

+        

+        assert(ToParkingDateDate1.equals("Wed Mar 24 23:59:00 GMT 2021" ));

+        assert(ToParkingDateDate2.equals("Wed Mar 24 23:59:00 GMT 2021" ));

+        assert(ToParkingDateDate3.equals("Wed Mar 24 23:59:00 GMT 2021" )); 

+        

+        

+    }    

+

+	private void decodedDateToStrings() {

+

+        issuingDate1 = iTicketDecodedCase1.getIssuerDetails().getIssuingDate().toString();

+        issuingDate2 = iTicketDecodedCase2.getIssuerDetails().getIssuingDate().toString();

+        issuingDate3 = iTicketDecodedCase3.getIssuerDetails().getIssuingDate().toString();

+  

+        FromParkingDateDate1 = ((IParkingGround) iTicketDecodedCase1.getDocumentData().iterator().next()).getFromParkingDate().toString();

+        FromParkingDateDate2 = ((IParkingGround) iTicketDecodedCase2.getDocumentData().iterator().next()).getFromParkingDate().toString();

+        FromParkingDateDate3 = ((IParkingGround) iTicketDecodedCase3.getDocumentData().iterator().next()).getFromParkingDate().toString();

+

+        ToParkingDateDate1 = ((IParkingGround) iTicketDecodedCase1.getDocumentData().iterator().next()).getToParkingDate().toString();

+        ToParkingDateDate2 = ((IParkingGround) iTicketDecodedCase2.getDocumentData().iterator().next()).getToParkingDate().toString();

+        ToParkingDateDate3 = ((IParkingGround) iTicketDecodedCase3.getDocumentData().iterator().next()).getToParkingDate().toString();

+

+        

+ 	}

+

+	

+	private void setFromParkingDateDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IParkingGround) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setFromParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setFromParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setFromParkingDate(date);			

+	}

+

+	private void setToParkingDateDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IParkingGround) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setToParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setToParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setToParkingDate(date);

+	}

+

+

+	/**

+	 * Encode in Time Zone

+	 */

+	private void encode(String timeZone) {

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+        try {

+        	encodedInTimeZone1 = encoder.encode(iTicketDecodedFromAsn1Case1);

+        	encodedInTimeZone2 = encoder.encode(iTicketDecodedFromAsn1Case2);

+        	encodedInTimeZone3 = encoder.encode(iTicketDecodedFromAsn1Case3);

+		} catch (EncodingFormatException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	/**

+	 * Decode in Time Zone

+	 */

+	private void decode(String timeZone) {	

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+	

+        try {

+        	iTicketDecodedCase1 = decoder.decodeFromAsn(encodedInTimeZone1);

+        	iTicketDecodedCase2 = decoder.decodeFromAsn(encodedInTimeZone2);

+        	iTicketDecodedCase3 = decoder.decodeFromAsn(encodedInTimeZone3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		} 

+	}

+	

+	

+	/**

+	 * Encode decode.

+	 */

+	private void decodeTestTicketUTC() {

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+		try {

+			iTicketDecodedFromAsn1Case1 = decoder.decodeFromAsn(encoded1);

+			iTicketDecodedFromAsn1Case2 = decoder.decodeFromAsn(encoded2);

+			iTicketDecodedFromAsn1Case3 = decoder.decodeFromAsn(encoded3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		}

+		

+	}

+

+}

diff --git a/src/org/uic/barcode/ticket/api/test/ParkingTimeZoneTestV2.java b/src/org/uic/barcode/ticket/api/test/ParkingTimeZoneTestV2.java
new file mode 100644
index 0000000..3833034
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/ParkingTimeZoneTestV2.java
@@ -0,0 +1,312 @@
+package org.uic.barcode.ticket.api.test;

+

+import java.io.IOException;

+import java.text.DateFormat;

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.TimeZone;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+import org.uic.barcode.asn1.uper.UperEncoder;

+import org.uic.barcode.ticket.EncodingFormatException;

+import org.uic.barcode.ticket.api.asn.omv2.UicRailTicketData;

+import org.uic.barcode.ticket.api.spec.IParkingGround;

+import org.uic.barcode.ticket.api.spec.IUicRailTicket;

+import org.uic.barcode.ticket.api.test.testtickets.ParkingTestTicketV2;

+import org.uic.barcode.ticket.api.utils.Api2OpenAsnEncoderV2;

+import org.uic.barcode.ticket.api.utils.OpenAsn2ApiDecoderV2;

+

+

+/**

+ * The Class ParkingTestV2.

+ * 

+ * 

+ * 

+ */

+public class ParkingTimeZoneTestV2 {

+	

+	/** The low level encoded test ticket test case 1 . */

+	private byte[] encoded1 = null;

+	

+	/** The low level encoded test ticket test case 2 . */

+	private byte[] encoded2 = null;

+	

+	/** The low level encoded test ticket test case 3 . */

+	private byte[] encoded3 = null;

+    

+    /** The decoder. */

+    OpenAsn2ApiDecoderV2 decoder = new OpenAsn2ApiDecoderV2();

+    

+    /** The encoder. */

+    Api2OpenAsnEncoderV2 encoder = new Api2OpenAsnEncoderV2();

+    

+    /** The API ticket low level encoded for case 1. */

+    IUicRailTicket iTicketDecodedFromAsn1Case1 = null;

+    

+    /** The API ticket low level encoded for case 2. */

+    IUicRailTicket iTicketDecodedFromAsn1Case2 = null;

+    

+    /** The API ticket low level encoded for case 3. */

+    IUicRailTicket iTicketDecodedFromAsn1Case3 = null;

+    

+    

+    /** The ticket decoded 1. */

+    IUicRailTicket iTicketDecodedCase1 = null;

+    

+    /** The i ticket decoded 2. */

+    IUicRailTicket iTicketDecodedCase2 = null;

+    

+    /** The i ticket decoded 3. */

+    IUicRailTicket iTicketDecodedCase3 = null;

+    

+    byte[] encodedInTimeZone1 = null;

+    byte[] encodedInTimeZone2 = null;

+    byte[] encodedInTimeZone3 = null;    

+    

+    String issuingDate1 = null;

+    String issuingDate2 = null;

+    String issuingDate3 = null;

+    

+    String FromParkingDateDate1 = null;

+    String FromParkingDateDate2 = null;

+    String FromParkingDateDate3 = null;

+    

+    String ToParkingDateDate1 = null;

+    String ToParkingDateDate2 = null;

+    String ToParkingDateDate3 = null;

+    

+    TimeZone defaulttimeZone = null;

+    

+	/**

+	 * Prepare tickets.

+	 */

+	@Before public void prepare() {

+		

+		defaulttimeZone = TimeZone.getDefault();

+		

+    	UicRailTicketData ticket1 =  ParkingTestTicketV2.getUicTestTicket();

+    	UicRailTicketData ticket2 =  ParkingTestTicketV2.getUicTestTicket();

+    	UicRailTicketData ticket3 =  ParkingTestTicketV2.getUicTestTicket();

+    	

+    	//encode in UTC time zone

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+    	

+        encoded1 = UperEncoder.encode(ticket1);

+        encoded2 = UperEncoder.encode(ticket2);

+        encoded3 = UperEncoder.encode(ticket3);

+		

+	}

+	

+	/**

+	 * clean up

+	 */

+	@After public void resetTimeZone() {

+		TimeZone.setDefault(defaulttimeZone);

+	}

+	

+    

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone CET

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+			

+		setFromParkingDateDateTo("2021.03.14-00:00");

+		setToParkingDateDateTo("2021.03.24-23:59");

+		

+		encode("CET");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(FromParkingDateDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(ToParkingDateDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+        

+    }    

+		

+

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testGMTCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+				

+		setFromParkingDateDateTo("2021.03.14-00:00");

+		setToParkingDateDateTo("2021.03.24-23:59");

+			

+		encode("GMT");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(FromParkingDateDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(FromParkingDateDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(ToParkingDateDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(ToParkingDateDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+         

+    }    

+	

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETGMTencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+

+		setFromParkingDateDateTo("2021.03.14-00:00");

+		setToParkingDateDateTo("2021.03.24-23:59");

+			

+		encode("CET");	

+		decode("GMT");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 12:30:00 GMT 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 00:30:00 GMT 2021" ));

+        assert(issuingDate3.equals("Wed Mar 03 23:30:00 GMT 2021" ));        

+       

+        assert(FromParkingDateDate1.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(FromParkingDateDate2.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(FromParkingDateDate3.equals("Sun Mar 14 00:00:00 GMT 2021" )); 

+        

+        assert(ToParkingDateDate1.equals("Wed Mar 24 23:59:00 GMT 2021" ));

+        assert(ToParkingDateDate2.equals("Wed Mar 24 23:59:00 GMT 2021" ));

+        assert(ToParkingDateDate3.equals("Wed Mar 24 23:59:00 GMT 2021" )); 

+        

+        

+    }    

+

+	private void decodedDateToStrings() {

+

+        issuingDate1 = iTicketDecodedCase1.getIssuerDetails().getIssuingDate().toString();

+        issuingDate2 = iTicketDecodedCase2.getIssuerDetails().getIssuingDate().toString();

+        issuingDate3 = iTicketDecodedCase3.getIssuerDetails().getIssuingDate().toString();

+  

+        FromParkingDateDate1 = ((IParkingGround) iTicketDecodedCase1.getDocumentData().iterator().next()).getFromParkingDate().toString();

+        FromParkingDateDate2 = ((IParkingGround) iTicketDecodedCase2.getDocumentData().iterator().next()).getFromParkingDate().toString();

+        FromParkingDateDate3 = ((IParkingGround) iTicketDecodedCase3.getDocumentData().iterator().next()).getFromParkingDate().toString();

+

+        ToParkingDateDate1 = ((IParkingGround) iTicketDecodedCase1.getDocumentData().iterator().next()).getToParkingDate().toString();

+        ToParkingDateDate2 = ((IParkingGround) iTicketDecodedCase2.getDocumentData().iterator().next()).getToParkingDate().toString();

+        ToParkingDateDate3 = ((IParkingGround) iTicketDecodedCase3.getDocumentData().iterator().next()).getToParkingDate().toString();

+

+        

+ 	}

+

+	

+	private void setFromParkingDateDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IParkingGround) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setFromParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setFromParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setFromParkingDate(date);			

+	}

+

+	private void setToParkingDateDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IParkingGround) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setToParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setToParkingDate(date);

+		((IParkingGround) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setToParkingDate(date);

+	}

+

+

+	/**

+	 * Encode in Time Zone

+	 */

+	private void encode(String timeZone) {

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+        try {

+        	encodedInTimeZone1 = encoder.encode(iTicketDecodedFromAsn1Case1);

+        	encodedInTimeZone2 = encoder.encode(iTicketDecodedFromAsn1Case2);

+        	encodedInTimeZone3 = encoder.encode(iTicketDecodedFromAsn1Case3);

+		} catch (EncodingFormatException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	/**

+	 * Decode in Time Zone

+	 */

+	private void decode(String timeZone) {	

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+	

+        try {

+        	iTicketDecodedCase1 = decoder.decodeFromAsn(encodedInTimeZone1);

+        	iTicketDecodedCase2 = decoder.decodeFromAsn(encodedInTimeZone2);

+        	iTicketDecodedCase3 = decoder.decodeFromAsn(encodedInTimeZone3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		} 

+	}

+	

+	

+	/**

+	 * Encode decode.

+	 */

+	private void decodeTestTicketUTC() {

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+		try {

+			iTicketDecodedFromAsn1Case1 = decoder.decodeFromAsn(encoded1);

+			iTicketDecodedFromAsn1Case2 = decoder.decodeFromAsn(encoded2);

+			iTicketDecodedFromAsn1Case3 = decoder.decodeFromAsn(encoded3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		}

+		

+	}

+

+}

diff --git a/src/org/uic/barcode/ticket/api/test/VoucherTimeZoneTestV1.java b/src/org/uic/barcode/ticket/api/test/VoucherTimeZoneTestV1.java
new file mode 100644
index 0000000..423908b
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/VoucherTimeZoneTestV1.java
@@ -0,0 +1,312 @@
+package org.uic.barcode.ticket.api.test;

+

+import java.io.IOException;

+import java.text.DateFormat;

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.TimeZone;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+import org.uic.barcode.asn1.uper.UperEncoder;

+import org.uic.barcode.ticket.EncodingFormatException;

+import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData;

+import org.uic.barcode.ticket.api.spec.IVoucher;

+import org.uic.barcode.ticket.api.spec.IUicRailTicket;

+import org.uic.barcode.ticket.api.test.testtickets.VoucherTestTicketV1;

+import org.uic.barcode.ticket.api.utils.Api2OpenAsnEncoder;

+import org.uic.barcode.ticket.api.utils.OpenAsn2ApiDecoder;

+

+

+/**

+ * The Class VoucherTestV1.

+ * 

+ * 

+ * 

+ */

+public class VoucherTimeZoneTestV1 {

+	

+	/** The low level encoded test ticket test case 1 . */

+	private byte[] encoded1 = null;

+	

+	/** The low level encoded test ticket test case 2 . */

+	private byte[] encoded2 = null;

+	

+	/** The low level encoded test ticket test case 3 . */

+	private byte[] encoded3 = null;

+    

+    /** The decoder. */

+    OpenAsn2ApiDecoder decoder = new OpenAsn2ApiDecoder();

+    

+    /** The encoder. */

+    Api2OpenAsnEncoder encoder = new Api2OpenAsnEncoder();

+    

+    /** The API ticket low level encoded for case 1. */

+    IUicRailTicket iTicketDecodedFromAsn1Case1 = null;

+    

+    /** The API ticket low level encoded for case 2. */

+    IUicRailTicket iTicketDecodedFromAsn1Case2 = null;

+    

+    /** The API ticket low level encoded for case 3. */

+    IUicRailTicket iTicketDecodedFromAsn1Case3 = null;

+    

+    

+    /** The ticket decoded 1. */

+    IUicRailTicket iTicketDecodedCase1 = null;

+    

+    /** The i ticket decoded 2. */

+    IUicRailTicket iTicketDecodedCase2 = null;

+    

+    /** The i ticket decoded 3. */

+    IUicRailTicket iTicketDecodedCase3 = null;

+    

+    byte[] encodedInTimeZone1 = null;

+    byte[] encodedInTimeZone2 = null;

+    byte[] encodedInTimeZone3 = null;    

+    

+    String issuingDate1 = null;

+    String issuingDate2 = null;

+    String issuingDate3 = null;

+    

+    String validFromDate1 = null;

+    String validFromDate2 = null;

+    String validFromDate3 = null;

+    

+    String validUntilDate1 = null;

+    String validUntilDate2 = null;

+    String validUntilDate3 = null;

+    

+    TimeZone defaulttimeZone = null;

+    

+	/**

+	 * Prepare tickets.

+	 */

+	@Before public void prepare() {

+		

+		defaulttimeZone = TimeZone.getDefault();

+		

+    	UicRailTicketData ticket1 =  VoucherTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket2 =  VoucherTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket3 =  VoucherTestTicketV1.getUicTestTicket();

+    	

+    	//encode in UTC time zone

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+    	

+        encoded1 = UperEncoder.encode(ticket1);

+        encoded2 = UperEncoder.encode(ticket2);

+        encoded3 = UperEncoder.encode(ticket3);

+		

+	}

+	

+	/**

+	 * clean up

+	 */

+	@After public void resetTimeZone() {

+		TimeZone.setDefault(defaulttimeZone);

+	}

+	

+    

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone CET

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+			

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+		

+		encode("CET");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 CET 2022" )); 

+        

+        

+    }    

+		

+

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testGMTCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+				

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2021.03.24-23:59");

+			

+		encode("GMT");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+         

+    }    

+	

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETGMTencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+			

+		encode("CET");	

+		decode("GMT");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 12:30:00 GMT 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 00:30:00 GMT 2021" ));

+        assert(issuingDate3.equals("Wed Mar 03 23:30:00 GMT 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 GMT 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 GMT 2022" )); 

+        

+        

+    }    

+

+	private void decodedDateToStrings() {

+

+        issuingDate1 = iTicketDecodedCase1.getIssuerDetails().getIssuingDate().toString();

+        issuingDate2 = iTicketDecodedCase2.getIssuerDetails().getIssuingDate().toString();

+        issuingDate3 = iTicketDecodedCase3.getIssuerDetails().getIssuingDate().toString();

+  

+        validFromDate1 = ((IVoucher) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate2 = ((IVoucher) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate3 = ((IVoucher) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidFrom().toString();

+

+        validUntilDate1 = ((IVoucher) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate2 = ((IVoucher) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate3 = ((IVoucher) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidUntil().toString();

+

+        

+ 	}

+

+	

+	private void setValidFromDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IVoucher) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidFrom(date);

+		((IVoucher) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidFrom(date);

+		((IVoucher) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidFrom(date);			

+	}

+

+	private void setValidUntilDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IVoucher) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidUntil(date);

+		((IVoucher) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidUntil(date);

+		((IVoucher) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidUntil(date);

+	}

+

+

+	/**

+	 * Encode in Time Zone

+	 */

+	private void encode(String timeZone) {

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+        try {

+        	encodedInTimeZone1 = encoder.encode(iTicketDecodedFromAsn1Case1);

+        	encodedInTimeZone2 = encoder.encode(iTicketDecodedFromAsn1Case2);

+        	encodedInTimeZone3 = encoder.encode(iTicketDecodedFromAsn1Case3);

+		} catch (EncodingFormatException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	/**

+	 * Decode in Time Zone

+	 */

+	private void decode(String timeZone) {	

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+	

+        try {

+        	iTicketDecodedCase1 = decoder.decodeFromAsn(encodedInTimeZone1);

+        	iTicketDecodedCase2 = decoder.decodeFromAsn(encodedInTimeZone2);

+        	iTicketDecodedCase3 = decoder.decodeFromAsn(encodedInTimeZone3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		} 

+	}

+	

+	

+	/**

+	 * Encode decode.

+	 */

+	private void decodeTestTicketUTC() {

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+		try {

+			iTicketDecodedFromAsn1Case1 = decoder.decodeFromAsn(encoded1);

+			iTicketDecodedFromAsn1Case2 = decoder.decodeFromAsn(encoded2);

+			iTicketDecodedFromAsn1Case3 = decoder.decodeFromAsn(encoded3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		}

+		

+	}

+

+}

diff --git a/src/org/uic/barcode/ticket/api/test/VoucherTimeZoneTestV2.java b/src/org/uic/barcode/ticket/api/test/VoucherTimeZoneTestV2.java
new file mode 100644
index 0000000..53dc248
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/VoucherTimeZoneTestV2.java
@@ -0,0 +1,312 @@
+package org.uic.barcode.ticket.api.test;

+

+import java.io.IOException;

+import java.text.DateFormat;

+import java.text.ParseException;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.TimeZone;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+import org.uic.barcode.asn1.uper.UperEncoder;

+import org.uic.barcode.ticket.EncodingFormatException;

+import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData;

+import org.uic.barcode.ticket.api.spec.IVoucher;

+import org.uic.barcode.ticket.api.spec.IUicRailTicket;

+import org.uic.barcode.ticket.api.test.testtickets.VoucherTestTicketV1;

+import org.uic.barcode.ticket.api.utils.Api2OpenAsnEncoder;

+import org.uic.barcode.ticket.api.utils.OpenAsn2ApiDecoder;

+

+

+/**

+ * The Class VoucherTestV1.

+ * 

+ * 

+ * 

+ */

+public class VoucherTimeZoneTestV2 {

+	

+	/** The low level encoded test ticket test case 1 . */

+	private byte[] encoded1 = null;

+	

+	/** The low level encoded test ticket test case 2 . */

+	private byte[] encoded2 = null;

+	

+	/** The low level encoded test ticket test case 3 . */

+	private byte[] encoded3 = null;

+    

+    /** The decoder. */

+    OpenAsn2ApiDecoder decoder = new OpenAsn2ApiDecoder();

+    

+    /** The encoder. */

+    Api2OpenAsnEncoder encoder = new Api2OpenAsnEncoder();

+    

+    /** The API ticket low level encoded for case 1. */

+    IUicRailTicket iTicketDecodedFromAsn1Case1 = null;

+    

+    /** The API ticket low level encoded for case 2. */

+    IUicRailTicket iTicketDecodedFromAsn1Case2 = null;

+    

+    /** The API ticket low level encoded for case 3. */

+    IUicRailTicket iTicketDecodedFromAsn1Case3 = null;

+    

+    

+    /** The ticket decoded 1. */

+    IUicRailTicket iTicketDecodedCase1 = null;

+    

+    /** The i ticket decoded 2. */

+    IUicRailTicket iTicketDecodedCase2 = null;

+    

+    /** The i ticket decoded 3. */

+    IUicRailTicket iTicketDecodedCase3 = null;

+    

+    byte[] encodedInTimeZone1 = null;

+    byte[] encodedInTimeZone2 = null;

+    byte[] encodedInTimeZone3 = null;    

+    

+    String issuingDate1 = null;

+    String issuingDate2 = null;

+    String issuingDate3 = null;

+    

+    String validFromDate1 = null;

+    String validFromDate2 = null;

+    String validFromDate3 = null;

+    

+    String validUntilDate1 = null;

+    String validUntilDate2 = null;

+    String validUntilDate3 = null;

+    

+    TimeZone defaulttimeZone = null;

+    

+	/**

+	 * Prepare tickets.

+	 */

+	@Before public void prepare() {

+		

+		defaulttimeZone = TimeZone.getDefault();

+		

+    	UicRailTicketData ticket1 =  VoucherTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket2 =  VoucherTestTicketV1.getUicTestTicket();

+    	UicRailTicketData ticket3 =  VoucherTestTicketV1.getUicTestTicket();

+    	

+    	//encode in UTC time zone

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+    	

+        encoded1 = UperEncoder.encode(ticket1);

+        encoded2 = UperEncoder.encode(ticket2);

+        encoded3 = UperEncoder.encode(ticket3);

+		

+	}

+	

+	/**

+	 * clean up

+	 */

+	@After public void resetTimeZone() {

+		TimeZone.setDefault(defaulttimeZone);

+	}

+	

+    

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone CET

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+			

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+		

+		encode("CET");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 CET 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 CET 2022" )); 

+        

+        

+    }    

+		

+

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testGMTCETencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("GMT"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+				

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2021.03.24-23:59");

+			

+		encode("GMT");	

+		decode("CET");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 13:30:00 CET 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 01:30:00 CET 2021" ));

+        assert(issuingDate3.equals("Thu Mar 04 00:30:00 CET 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 CET 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 CET 2021" )); 

+        

+        assert(validUntilDate1.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate2.equals("Wed Mar 24 23:59:00 CET 2021" ));

+        assert(validUntilDate3.equals("Wed Mar 24 23:59:00 CET 2021" )); 

+        

+         

+    }    

+	

+	/**

+	 * Test encode test tickets in UTC and decode in CET.

+	 *

+	 * @throws IllegalArgumentException the illegal argument exception

+	 * @throws IllegalAccessException the illegal access exception

+	 * @throws ParseException 

+	 */

+	@Test public void testCETGMTencoding() throws IllegalArgumentException, IllegalAccessException, ParseException {

+		

+		//get tickets

+		decodeTestTicketUTC();

+		

+		//set the dates in the time zone GMT

+		TimeZone.setDefault(TimeZone.getTimeZone("CET"));

+		iTicketDecodedFromAsn1Case1.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" ));

+		iTicketDecodedFromAsn1Case2.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-00:30" ));

+		iTicketDecodedFromAsn1Case3.getIssuerDetails().setIssuingDate(new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.03-23:30" ));

+

+		setValidFromDateTo("2021.03.14-00:00");

+		setValidUntilDateTo("2022.03.24-23:59");

+			

+		encode("CET");	

+		decode("GMT");

+        decodedDateToStrings();

+        

+        assert(issuingDate1.equals("Thu Mar 04 12:30:00 GMT 2021" ));

+        assert(issuingDate2.equals("Thu Mar 04 00:30:00 GMT 2021" ));

+        assert(issuingDate3.equals("Wed Mar 03 23:30:00 GMT 2021" ));        

+       

+        assert(validFromDate1.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate2.equals("Sun Mar 14 00:00:00 GMT 2021" ));

+        assert(validFromDate3.equals("Sun Mar 14 00:00:00 GMT 2021" )); 

+        

+        assert(validUntilDate1.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate2.equals("Thu Mar 24 23:59:00 GMT 2022" ));

+        assert(validUntilDate3.equals("Thu Mar 24 23:59:00 GMT 2022" )); 

+        

+        

+    }    

+

+	private void decodedDateToStrings() {

+

+        issuingDate1 = iTicketDecodedCase1.getIssuerDetails().getIssuingDate().toString();

+        issuingDate2 = iTicketDecodedCase2.getIssuerDetails().getIssuingDate().toString();

+        issuingDate3 = iTicketDecodedCase3.getIssuerDetails().getIssuingDate().toString();

+  

+        validFromDate1 = ((IVoucher) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate2 = ((IVoucher) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidFrom().toString();

+        validFromDate3 = ((IVoucher) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidFrom().toString();

+

+        validUntilDate1 = ((IVoucher) iTicketDecodedCase1.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate2 = ((IVoucher) iTicketDecodedCase2.getDocumentData().iterator().next()).getValidUntil().toString();

+        validUntilDate3 = ((IVoucher) iTicketDecodedCase3.getDocumentData().iterator().next()).getValidUntil().toString();

+

+        

+ 	}

+

+	

+	private void setValidFromDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IVoucher) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidFrom(date);

+		((IVoucher) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidFrom(date);

+		((IVoucher) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidFrom(date);			

+	}

+

+	private void setValidUntilDateTo(String dateString) throws ParseException {

+	    DateFormat dateFormat = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" );

+	    Date date = dateFormat.parse(dateString);

+		((IVoucher) iTicketDecodedFromAsn1Case1.getDocumentData().iterator().next()).setValidUntil(date);

+		((IVoucher) iTicketDecodedFromAsn1Case2.getDocumentData().iterator().next()).setValidUntil(date);

+		((IVoucher) iTicketDecodedFromAsn1Case3.getDocumentData().iterator().next()).setValidUntil(date);

+	}

+

+

+	/**

+	 * Encode in Time Zone

+	 */

+	private void encode(String timeZone) {

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+        try {

+        	encodedInTimeZone1 = encoder.encode(iTicketDecodedFromAsn1Case1);

+        	encodedInTimeZone2 = encoder.encode(iTicketDecodedFromAsn1Case2);

+        	encodedInTimeZone3 = encoder.encode(iTicketDecodedFromAsn1Case3);

+		} catch (EncodingFormatException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	/**

+	 * Decode in Time Zone

+	 */

+	private void decode(String timeZone) {	

+		TimeZone.setDefault(TimeZone.getTimeZone(timeZone));

+	

+        try {

+        	iTicketDecodedCase1 = decoder.decodeFromAsn(encodedInTimeZone1);

+        	iTicketDecodedCase2 = decoder.decodeFromAsn(encodedInTimeZone2);

+        	iTicketDecodedCase3 = decoder.decodeFromAsn(encodedInTimeZone3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		} 

+	}

+	

+	

+	/**

+	 * Encode decode.

+	 */

+	private void decodeTestTicketUTC() {

+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));

+		try {

+			iTicketDecodedFromAsn1Case1 = decoder.decodeFromAsn(encoded1);

+			iTicketDecodedFromAsn1Case2 = decoder.decodeFromAsn(encoded2);

+			iTicketDecodedFromAsn1Case3 = decoder.decodeFromAsn(encoded3);

+		} catch (IOException e) {

+			e.printStackTrace();

+		}

+		

+	}

+

+}

diff --git a/src/org/uic/barcode/ticket/api/test/testtickets/ParkingTestTicketV3.java b/src/org/uic/barcode/ticket/api/test/testtickets/ParkingTestTicketV1.java
index 2cce30b..ad70424 100644
--- a/src/org/uic/barcode/ticket/api/test/testtickets/ParkingTestTicketV3.java
+++ b/src/org/uic/barcode/ticket/api/test/testtickets/ParkingTestTicketV1.java
@@ -17,7 +17,7 @@ import org.uic.barcode.ticket.api.asn.omv1.TravelerData;
 import org.uic.barcode.ticket.api.asn.omv1.TravelerType;

 import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData;

 

-	public class ParkingTestTicketV3 {

+	public class ParkingTestTicketV1 {

 		

 		public static UicRailTicketData getUicTestTicket() {

 			UicRailTicketData ticket = new UicRailTicketData();

@@ -81,6 +81,7 @@ import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData;
 	    	ticket.setNumberPlate("AA-DE-12345");

 	    	ticket.setStationNum(8000001L);

 	    	ticket.setPrice(500L);

+	    	ticket.setParkingGroundId("P47623");

 	    	ticket.setSpecialInformation("outdoor parking");

 

 	    	tdd.setParkingGround(ticket);

diff --git a/src/org/uic/barcode/ticket/api/test/testtickets/ParkingTestTicketV2.java b/src/org/uic/barcode/ticket/api/test/testtickets/ParkingTestTicketV2.java
new file mode 100644
index 0000000..99d9711
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/testtickets/ParkingTestTicketV2.java
@@ -0,0 +1,147 @@
+package org.uic.barcode.ticket.api.test.testtickets;

+

+import org.uic.barcode.ticket.api.asn.omv2.CardReferenceType;

+import org.uic.barcode.ticket.api.asn.omv2.ControlData;

+import org.uic.barcode.ticket.api.asn.omv2.CustomerStatusType;

+import org.uic.barcode.ticket.api.asn.omv2.DocumentData;

+import org.uic.barcode.ticket.api.asn.omv2.ExtensionData;

+import org.uic.barcode.ticket.api.asn.omv2.IssuingData;

+import org.uic.barcode.ticket.api.asn.omv2.ParkingGroundData;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfCardReferenceType;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfCustomerStatusType;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfDocumentData;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfExtensionData;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfTravelerType;

+import org.uic.barcode.ticket.api.asn.omv2.TicketDetailData;

+import org.uic.barcode.ticket.api.asn.omv2.TravelerData;

+import org.uic.barcode.ticket.api.asn.omv2.TravelerType;

+import org.uic.barcode.ticket.api.asn.omv2.UicRailTicketData;

+

+	public class ParkingTestTicketV2 {

+		

+		public static UicRailTicketData getUicTestTicket() {

+			UicRailTicketData ticket = new UicRailTicketData();

+	    	populateTicket(ticket);

+			return ticket;

+		}

+		

+		

+		

+	    private static void populateTicket(UicRailTicketData ticket) {

+	    	

+	    	ticket.setControlDetail(new ControlData());

+	    	populate(ticket.getControlDetail());

+	    	

+	     	

+	    	ticket.setIssuingDetail(new IssuingData());

+	    	populateIssuingData(ticket.getIssuingDetail());

+	    	

+	    	TravelerData td = new TravelerData();

+	    	populateTravelerData(td);

+	    	ticket.setTravelerDetail(td);    	

+	    	

+	    	SequenceOfDocumentData ds = new SequenceOfDocumentData();

+

+	    	

+	    	//FipTicket

+	    	DocumentData do1 = new DocumentData();

+	    	addTicket(do1);    	

+	    	ds.add(do1);   	    	

+	    	 	    	

+	    	

+	    	ticket.setTransportDocument(ds);

+	    	

+	       	SequenceOfExtensionData ed = new SequenceOfExtensionData();

+	    	populateExtensionSequence(ed);

+	    	ticket.setExtension(ed);

+	    	

+		}

+	    

+

+	    //issue date: 04-03-2021 12:30 UTC

+	    private static void populateIssuingData(IssuingData issuingDetail) {

+	    	issuingDetail.setIssuingYear(2021L);

+	    	issuingDetail.setIssuingTime(750L);

+	    	issuingDetail.setIssuingDay(63L);

+	    	issuingDetail.setIssuerPNR("issuerTestPNR");

+	    	issuingDetail.setSpecimen(true);

+	    	issuingDetail.setSecurePaperTicket(false);

+	    	issuingDetail.setActivated(true);

+	    	issuingDetail.setIssuedOnLine(12L);	

+		}

+	    

+		private static void addTicket(DocumentData dd) {		

+			

+	    	TicketDetailData tdd = new TicketDetailData();

+	    	ParkingGroundData ticket = new ParkingGroundData(); 

+	    	ticket.setFromParkingDate(01L);	    	

+	    	ticket.setToParkingDate(01L);

+	    	ticket.setReferenceIA5("ACHE12345");

+	    	ticket.setLocation("Parking Frankfurt Main West");

+	    	ticket.setNumberPlate("AA-DE-12345");

+	    	ticket.setStationNum(8000001L);

+	    	ticket.setPrice(500L);

+	    	ticket.setParkingGroundId("P47623");

+	    	ticket.setSpecialInformation("outdoor parking");

+

+	    	tdd.setParkingGround(ticket);

+	    	dd.setTicket(tdd);

+		}

+

+

+	    

+	    private static void populateTravelerData(TravelerData td) {

+	    	SequenceOfTravelerType trs = new SequenceOfTravelerType();

+	    	TravelerType tr = new TravelerType();

+	    	tr.setIdCard("12345");

+	    	tr.setFirstName("John");

+	    	tr.setSecondName("Dow");

+	    	tr.setTicketHolder(true);

+	    	SequenceOfCustomerStatusType ts = new SequenceOfCustomerStatusType();  	

+	    	CustomerStatusType cst = new CustomerStatusType();

+	    	cst.setCustomerStatusDescr("employee");

+	    	ts.add(cst);

+	    	tr.setStatus(ts);

+	    	trs.add(tr);

+	    	td.setTraveler(trs);

+		}

+

+	    

+

+

+

+	    private static void populateExtensionSequence(SequenceOfExtensionData ed) {

+	       	ExtensionData ed1 = new ExtensionData();

+	    	ed1.setExtensionId("1");

+	    	byte[] ba1 = { (byte) 0x82, (byte) 0xDA };

+	    	ed1.setExtensionData(ba1); 	

+	    	ExtensionData ed2 = new ExtensionData();    	

+	    	ed2.setExtensionId("2");

+	    	byte[] ba2 = { (byte) 0x83, (byte) 0xDA };

+	    	ed2.setExtensionData(ba2);     	

+	    	ed.add(ed1);

+	    	ed.add(ed2);

+		}

+

+		private static void populate(ControlData controlDetail) {

+			controlDetail.infoText = "cd";

+			controlDetail.setAgeCheckRequired(false);

+			controlDetail.setIdentificationByIdCard(false);

+			controlDetail.setIdentificationByPassportId(false);

+			controlDetail.setOnlineValidationRequired(false);

+			controlDetail.setPassportValidationRequired(false);

+			controlDetail.setReductionCardCheckRequired(false);

+			controlDetail.setIdentificationByCardReference(new SequenceOfCardReferenceType());

+			controlDetail.getIdentificationByCardReference().add(populateCardRefrence());

+		}

+

+

+		private static CardReferenceType populateCardRefrence() {

+			CardReferenceType cr = new CardReferenceType();

+			cr.setTrailingCardIdNum(100L);

+			return cr;

+		}

+

+

+

+	}

diff --git a/src/org/uic/barcode/ticket/api/test/testtickets/VoucherTestTicketV3.java b/src/org/uic/barcode/ticket/api/test/testtickets/VoucherTestTicketV1.java
index 24b73d1..b3c2a76 100644
--- a/src/org/uic/barcode/ticket/api/test/testtickets/VoucherTestTicketV3.java
+++ b/src/org/uic/barcode/ticket/api/test/testtickets/VoucherTestTicketV1.java
@@ -17,7 +17,7 @@ import org.uic.barcode.ticket.api.asn.omv1.TravelerType;
 import org.uic.barcode.ticket.api.asn.omv1.UicRailTicketData;

 import org.uic.barcode.ticket.api.asn.omv1.VoucherData;

 

-	public class VoucherTestTicketV3 {

+	public class VoucherTestTicketV1 {

 		

 		public static UicRailTicketData getUicTestTicket() {

 			UicRailTicketData ticket = new UicRailTicketData();

diff --git a/src/org/uic/barcode/ticket/api/test/testtickets/VoucherTestTicketV2.java b/src/org/uic/barcode/ticket/api/test/testtickets/VoucherTestTicketV2.java
new file mode 100644
index 0000000..e7844d6
--- /dev/null
+++ b/src/org/uic/barcode/ticket/api/test/testtickets/VoucherTestTicketV2.java
@@ -0,0 +1,145 @@
+package org.uic.barcode.ticket.api.test.testtickets;

+

+import org.uic.barcode.ticket.api.asn.omv2.CardReferenceType;

+import org.uic.barcode.ticket.api.asn.omv2.ControlData;

+import org.uic.barcode.ticket.api.asn.omv2.CustomerStatusType;

+import org.uic.barcode.ticket.api.asn.omv2.DocumentData;

+import org.uic.barcode.ticket.api.asn.omv2.ExtensionData;

+import org.uic.barcode.ticket.api.asn.omv2.IssuingData;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfCardReferenceType;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfCustomerStatusType;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfDocumentData;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfExtensionData;

+import org.uic.barcode.ticket.api.asn.omv2.SequenceOfTravelerType;

+import org.uic.barcode.ticket.api.asn.omv2.TicketDetailData;

+import org.uic.barcode.ticket.api.asn.omv2.TravelerData;

+import org.uic.barcode.ticket.api.asn.omv2.TravelerType;

+import org.uic.barcode.ticket.api.asn.omv2.UicRailTicketData;

+import org.uic.barcode.ticket.api.asn.omv2.VoucherData;

+

+	public class VoucherTestTicketV2 {

+		

+		public static UicRailTicketData getUicTestTicket() {

+			UicRailTicketData ticket = new UicRailTicketData();

+	    	populateTicket(ticket);

+			return ticket;

+		}

+		

+		

+		

+	    private static void populateTicket(UicRailTicketData ticket) {

+	    	

+	    	ticket.setControlDetail(new ControlData());

+	    	populate(ticket.getControlDetail());

+	    	

+	     	

+	    	ticket.setIssuingDetail(new IssuingData());

+	    	populateIssuingData(ticket.getIssuingDetail());

+	    	

+	    	TravelerData td = new TravelerData();

+	    	populateTravelerData(td);

+	    	ticket.setTravelerDetail(td);    	

+	    	

+	    	SequenceOfDocumentData ds = new SequenceOfDocumentData();

+

+	    	

+	    	//FipTicket

+	    	DocumentData do1 = new DocumentData();

+	    	addTicket(do1);    	

+	    	ds.add(do1);   	    	

+	    	 	    	

+	    	

+	    	ticket.setTransportDocument(ds);

+	    	

+	       	SequenceOfExtensionData ed = new SequenceOfExtensionData();

+	    	populateExtensionSequence(ed);

+	    	ticket.setExtension(ed);

+	    	

+		}

+	    

+

+	    //issue date: 04-03-2021 12:30 UTC

+	    private static void populateIssuingData(IssuingData issuingDetail) {

+	    	issuingDetail.setIssuingYear(2021L);

+	    	issuingDetail.setIssuingTime(750L);

+	    	issuingDetail.setIssuingDay(63L);

+	    	issuingDetail.setIssuerPNR("issuerTestPNR");

+	    	issuingDetail.setSpecimen(true);

+	    	issuingDetail.setSecurePaperTicket(false);

+	    	issuingDetail.setActivated(true);

+	    	issuingDetail.setIssuedOnLine(12L);	

+		}

+	    

+		private static void addTicket(DocumentData dd) {		

+			

+	    	TicketDetailData tdd = new TicketDetailData();

+	    	VoucherData ticket = new VoucherData();  

+	    	ticket.setInfoText("coffee voucher");

+	    	ticket.setValidFromYear(2022L);	    	

+	    	ticket.setValidFromDay(01L);

+	    	ticket.setValidUntilYear(2022L);	    	

+	    	ticket.setValidUntilDay(01L);

+	    	ticket.setReferenceIA5("ACHE12345");

+	    	ticket.setProductOwnerIA5("COFFEEMACHINE");

+	    	ticket.setValue(500L);

+	    	tdd.setVoucher(ticket);

+	    	dd.setTicket(tdd);

+		}

+

+

+	    

+	    private static void populateTravelerData(TravelerData td) {

+	    	SequenceOfTravelerType trs = new SequenceOfTravelerType();

+	    	TravelerType tr = new TravelerType();

+	    	tr.setIdCard("12345");

+	    	tr.setFirstName("John");

+	    	tr.setSecondName("Dow");

+	    	tr.setTicketHolder(true);

+	    	SequenceOfCustomerStatusType ts = new SequenceOfCustomerStatusType();  	

+	    	CustomerStatusType cst = new CustomerStatusType();

+	    	cst.setCustomerStatusDescr("employee");

+	    	ts.add(cst);

+	    	tr.setStatus(ts);

+	    	trs.add(tr);

+	    	td.setTraveler(trs);

+		}

+

+	    

+

+

+

+	    private static void populateExtensionSequence(SequenceOfExtensionData ed) {

+	       	ExtensionData ed1 = new ExtensionData();

+	    	ed1.setExtensionId("1");

+	    	byte[] ba1 = { (byte) 0x82, (byte) 0xDA };

+	    	ed1.setExtensionData(ba1); 	

+	    	ExtensionData ed2 = new ExtensionData();    	

+	    	ed2.setExtensionId("2");

+	    	byte[] ba2 = { (byte) 0x83, (byte) 0xDA };

+	    	ed2.setExtensionData(ba2);     	

+	    	ed.add(ed1);

+	    	ed.add(ed2);

+		}

+

+		private static void populate(ControlData controlDetail) {

+			controlDetail.infoText = "cd";

+			controlDetail.setAgeCheckRequired(false);

+			controlDetail.setIdentificationByIdCard(false);

+			controlDetail.setIdentificationByPassportId(false);

+			controlDetail.setOnlineValidationRequired(false);

+			controlDetail.setPassportValidationRequired(false);

+			controlDetail.setReductionCardCheckRequired(false);

+			controlDetail.setIdentificationByCardReference(new SequenceOfCardReferenceType());

+			controlDetail.getIdentificationByCardReference().add(populateCardRefrence());

+		}

+

+

+		private static CardReferenceType populateCardRefrence() {

+			CardReferenceType cr = new CardReferenceType();

+			cr.setTrailingCardIdNum(100L);

+			return cr;

+		}

+

+

+

+	}

diff --git a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
index d3136e1..3f781ef 100644
--- a/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
+++ b/src/org/uic/barcode/ticket/api/utils/Api2OpenAsnEncoder.java
@@ -1508,10 +1508,12 @@ public class Api2OpenAsnEncoder {
 		

 		asnData.setValidity(document.getValidFrom(), document.getValidUntil());

 

-		asnData.setType(UicEncoderUtils.getRestrictedInt(document.getType(), 1,9999));

-		

-		asnData.setValue(UicEncoderUtils.getRestrictedInt(document.getAmount(),1,9999999));

-		

+		if (document.getType() != null) {

+			asnData.setType(UicEncoderUtils.getRestrictedInt(document.getType(), 1,9999));

+		}

+		if (document.getAmount() != null) {

+			asnData.setValue(UicEncoderUtils.getRestrictedInt(document.getAmount(),1,9999999));

+		}

 		return asnDocument;

 	}