ErrorProne noise reduction.

Author: dghgit

core/src/test/java/org/bouncycastle/asn1/test/DLExternalTest.java

@@ -184,7 +184,7 @@ private void checkRealDataExample(int encoding, DLExternal dle)
         isTrue("check tag", objNameTagged.hasContextTag(3));
         isEquals("check implicit", false, objNameTagged.isExplicit());
         isEquals("check tagged object: " + objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass(), DEROctetString.class.getName(), objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass().getName());
-        isEquals("check O", "Organization", new String(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets(), "8859_1"));
+        isEquals("check O", "Organization", StringTestUtil.fromISO_8891(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets()));
         isEquals("check fourth element in set: " + objNameElems.getObjectAt(3).getClass(), DLTaggedObject.class.getName(), objNameElems.getObjectAt(3).getClass().getName());
         objNameTagged = (DLTaggedObject)objNameElems.getObjectAt(3);
         isTrue("check tag", objNameTagged.hasContextTag(5));
@@ -194,7 +194,7 @@ private void checkRealDataExample(int encoding, DLExternal dle)
         isTrue("check tag", objNameTagged.hasContextTag(0));
         isEquals("check implicit", false, objNameTagged.isExplicit());
         isEquals("check tagged object: " + objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass(), DEROctetString.class.getName(), objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING).getClass().getName());
-        isEquals("check CN", "Common Name", new String(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets(), "8859_1"));
+        isEquals("check CN", "Common Name", StringTestUtil.fromISO_8891(((DEROctetString)objNameTagged.getBaseUniversal(false, BERTags.OCTET_STRING)).getOctets()));
 
         isEquals("check second element in set: " + msBindSet.getObjectAt(1).getClass(), DLTaggedObject.class.getName(), msBindSet.getObjectAt(1).getClass().getName());
         DLTaggedObject password = (DLTaggedObject)msBindSet.getObjectAt(1);
@@ -216,8 +216,8 @@ private ASN1EncodableVector createRealDataExample(int encoding)
         ASN1EncodableVector objectNameVec = new ASN1EncodableVector();
         objectNameVec.add(new DLTaggedObject(BERTags.APPLICATION, 0, new DERPrintableString("de")));
         objectNameVec.add(new DLTaggedObject(BERTags.APPLICATION, 2, new DERPrintableString("viaT")));
-        objectNameVec.add(new DLTaggedObject(false, 3, new DEROctetString("Organization".getBytes("8859_1"))));
-        objectNameVec.add(new DLTaggedObject(true, 5, new DLTaggedObject(false, 0, new DEROctetString("Common Name".getBytes("8859_1")))));
+        objectNameVec.add(new DLTaggedObject(false, 3, new DEROctetString(StringTestUtil.toISO_8891("Organization"))));
+        objectNameVec.add(new DLTaggedObject(true, 5, new DLTaggedObject(false, 0, new DEROctetString(StringTestUtil.toISO_8891("Common Name")))));
 
         DLTaggedObject objectName = new DLTaggedObject(BERTags.APPLICATION, 0, new DLSequence(objectNameVec));
         DLTaggedObject password = new DLTaggedObject(true, 2, new DERIA5String("SomePassword"));

core/src/test/java/org/bouncycastle/asn1/test/StringTest.java

@@ -1,7 +1,6 @@
 package org.bouncycastle.asn1.test;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1String;
@@ -90,7 +89,7 @@ public void performTest()
 
         try
         {
-            String t61String = new String(t61Bytes, "iso-8859-1");
+            String t61String = StringTestUtil.fromISO_8891(t61Bytes);
             ASN1T61String t61 = new DERT61String(Strings.fromByteArray(t61Bytes));
 
             if (!t61.getString().equals(t61String))
@@ -103,8 +102,8 @@ public void performTest()
                 fail("DERT61String.toString() result incorrect");
             }
         }
-        catch (UnsupportedEncodingException e)
-        {
+        catch (IllegalStateException e)
+        { 
             // ignore test
         }
 

core/src/test/java/org/bouncycastle/asn1/test/StringTestUtil.java

@@ -0,0 +1,32 @@
+package org.bouncycastle.asn1.test;
+
+import java.io.UnsupportedEncodingException;
+
+import org.bouncycastle.util.Exceptions;
+
+class StringTestUtil
+{
+    static byte[] toISO_8891(String str)
+    {
+        try
+        {
+            return str.getBytes("iso-8859-1");
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            throw Exceptions.illegalStateException(e.getMessage(), e);
+        }
+    }
+
+    static String fromISO_8891(byte[] encStr)
+    {
+        try
+        {
+            return new String(encStr, "iso-8859-1");
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            throw Exceptions.illegalStateException(e.getMessage(), e);
+        }
+    }
+}