1 files changed, 7 insertions, 3 deletions
diff --git a/src/test/java/org/uic/barcode/test/DynamicFrameV2ValidityDateTest.java b/src/test/java/org/uic/barcode/test/DynamicFrameV2ValidityDateTest.java
index 03536c4..9bbd736 100644
--- a/src/test/java/org/uic/barcode/test/DynamicFrameV2ValidityDateTest.java
+++ b/src/test/java/org/uic/barcode/test/DynamicFrameV2ValidityDateTest.java
@@ -87,6 +87,7 @@ public class DynamicFrameV2ValidityDateTest {
 		TimeZone.setDefault(local);
 
 		enc.getDynamicFrame().getLevel2Data().getLevel1Data().setEndOfBarcodeValidity(endDate);
+		enc.getDynamicFrame().getLevel2Data().getLevel1Data().setValidityDuration(100L);
 		
 		try {
 			enc.signLevel1("1080", keyPair.getPrivate(), signatureAlgorithmOID, "1");
@@ -132,6 +133,7 @@ public class DynamicFrameV2ValidityDateTest {
 		TimeZone.setDefault(local);
 		
 		enc.getDynamicFrame().getLevel2Data().getLevel1Data().setEndOfBarcodeValidity(endDate);
+		enc.getDynamicFrame().getLevel2Data().getLevel1Data().setValidityDuration(100L);
 		
 		try {
 			enc.signLevel1("1080", keyPair.getPrivate(), signatureAlgorithmOID, "1");
@@ -171,13 +173,13 @@ public class DynamicFrameV2ValidityDateTest {
 		
         assert(signatureCheck == Constants.LEVEL1_VALIDATION_OK);
         
-        assert(dec.getDynamicHeader().getFormat().equals("U2"));
+        assert(dec.getDynamicFrame().getFormat().equals("U2"));
         
-        for (IData data : dec.getDynamicHeader().getLevel2Data().getLevel1Data().getData()) {
+        for (IData data : dec.getDynamicFrame().getLevel2Data().getLevel1Data().getData()) {
         	assert(data.getFormat().equals("FCB3") );
         }
                
-        Date endDate2 = dec.getDynamicHeader().getLevel2Data().getLevel1Data().getEndOfBarcodeValidity();
+        Date endDate2 = dec.getDynamicFrame().getLevel2Data().getLevel1Data().getEndOfBarcodeValidity();
         
 		
 		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
@@ -186,6 +188,8 @@ public class DynamicFrameV2ValidityDateTest {
         
         assert("2021.03.04-12:30".equals(date2));
         
+        assert(100L == dec.getDynamicFrame().getLevel2Data().getLevel1Data().getValidityDuration());
+        
 	}	
 	
 	public KeyPair generateECDSAKeys(String keyAlgorithmName, String paramName)  throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException{