2 files changed, 384 insertions, 0 deletions
diff --git a/src/test/java/org/uic/barcode/test/DynamicFrameV2FcbVersion3Test.java b/src/test/java/org/uic/barcode/test/DynamicFrameV2FcbVersion3Test.java
new file mode 100644
index 0000000..8014b78
--- /dev/null
+++ b/src/test/java/org/uic/barcode/test/DynamicFrameV2FcbVersion3Test.java
@@ -0,0 +1,176 @@
+package org.uic.barcode.test;
+
+import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.SignatureException;
+import java.util.zip.DataFormatException;
+
+import org.bouncycastle.jce.ECNamedCurveTable;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.spec.ECParameterSpec;
+import org.junit.Before;
+import org.junit.Test;
+import org.uic.barcode.Decoder;
+import org.uic.barcode.Encoder;
+import org.uic.barcode.dynamicFrame.Constants;
+import org.uic.barcode.dynamicFrame.api.IData;
+import org.uic.barcode.test.utils.SimpleUICTestTicket;
+import org.uic.barcode.ticket.EncodingFormatException;
+import org.uic.barcode.ticket.api.spec.IUicRailTicket;
+
+public class DynamicFrameV2FcbVersion3Test {
+	
+	public String signatureAlgorithmOID = null;
+	public String elipticCurve = null;
+	public String keyPairAlgorithmOID = null;
+	
+	public KeyPair keyPair = null;
+	
+	public IUicRailTicket testFCBticket = null;
+	
+	
+	@Before public void initialize() {
+		
+		signatureAlgorithmOID = Constants.ECDSA_SHA256;
+		keyPairAlgorithmOID = Constants.KG_EC_256;
+		elipticCurve = "secp256k1";
+		
+	    testFCBticket = SimpleUICTestTicket.getUicTestTicket();
+		
+		Security.addProvider(new BouncyCastleProvider());
+
+		try {
+			keyPair  = generateECKeys(Constants.KG_EC, elipticCurve);
+			//keyPair  = generateECDSAKeys("ECDSA", "B-571");
+		} catch (Exception e) {
+			assert(false);
+		}
+
+        assert(keyPair != null);
+        
+	}
+	
+	
+	@Test public void testDynamicHeaderBarcodeEncodingFCB3() {
+		
+		IUicRailTicket ticket = testFCBticket;
+
+		Encoder enc = null;
+
+		try {
+			enc = new Encoder(ticket, null, Encoder.UIC_BARCODE_TYPE_DOSIPAS, 2, 3);
+		} catch (IOException | EncodingFormatException e1) {
+			assert(false);
+		}
+		
+		assert(enc != null);
+		
+		try {
+			enc.signLevel1("1080", keyPair.getPrivate(), signatureAlgorithmOID, "1");
+		} catch (Exception e) {
+			assert(false);
+		}
+		
+			
+        byte[] encoded = null;
+		try {
+			encoded = enc.encode();
+		} catch (Exception e) {
+			assert(false);
+		}
+        
+        assert(encoded != null);
+		
+		
+	}
+	
+	@Test public void testDynamicHeaderBarcodeDecodingFCB3() {
+		
+		IUicRailTicket ticket = testFCBticket;
+
+		Encoder enc = null;
+
+		try {
+			enc = new Encoder(ticket, null, Encoder.UIC_BARCODE_TYPE_DOSIPAS, 2, 3);
+		} catch (IOException | EncodingFormatException e1) {
+			assert(false);
+		}
+		
+		assert(enc != null);
+		
+		try {
+			enc.signLevel1("1080", keyPair.getPrivate(), signatureAlgorithmOID, "1");
+		} catch (Exception e) {
+			assert(false);
+		}
+		
+			
+        byte[] encoded = null;
+		try {
+			encoded = enc.encode();
+		} catch (Exception e) {
+			assert(false);
+		}
+        
+        assert(encoded != null);
+		
+        Decoder dec = null;
+		try {
+			dec = new Decoder(encoded);
+		} catch (IOException e) {
+			assert(false);
+		} catch (EncodingFormatException e) {
+			assert(false);
+		} catch (DataFormatException e) {
+			assert(false);
+		}
+		assert(dec != null);
+        
+        int signatureCheck = 0;
+		try {
+			signatureCheck = dec.validateLevel1(keyPair.getPublic(),null);
+		} catch (InvalidKeyException | NoSuchAlgorithmException | SignatureException | IllegalArgumentException
+				| UnsupportedOperationException | IOException | EncodingFormatException e) {
+			assert(false);
+		}
+		
+        assert(signatureCheck == Constants.LEVEL1_VALIDATION_OK);
+        
+        assert(dec.getDynamicHeader().getFormat().equals("U2"));
+        
+        for (IData data : dec.getDynamicHeader().getLevel2Data().getLevel1Data().getData()) {
+        	assert(data.getFormat().equals("FCB3") );
+        }
+               
+        SimpleUICTestTicket.compare(ticket, dec.getUicTicket());     
+        
+        
+               
+        
+	}	
+	
+	public KeyPair generateECDSAKeys(String keyAlgorithmName, String paramName)  throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException{
+		ECParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec(paramName);
+	    KeyPairGenerator g = KeyPairGenerator.getInstance(keyAlgorithmName, "BC");
+	    g.initialize(ecSpec, new SecureRandom());
+	    return g.generateKeyPair();	    
+    }
+		
+	public KeyPair generateECKeys(String keyAlgorithmOid, String curve)  throws Exception{
+		
+		String keyAlgorithmName = "ECDSA";
+		ECParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec(curve);
+	    KeyPairGenerator g = KeyPairGenerator.getInstance(keyAlgorithmName, "BC");
+	    g.initialize(ecSpec, new SecureRandom());
+	    return g.generateKeyPair();	    
+    }
+
+
+}
diff --git a/src/test/java/org/uic/barcode/test/DynamicFrameV2ValidityDateTest.java b/src/test/java/org/uic/barcode/test/DynamicFrameV2ValidityDateTest.java
new file mode 100644
index 0000000..03536c4
--- /dev/null
+++ b/src/test/java/org/uic/barcode/test/DynamicFrameV2ValidityDateTest.java
@@ -0,0 +1,208 @@
+package org.uic.barcode.test;
+
+import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.SignatureException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.zip.DataFormatException;
+
+import org.bouncycastle.jce.ECNamedCurveTable;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.spec.ECParameterSpec;
+import org.junit.Before;
+import org.junit.Test;
+import org.uic.barcode.Decoder;
+import org.uic.barcode.Encoder;
+import org.uic.barcode.dynamicFrame.Constants;
+import org.uic.barcode.dynamicFrame.api.IData;
+import org.uic.barcode.test.utils.SimpleUICTestTicket;
+import org.uic.barcode.ticket.EncodingFormatException;
+import org.uic.barcode.ticket.api.spec.IUicRailTicket;
+
+public class DynamicFrameV2ValidityDateTest {
+	
+	public String signatureAlgorithmOID = null;
+	public String elipticCurve = null;
+	public String keyPairAlgorithmOID = null;
+	
+	public KeyPair keyPair = null;
+	
+	public IUicRailTicket testFCBticket = null;
+	
+	
+	@Before public void initialize() {
+		
+		signatureAlgorithmOID = Constants.ECDSA_SHA256;
+		keyPairAlgorithmOID = Constants.KG_EC_256;
+		elipticCurve = "secp256k1";
+		
+	    testFCBticket = SimpleUICTestTicket.getUicTestTicket();
+		
+		Security.addProvider(new BouncyCastleProvider());
+
+		try {
+			keyPair  = generateECKeys(Constants.KG_EC, elipticCurve);
+			//keyPair  = generateECDSAKeys("ECDSA", "B-571");
+		} catch (Exception e) {
+			assert(false);
+		}
+
+        assert(keyPair != null);
+        
+	}
+	
+	
+	@Test public void testDynamicHeaderBarcodeEncodingFCB3() {
+		
+		IUicRailTicket ticket = testFCBticket;
+
+		Encoder enc = null;
+
+		try {
+			enc = new Encoder(ticket, null, Encoder.UIC_BARCODE_TYPE_DOSIPAS, 2, 3);
+		} catch (IOException | EncodingFormatException e1) {
+			assert(false);
+		}
+		
+		assert(enc != null);
+		
+		TimeZone local = TimeZone.getDefault();
+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+		Date endDate = null;
+		try {
+			endDate = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" );
+		} catch (ParseException e1) {
+			assert(false);
+		}
+		TimeZone.setDefault(local);
+
+		enc.getDynamicFrame().getLevel2Data().getLevel1Data().setEndOfBarcodeValidity(endDate);
+		
+		try {
+			enc.signLevel1("1080", keyPair.getPrivate(), signatureAlgorithmOID, "1");
+		} catch (Exception e) {
+			assert(false);
+		}
+		
+			
+        byte[] encoded = null;
+		try {
+			encoded = enc.encode();
+		} catch (Exception e) {
+			assert(false);
+		}
+        
+        assert(encoded != null);
+		
+		
+	}
+	
+	@Test public void testDynamicHeaderBarcodeDecodingFCB3() {
+		
+		IUicRailTicket ticket = testFCBticket;
+
+		Encoder enc = null;
+
+		try {
+			enc = new Encoder(ticket, null, Encoder.UIC_BARCODE_TYPE_DOSIPAS, 2, 3);
+		} catch (IOException | EncodingFormatException e1) {
+			assert(false);
+		}
+		
+		assert(enc != null);
+		
+		TimeZone local = TimeZone.getDefault();
+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+		Date endDate = null;
+		try {
+			endDate = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).parse( "2021.03.04-12:30" );
+		} catch (ParseException e1) {
+			assert(false);
+		}
+		TimeZone.setDefault(local);
+		
+		enc.getDynamicFrame().getLevel2Data().getLevel1Data().setEndOfBarcodeValidity(endDate);
+		
+		try {
+			enc.signLevel1("1080", keyPair.getPrivate(), signatureAlgorithmOID, "1");
+		} catch (Exception e) {
+			assert(false);
+		}
+		
+			
+        byte[] encoded = null;
+		try {
+			encoded = enc.encode();
+		} catch (Exception e) {
+			assert(false);
+		}
+        
+        assert(encoded != null);
+		
+        Decoder dec = null;
+		try {
+			dec = new Decoder(encoded);
+		} catch (IOException e) {
+			assert(false);
+		} catch (EncodingFormatException e) {
+			assert(false);
+		} catch (DataFormatException e) {
+			assert(false);
+		}
+		assert(dec != null);
+        
+        int signatureCheck = 0;
+		try {
+			signatureCheck = dec.validateLevel1(keyPair.getPublic(),null);
+		} catch (InvalidKeyException | NoSuchAlgorithmException | SignatureException | IllegalArgumentException
+				| UnsupportedOperationException | IOException | EncodingFormatException e) {
+			assert(false);
+		}
+		
+        assert(signatureCheck == Constants.LEVEL1_VALIDATION_OK);
+        
+        assert(dec.getDynamicHeader().getFormat().equals("U2"));
+        
+        for (IData data : dec.getDynamicHeader().getLevel2Data().getLevel1Data().getData()) {
+        	assert(data.getFormat().equals("FCB3") );
+        }
+               
+        Date endDate2 = dec.getDynamicHeader().getLevel2Data().getLevel1Data().getEndOfBarcodeValidity();
+        
+		
+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+		String date2 = new SimpleDateFormat( "yyyy.MM.dd-HH:mm" ).format(endDate2);
+        TimeZone.setDefault(local);
+        
+        assert("2021.03.04-12:30".equals(date2));
+        
+	}	
+	
+	public KeyPair generateECDSAKeys(String keyAlgorithmName, String paramName)  throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException{
+		ECParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec(paramName);
+	    KeyPairGenerator g = KeyPairGenerator.getInstance(keyAlgorithmName, "BC");
+	    g.initialize(ecSpec, new SecureRandom());
+	    return g.generateKeyPair();	    
+    }
+		
+	public KeyPair generateECKeys(String keyAlgorithmOid, String curve)  throws Exception{
+		
+		String keyAlgorithmName = "ECDSA";
+		ECParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec(curve);
+	    KeyPairGenerator g = KeyPairGenerator.getInstance(keyAlgorithmName, "BC");
+	    g.initialize(ecSpec, new SecureRandom());
+	    return g.generateKeyPair();	    
+    }
+
+
+}