1 files changed, 14 insertions, 13 deletions

diff --git a/src/test/java/org/uic/barcode/asn1/test/UperEncodeBitStringTest.java b/src/test/java/org/uic/barcode/asn1/test/UperEncodeBitStringTest.java
index 574a9cf..94f29c2 100644
--- a/src/test/java/org/uic/barcode/asn1/test/UperEncodeBitStringTest.java
+++ b/src/test/java/org/uic/barcode/asn1/test/UperEncodeBitStringTest.java
@@ -3,13 +3,13 @@ package org.uic.barcode.asn1.test;
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.logging.Level;
 
 import org.junit.Test;
 import org.uic.barcode.asn1.datatypes.Asn1Optional;
-import org.uic.barcode.asn1.datatypes.Asn1VarSizeBitstring;
+import org.uic.barcode.asn1.datatypes.Bitstring;
 import org.uic.barcode.asn1.datatypes.FieldOrder;
+import org.uic.barcode.asn1.datatypes.FixedSize;
 import org.uic.barcode.asn1.datatypes.Sequence;
 import org.uic.barcode.asn1.uper.UperEncoder;
 
@@ -22,7 +22,7 @@ public class UperEncodeBitStringTest {
          World-Schema DEFINITIONS AUTOMATIC TAGS ::= 
          BEGIN
          TestRecord ::= [APPLICATION 0] IMPLICIT SEQUENCE {
-            value BIT STRING OPTIONAL,
+            value BIT STRING (SIZE(3)) OPTIONAL
          }
          END
          
@@ -39,19 +39,20 @@ public class UperEncodeBitStringTest {
     public static class TestRecord {
     	
     	@FieldOrder(order = 0)
-    	@Asn1Optional() Asn1VarSizeBitstring value;
+    	@Asn1Optional()
+    	@Bitstring()
+    	@FixedSize(3)
+    	ArrayList<Boolean> booleans = null;
 
         public TestRecord() {
             this(false,false,true);
         }
 
         public TestRecord(Boolean value1,Boolean value2,Boolean value3 ) {
-        	List<Boolean> booleans = new ArrayList<Boolean>();
+        	booleans = new ArrayList<Boolean>();
         	booleans.add(value1);
         	booleans.add(value2);
-        	booleans.add(value3);
-        	this.value = new Asn1VarSizeBitstring(booleans);
-        	
+        	booleans.add(value3);        	
         }
     }
 
@@ -61,7 +62,7 @@ public class UperEncodeBitStringTest {
         byte[] encoded = UperEncoder.encode(record);
         String hex = UperEncoder.hexStringFromBytes(encoded);
         UperEncoder.logger.log(Level.FINEST,String.format("data hex: %s", hex));
-        assertEquals("8190",hex); 
+        assertEquals("90",hex); 
     }
     
 
@@ -70,11 +71,11 @@ public class UperEncodeBitStringTest {
         byte[] encoded = UperEncoder.encode(record);
         String hex = UperEncoder.hexStringFromBytes(encoded);
         UperEncoder.logger.log(Level.FINEST,String.format("data hex: %s", hex));
-        assertEquals("8190",hex); 
+        assertEquals("90",hex); 
         TestRecord result = UperEncoder.decode(encoded, TestRecord.class);
-        assertEquals(result.value.get(0),record.value.get(0));   
-        assertEquals(result.value.get(1),record.value.get(1));   
-        assertEquals(result.value.get(2),record.value.get(2));
+        assertEquals(result.booleans.get(0),record.booleans.get(0));   
+        assertEquals(result.booleans.get(1),record.booleans.get(1));   
+        assertEquals(result.booleans.get(2),record.booleans.get(2));
         
     }