From cd76118fb6737eb241cab60207262617e12d237d Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 23 Nov 2021 11:16:40 +0100
Subject: test added

---
 src/main/java/org/uic/barcode/Encoder.java         |   2 +-
 .../org/uic/barcode/test/DynamicFrameFCB3Test.java | 175 +++++++++++++++++++++
 2 files changed, 176 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java

diff --git a/src/main/java/org/uic/barcode/Encoder.java b/src/main/java/org/uic/barcode/Encoder.java
index 9463548..f0f8d14 100644
--- a/src/main/java/org/uic/barcode/Encoder.java
+++ b/src/main/java/org/uic/barcode/Encoder.java
@@ -100,7 +100,7 @@ public class Encoder {
 				DataType ticketData = new DataType();
 				
 				UicRailTicketCoder uicTicketCoder = new UicRailTicketCoder();
-				if (fcbVersion == 1) {
+				if (fcbVersion == 1 || fcbVersion == 13) {
 					ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_1);
 				} else if (fcbVersion == 2) {
 					ticketData.setFormat(Constants.DATA_TYPE_FCB_VERSION_2);
diff --git a/src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java b/src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java
new file mode 100644
index 0000000..2ac7353
--- /dev/null
+++ b/src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java
@@ -0,0 +1,175 @@
+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.test.utils.SimpleUICTestTicket;
+import org.uic.barcode.ticket.EncodingFormatException;
+import org.uic.barcode.ticket.api.spec.IUicRailTicket;
+
+public class DynamicFrameFCB3Test {
+	
+	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, 1, 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, 1, 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("U1"));
+        
+        assert(dec.getDynamicHeader().getDynamicDataFDC1().getDataType().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();	    
+    }
+
+
+}
-- 
cgit v1.2.3