From 155efa2b875fc0cf64bff4de5ce3ecb86c724e4d Mon Sep 17 00:00:00 2001
From: John Doe <john@doe.org>
Date: Fri, 9 Apr 2021 13:03:50 +0200
Subject: moved resource files to misc; got rid of unused junit5; fixed
 encoding; adapted changes to. pom.xml;

---
 .../asn1/test/UperEncodeObjectIdentifierTest.java  | 151 ++++++++++-----------
 .../barcode/asn1/test/UperEncodeStringTest.java    |   8 +-
 2 files changed, 79 insertions(+), 80 deletions(-)
 mode change 100644 => 100755 src/test/java/org/uic/barcode/asn1/test/UperEncodeStringTest.java

(limited to 'src/test/java/org/uic/barcode/asn1')

diff --git a/src/test/java/org/uic/barcode/asn1/test/UperEncodeObjectIdentifierTest.java b/src/test/java/org/uic/barcode/asn1/test/UperEncodeObjectIdentifierTest.java
index edf3348..4b09604 100644
--- a/src/test/java/org/uic/barcode/asn1/test/UperEncodeObjectIdentifierTest.java
+++ b/src/test/java/org/uic/barcode/asn1/test/UperEncodeObjectIdentifierTest.java
@@ -1,76 +1,75 @@
-package org.uic.barcode.asn1.test;
-
-import static org.junit.Assert.assertEquals;
-import java.util.logging.Level;
-
-import org.junit.jupiter.api.Test;
-import org.uic.barcode.asn1.datatypes.Asn1Optional;
-import org.uic.barcode.asn1.datatypes.CharacterRestriction;
-import org.uic.barcode.asn1.datatypes.FieldOrder;
-import org.uic.barcode.asn1.datatypes.RestrictedString;
-import org.uic.barcode.asn1.datatypes.Sequence;
-import org.uic.barcode.asn1.uper.UperEncoder;
-
-class UperEncodeObjectIdentifierTest {
-	
-	
-    /**
-     * Example from the Standard on UPER.
-     <pre>
-		TestRecord ::= [APPLICATION 0] IMPLICIT SEQUENCE {
-  			value1 OBJECT IDENTIFIER,
-  			value2 OBJECT IDENTIFIER,
-  			value3 OBJECT IDENTIFIER
-		}
-		
-		value TestRecord ::= {
-  			value1 2.16.840.1.101.3.4.3.1,
-  			value2 2.16.840.1.101.3.4.3.2,
-  			value3 1.2.840.10045.3.1.7			
-		}
-    </pre>
-     */
-	
-    @Sequence
-    public static class TestRecord {
-    	
-    	@FieldOrder(order = 0)
-    	@RestrictedString(CharacterRestriction.ObjectIdentifier)
-    	String value1 = "2.16.840.1.101.3.4.3.1";  //DSA SHA224
-
-    	@FieldOrder(order = 1)
-    	@RestrictedString(CharacterRestriction.ObjectIdentifier)
-    	String value2 = "2.16.840.1.101.3.4.3.2";  //DSA SHA248
-    	
-    	@FieldOrder(order = 2)
-    	@RestrictedString(CharacterRestriction.ObjectIdentifier)
-    	String value3 = "1.2.840.10045.3.1.7";     //ECC
-     
-        public TestRecord() {}
-
-    }
-    
-    @Test 
-    public void testEncode() throws IllegalArgumentException, IllegalAccessException {
-        TestRecord record = new TestRecord();
-        byte[] encoded = UperEncoder.encode(record);
-        String hex = UperEncoder.hexStringFromBytes(encoded);
-        UperEncoder.logger.log(Level.FINEST,String.format("data hex: %s", hex));
-        assertEquals("0960864801650304030109608648016503040302082A8648CE3D030107",hex); 
-    }
-    
-    @Test 
-    public void testDecode() throws IllegalArgumentException, IllegalAccessException {
-        TestRecord record = new TestRecord();
-        byte[] encoded = UperEncoder.encode(record);
-        String hex = UperEncoder.hexStringFromBytes(encoded);
-        UperEncoder.logger.log(Level.FINEST,String.format("data hex: %s", hex));
-        assertEquals("0960864801650304030109608648016503040302082A8648CE3D030107",hex); 
-        TestRecord result = UperEncoder.decode(encoded, TestRecord.class);
-        assertEquals(result.value1,record.value1); 
-        assertEquals(result.value2,record.value2);
-        assertEquals(result.value3,record.value3);        
-    } 
-
-
-}
+package org.uic.barcode.asn1.test;
+
+import static org.junit.Assert.assertEquals;
+import java.util.logging.Level;
+
+import org.junit.Test;
+import org.uic.barcode.asn1.datatypes.CharacterRestriction;
+import org.uic.barcode.asn1.datatypes.FieldOrder;
+import org.uic.barcode.asn1.datatypes.RestrictedString;
+import org.uic.barcode.asn1.datatypes.Sequence;
+import org.uic.barcode.asn1.uper.UperEncoder;
+
+public class UperEncodeObjectIdentifierTest {
+
+	
+    /**
+     * Example from the Standard on UPER.
+     <pre>
+		TestRecord ::= [APPLICATION 0] IMPLICIT SEQUENCE {
+  			value1 OBJECT IDENTIFIER,
+  			value2 OBJECT IDENTIFIER,
+  			value3 OBJECT IDENTIFIER
+		}
+		
+		value TestRecord ::= {
+  			value1 2.16.840.1.101.3.4.3.1,
+  			value2 2.16.840.1.101.3.4.3.2,
+  			value3 1.2.840.10045.3.1.7			
+		}
+    </pre>
+     */
+	
+    @Sequence
+    public static class TestRecord {
+    	
+    	@FieldOrder(order = 0)
+    	@RestrictedString(CharacterRestriction.ObjectIdentifier)
+    	String value1 = "2.16.840.1.101.3.4.3.1";  //DSA SHA224
+
+    	@FieldOrder(order = 1)
+    	@RestrictedString(CharacterRestriction.ObjectIdentifier)
+    	String value2 = "2.16.840.1.101.3.4.3.2";  //DSA SHA248
+    	
+    	@FieldOrder(order = 2)
+    	@RestrictedString(CharacterRestriction.ObjectIdentifier)
+    	String value3 = "1.2.840.10045.3.1.7";     //ECC
+     
+        public TestRecord() {}
+
+    }
+    
+    @Test
+    public void testEncode() throws IllegalArgumentException, IllegalAccessException {
+        TestRecord record = new TestRecord();
+        byte[] encoded = UperEncoder.encode(record);
+        String hex = UperEncoder.hexStringFromBytes(encoded);
+        UperEncoder.logger.log(Level.FINEST,String.format("data hex: %s", hex));
+        assertEquals("0960864801650304030109608648016503040302082A8648CE3D030107",hex); 
+    }
+    
+    @Test 
+    public void testDecode() throws IllegalArgumentException, IllegalAccessException {
+        TestRecord record = new TestRecord();
+        byte[] encoded = UperEncoder.encode(record);
+        String hex = UperEncoder.hexStringFromBytes(encoded);
+        UperEncoder.logger.log(Level.FINEST,String.format("data hex: %s", hex));
+        assertEquals("0960864801650304030109608648016503040302082A8648CE3D030107",hex); 
+        TestRecord result = UperEncoder.decode(encoded, TestRecord.class);
+        assertEquals(result.value1,record.value1); 
+        assertEquals(result.value2,record.value2);
+        assertEquals(result.value3,record.value3);        
+    } 
+
+
+}
diff --git a/src/test/java/org/uic/barcode/asn1/test/UperEncodeStringTest.java b/src/test/java/org/uic/barcode/asn1/test/UperEncodeStringTest.java
old mode 100644
new mode 100755
index 5f4edc8..75ace32
--- a/src/test/java/org/uic/barcode/asn1/test/UperEncodeStringTest.java
+++ b/src/test/java/org/uic/barcode/asn1/test/UperEncodeStringTest.java
@@ -50,7 +50,7 @@ public class UperEncodeStringTest {
 
     @Test public void testEncode() throws IllegalArgumentException, IllegalAccessException {
     	
-    	//Teststring: AêñüC
+    	//Teststring: AêñüC
     	String original = new String("A" + "\u00ea" + "\u00f1" + "\u00fc" + "C");
     	
         TestRecord record = new TestRecord(original, "Meier");
@@ -63,7 +63,7 @@ public class UperEncodeStringTest {
     
     @Test public void testEncodeUtf8() throws IllegalArgumentException, IllegalAccessException {
     	
-    	 //"你好�" 
+    	 //"你好�" 
         String original = new String("\u00e4" + "\u00bd" + "\u00a0" + "\u00e5" + "\u00a5" + "\u00bd" + "\u00e5" + "\u0090" + "\u0097");
         TestRecord record = new TestRecord(original, "Meier");
         byte[] encoded = UperEncoder.encode(record);
@@ -76,7 +76,7 @@ public class UperEncodeStringTest {
     
     @Test public void testDecode() throws IllegalArgumentException, IllegalAccessException {
 
-    	//Teststring: AêñüC
+    	//Teststring: AêñüC
     	String original = new String("A" + "\u00ea" + "\u00f1" + "\u00fc" + "C");
 
     	TestRecord record = new TestRecord(original, "Meier");
@@ -91,7 +91,7 @@ public class UperEncodeStringTest {
     
     
     @Test public void testDecodeUtf8() throws IllegalArgumentException, IllegalAccessException {
-   	    //"你好�" 
+   	    //"你好�" 
         String original = new String("\u00e4" + "\u00bd" + "\u00a0" + "\u00e5" + "\u00a5" + "\u00bd" + "\u00e5" + "\u0090" + "\u0097");
         TestRecord record = new TestRecord(original, "Meier");    	
         byte[] encoded = UperEncoder.encode(record);
-- 
cgit v1.2.3