From 47133b358a65723b1b131f66d2e340a12685f9e6 Mon Sep 17 00:00:00 2001
From: CGantert345 <57003061+CGantert345@users.noreply.github.com>
Date: Tue, 23 Nov 2021 11:23:55 +0100
Subject: renamed

---
 .../org/uic/barcode/test/DynamicFrameFCB3Test.java | 175 ---------------------
 .../org/uic/barcode/test/DynamicFrameFcb3Test.java | 175 +++++++++++++++++++++
 2 files changed, 175 insertions(+), 175 deletions(-)
 delete mode 100644 src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java
 create mode 100644 src/test/java/org/uic/barcode/test/DynamicFrameFcb3Test.java

diff --git a/src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java b/src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java
deleted file mode 100644
index 2ac7353..0000000
--- a/src/test/java/org/uic/barcode/test/DynamicFrameFCB3Test.java
+++ /dev/null
@@ -1,175 +0,0 @@
-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();	    
-    }
-
-
-}
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..cb252a2
--- /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