summaryrefslogtreecommitdiffstats
path: root/pki/base/util/test/com/netscape/security/x509
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/util/test/com/netscape/security/x509')
-rw-r--r--pki/base/util/test/com/netscape/security/x509/DirStrConverterTest.java46
-rw-r--r--pki/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java48
-rw-r--r--pki/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java30
-rw-r--r--pki/base/util/test/com/netscape/security/x509/PrintableConverterTest.java30
4 files changed, 77 insertions, 77 deletions
diff --git a/pki/base/util/test/com/netscape/security/x509/DirStrConverterTest.java b/pki/base/util/test/com/netscape/security/x509/DirStrConverterTest.java
index 2abf05714..0549dec9c 100644
--- a/pki/base/util/test/com/netscape/security/x509/DirStrConverterTest.java
+++ b/pki/base/util/test/com/netscape/security/x509/DirStrConverterTest.java
@@ -15,13 +15,13 @@ public class DirStrConverterTest {
public void testEmptyString() throws Exception {
String string = "";
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_PrintableString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new DirStrConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -30,13 +30,13 @@ public class DirStrConverterTest {
public void testNullCharacters() throws Exception {
String string = StringTestUtil.NULL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_T61String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new DirStrConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -45,13 +45,13 @@ public class DirStrConverterTest {
public void testPrintableCharacters() throws Exception {
String string = StringTestUtil.PRINTABLE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_PrintableString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new DirStrConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -60,13 +60,13 @@ public class DirStrConverterTest {
public void testControlCharacters() throws Exception {
String string = StringTestUtil.CONTROL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_T61String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new DirStrConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -75,13 +75,13 @@ public class DirStrConverterTest {
public void testMultibyteCharacters() throws Exception {
String string = StringTestUtil.MULTIBYTE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_UniversalString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new DirStrConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -90,15 +90,15 @@ public class DirStrConverterTest {
public void testPrintableCharactersWithTags() throws Exception {
String string = StringTestUtil.PRINTABLE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_IA5String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new DirStrConverter(), string, new byte[] {
- DerValue.tag_IA5String, DerValue.tag_UTF8String
+ DerValue.tag_IA5String, DerValue.tag_UTF8String
});
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -107,15 +107,15 @@ public class DirStrConverterTest {
public void testMultibyteCharactersWithTags() throws Exception {
String string = StringTestUtil.MULTIBYTE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_UTF8String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new DirStrConverter(), string, new byte[] {
- DerValue.tag_IA5String, DerValue.tag_UTF8String
+ DerValue.tag_IA5String, DerValue.tag_UTF8String
});
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
diff --git a/pki/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java b/pki/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java
index 1962d1bfa..46ea86cc7 100644
--- a/pki/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java
+++ b/pki/base/util/test/com/netscape/security/x509/GenericValueConverterTest.java
@@ -15,13 +15,13 @@ public class GenericValueConverterTest {
public void testEmptyString() throws Exception {
String string = "";
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_PrintableString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new GenericValueConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -30,13 +30,13 @@ public class GenericValueConverterTest {
public void testNullCharacters() throws Exception {
String string = StringTestUtil.NULL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_IA5String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new GenericValueConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -45,13 +45,13 @@ public class GenericValueConverterTest {
public void testPrintableCharacters() throws Exception {
String string = StringTestUtil.PRINTABLE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_PrintableString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new GenericValueConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -60,13 +60,13 @@ public class GenericValueConverterTest {
public void testControlCharacters() throws Exception {
String string = StringTestUtil.CONTROL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_IA5String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new GenericValueConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -75,16 +75,16 @@ public class GenericValueConverterTest {
public void testMultibyteCharacters() throws Exception {
String string = StringTestUtil.MULTIBYTE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_BMPString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new GenericValueConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
actual = StringTestUtil.normalizeUnicode(actual);
- System.out.println(" - norm. : "+StringTestUtil.toString(actual));
+ System.out.println(" - norm. : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -93,15 +93,15 @@ public class GenericValueConverterTest {
public void testPrintableCharactersWithTags() throws Exception {
String string = StringTestUtil.PRINTABLE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_T61String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new GenericValueConverter(), string, new byte[] {
- DerValue.tag_T61String, DerValue.tag_UniversalString
+ DerValue.tag_T61String, DerValue.tag_UniversalString
});
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -110,15 +110,15 @@ public class GenericValueConverterTest {
public void testMultibyteCharactersWithTags() throws Exception {
String string = StringTestUtil.MULTIBYTE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_UniversalString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new GenericValueConverter(), string, new byte[] {
- DerValue.tag_T61String, DerValue.tag_UniversalString
+ DerValue.tag_T61String, DerValue.tag_UniversalString
});
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
diff --git a/pki/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java b/pki/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java
index a7361ccbf..ba99218ad 100644
--- a/pki/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java
+++ b/pki/base/util/test/com/netscape/security/x509/IA5StringConverterTest.java
@@ -15,13 +15,13 @@ public class IA5StringConverterTest {
public void testEmptyString() throws Exception {
String string = "";
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_IA5String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new IA5StringConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -30,13 +30,13 @@ public class IA5StringConverterTest {
public void testNullCharacters() throws Exception {
String string = StringTestUtil.NULL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_IA5String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new IA5StringConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -45,13 +45,13 @@ public class IA5StringConverterTest {
public void testPrintableCharacters() throws Exception {
String string = StringTestUtil.PRINTABLE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_IA5String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new IA5StringConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -60,13 +60,13 @@ public class IA5StringConverterTest {
public void testControlCharacters() throws Exception {
String string = StringTestUtil.CONTROL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_IA5String, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new IA5StringConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -75,18 +75,18 @@ public class IA5StringConverterTest {
public void testMultibyteCharacters() throws Exception {
String string = StringTestUtil.MULTIBYTE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
System.out.println(" - expected: IllegalArgumentException");
try {
byte[] actual = ConverterTestUtil.convert(new IA5StringConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.fail();
} catch (Exception e) {
- System.out.println(" - actual : "+e.getClass().getSimpleName());
+ System.out.println(" - actual : " + e.getClass().getSimpleName());
Assert.assertTrue(e instanceof IllegalArgumentException);
}
}
diff --git a/pki/base/util/test/com/netscape/security/x509/PrintableConverterTest.java b/pki/base/util/test/com/netscape/security/x509/PrintableConverterTest.java
index e85d11824..a7acc9c90 100644
--- a/pki/base/util/test/com/netscape/security/x509/PrintableConverterTest.java
+++ b/pki/base/util/test/com/netscape/security/x509/PrintableConverterTest.java
@@ -15,13 +15,13 @@ public class PrintableConverterTest {
public void testEmptyString() throws Exception {
String string = "";
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_PrintableString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new PrintableConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -30,18 +30,18 @@ public class PrintableConverterTest {
public void testNullCharacters() throws Exception {
String string = StringTestUtil.NULL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
System.out.println(" - expected: IllegalArgumentException");
try {
byte[] actual = ConverterTestUtil.convert(new PrintableConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.fail();
} catch (Exception e) {
- System.out.println(" - actual : "+e.getClass().getSimpleName());
+ System.out.println(" - actual : " + e.getClass().getSimpleName());
Assert.assertTrue(e instanceof IllegalArgumentException);
}
}
@@ -50,13 +50,13 @@ public class PrintableConverterTest {
public void testPrintableCharacters() throws Exception {
String string = StringTestUtil.PRINTABLE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
byte[] expected = JSSUtil.encode(DerValue.tag_PrintableString, string);
- System.out.println(" - expected: "+StringTestUtil.toString(expected));
+ System.out.println(" - expected: " + StringTestUtil.toString(expected));
byte[] actual = ConverterTestUtil.convert(new PrintableConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.assertArrayEquals(expected, actual);
}
@@ -65,18 +65,18 @@ public class PrintableConverterTest {
public void testControlCharacters() throws Exception {
String string = StringTestUtil.CONTROL_CHARS;
- System.out.println("Converting: ["+StringTestUtil.toString(string.getBytes())+"]");
+ System.out.println("Converting: [" + StringTestUtil.toString(string.getBytes()) + "]");
System.out.println(" - expected: IllegalArgumentException");
try {
byte[] actual = ConverterTestUtil.convert(new PrintableConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.fail();
} catch (Exception e) {
- System.out.println(" - actual : "+e.getClass().getSimpleName());
+ System.out.println(" - actual : " + e.getClass().getSimpleName());
Assert.assertTrue(e instanceof IllegalArgumentException);
}
}
@@ -85,18 +85,18 @@ public class PrintableConverterTest {
public void testMultibyteCharacters() throws Exception {
String string = StringTestUtil.MULTIBYTE_CHARS;
- System.out.println("Converting: ["+string+"]");
+ System.out.println("Converting: [" + string + "]");
System.out.println(" - expected: IllegalArgumentException");
try {
byte[] actual = ConverterTestUtil.convert(new PrintableConverter(), string);
- System.out.println(" - actual : "+StringTestUtil.toString(actual));
+ System.out.println(" - actual : " + StringTestUtil.toString(actual));
Assert.fail();
} catch (Exception e) {
- System.out.println(" - actual : "+e.getClass().getSimpleName());
+ System.out.println(" - actual : " + e.getClass().getSimpleName());
Assert.assertTrue(e instanceof IllegalArgumentException);
}
}
generated by cgit (git 2.34.1) at 2024-07-04 18:43:55 +0000