@@ -130,6 +130,21 @@ public static void TestJsonUtf8One(byte[] bytes) {
130
130
}
131
131
}
132
132
133
+ public void JsonTestSuiteTest (String fn , byte [] jsonBytes ) {
134
+ CBORObject json = null ;
135
+ try {
136
+ json = CBORObject .ReadJSONBytes (jsonBytes , new
137
+ JSONOptions ("allowduplicatekeys=1" ));
138
+ } catch (CBORException ex ) {
139
+ json = null ;
140
+ }
141
+ if (fn .startsWith ("y_" ) && json == null ) {
142
+ Assert .fail ("should have succeeded: " + fn );
143
+ } else if (fn .startsWith ("n_" ) && json != null ) {
144
+ Assert .fail ("should have failed: " + fn );
145
+ }
146
+ }
147
+
133
148
@ Test (timeout = 30000 )
134
149
public void TestCorrectUtf8 () {
135
150
RandomGenerator rg = new RandomGenerator ();
@@ -1024,29 +1039,34 @@ public static boolean TestEquivJSONOne(byte[] bytes) {
1024
1039
Assert .fail ();
1025
1040
}
1026
1041
if (!cbo .equals (cbo2 )) {
1027
- System .out .print ("jsonstring" );
1028
- System .out .print (TestCommon .ToByteArrayString (bytes ));
1029
- System .out .print (com .upokecenter .util .DataUtilities .GetUtf8String (bytes , true ));
1030
- System .out .print ("old " + TestCommon .ToByteArrayString (cbo .ToJSONBytes ()));
1031
- System .out .print (cbo .ToJSONString ());
1032
- System .out .print ("new " +
1042
+ if (bytes .length < 16 ) {
1043
+ System .out .println ("jsonstring" );
1044
+ System .out .println (TestCommon .ToByteArrayString (bytes ));
1045
+ System .out .println (com .upokecenter .util .DataUtilities .GetUtf8String (bytes , true ));
1046
+ System .out .println ("old " +
1047
+ TestCommon .ToByteArrayString (cbo .ToJSONBytes ()));
1048
+ System .out .println (cbo .ToJSONString ());
1049
+ System .out .println ("new " +
1033
1050
TestCommon .ToByteArrayString (cbo2 .ToJSONBytes ()));
1034
- System .out .print (cbo2 .ToJSONString ());
1051
+ System .out .println (cbo2 .ToJSONString ());
1052
+ }
1035
1053
Assert .assertEquals (cbo , cbo2 );
1036
1054
}
1037
1055
cbo2 = CBORObject .FromJSONBytes (cbo .ToJSONBytes ());
1038
1056
if (!(cbo2 != null )) {
1039
1057
Assert .fail ();
1040
1058
}
1041
1059
if (!cbo .equals (cbo2 )) {
1042
- System .out .print ("jsonbytes" );
1043
- System .out .print (TestCommon .ToByteArrayString (bytes ));
1044
- System .out .print (com .upokecenter .util .DataUtilities .GetUtf8String (bytes , true ));
1045
- System .out .print ("old " + TestCommon .ToByteArrayString (cbo .ToJSONBytes ()));
1046
- System .out .print (cbo .ToJSONString ());
1047
- System .out .print ("new " +
1060
+ if (bytes .length < 16 ) {
1061
+ System .out .println ("jsonbytes" );
1062
+ System .out .println (TestCommon .ToByteArrayString (bytes ));
1063
+ System .out .println (com .upokecenter .util .DataUtilities .GetUtf8String (bytes , true ));
1064
+ System .out .println ("old " + TestCommon .ToByteArrayString (cbo .ToJSONBytes ()));
1065
+ System .out .println (cbo .ToJSONString ());
1066
+ System .out .println ("new " +
1048
1067
TestCommon .ToByteArrayString (cbo2 .ToJSONBytes ()));
1049
- System .out .print (cbo2 .ToJSONString ());
1068
+ System .out .println (cbo2 .ToJSONString ());
1069
+ }
1050
1070
Assert .assertEquals (cbo , cbo2 );
1051
1071
}
1052
1072
return true ;
0 commit comments