@@ -2488,20 +2488,22 @@ public void TestEncodeFloat64() {
2488
2488
}
2489
2489
}
2490
2490
2491
+ public static final int [] EtbRanges = {
2492
+ -24 , 23 , 1 ,
2493
+ -256 , -25 , 2 ,
2494
+ 24 , 255 , 2 ,
2495
+ 256 , 266 , 3 ,
2496
+ -266 , -257 , 3 ,
2497
+ 65525 , 65535 , 3 ,
2498
+ -65536 , -65525 , 3 ,
2499
+ 65536 , 65546 , 5 ,
2500
+ -65547 , -65537 , 5 ,
2501
+ };
2502
+
2491
2503
@ Test
2492
2504
public void TestEncodeToBytes () {
2493
2505
// Test minimum data length
2494
- int [] ranges = {
2495
- -24 , 23 , 1 ,
2496
- -256 , -25 , 2 ,
2497
- 24 , 255 , 2 ,
2498
- 256 , 266 , 3 ,
2499
- -266 , -257 , 3 ,
2500
- 65525 , 65535 , 3 ,
2501
- -65536 , -65525 , 3 ,
2502
- 65536 , 65546 , 5 ,
2503
- -65547 , -65537 , 5 ,
2504
- };
2506
+ int [] ranges = EtbRanges ;
2505
2507
String [] bigRanges = {
2506
2508
"4294967285" , "4294967295" ,
2507
2509
"4294967296" , "4294967306" ,
@@ -9749,9 +9751,11 @@ public void TestAtJSONPointer() {
9749
9751
cbor = CBORObject .NewMap ().Add ("f/o" , 0 );
9750
9752
Assert .assertEquals (cbor .get ("f/o" ), cbor .AtJSONPointer ("/f~1o" ));
9751
9753
cbor = CBORObject .NewMap ().Add ("foo" , CBORObject .NewMap ().Add ("bar" ,
9752
- 345 ));
9754
+ 345 ));
9753
9755
9754
- Assert .assertEquals (CBORObject .FromObject (345 ), cbor .AtJSONPointer ("/foo/bar" ));
9756
+ Assert .assertEquals (
9757
+ CBORObject .FromObject (345 ),
9758
+ cbor .AtJSONPointer ("/foo/bar" ));
9755
9759
cbor = CBORObject .NewMap ().Add ("foo" , CBORObject .NewArray ().Add (678 ));
9756
9760
Assert .assertEquals (CBORObject .FromObject (678 ), cbor .AtJSONPointer ("/foo/0" ));
9757
9761
try {
@@ -10360,7 +10364,7 @@ public static void TestParseNumberFxxLine(String line) {
10360
10364
10361
10365
public static void TestParseNumberFxx (
10362
10366
String str ,
10363
- short _f16 ,
10367
+ short f16 ,
10364
10368
int f32 ,
10365
10369
long f64 ,
10366
10370
String line ) {
@@ -10370,6 +10374,9 @@ public static void TestParseNumberFxx(
10370
10374
// System.out.println(str);
10371
10375
return ;
10372
10376
}
10377
+ if (CBORObject .FromObject (f16 ) == null ) {
10378
+ Assert .fail ();
10379
+ }
10373
10380
CBORObject cbor = CBORDataUtilities .ParseJSONNumber (str ,
10374
10381
JSONOptionsDouble );
10375
10382
if (cbor == null ) {
@@ -10608,13 +10615,13 @@ public void TestFromJsonStringZeroWithHighExponent() {
10608
10615
String decstr = "0E100441809235791722330759976" ;
10609
10616
EDecimal ed = EDecimal .FromString (decstr );
10610
10617
double dbl = ed .ToDouble ();
10611
- Assert .assertEquals ((double )0 , dbl , 0 );
10618
+ Assert .assertEquals ((double )0.0d , dbl , 0 );
10612
10619
AssertJSONDouble (decstr , "double" , dbl );
10613
10620
AssertJSONInteger (decstr , "intorfloat" , 0 );
10614
10621
decstr = "0E1321909565013040040586" ;
10615
10622
ed = EDecimal .FromString (decstr );
10616
10623
dbl = ed .ToDouble ();
10617
- Assert .assertEquals ((double )0 , dbl , 0 );
10624
+ Assert .assertEquals ((double )0.0d , dbl , 0 );
10618
10625
AssertJSONDouble (decstr , "double" , dbl );
10619
10626
AssertJSONInteger (decstr , "intorfloat" , 0 );
10620
10627
double dblnegzero = EFloat .FromString ("-0" ).ToDouble ();
@@ -10770,7 +10777,7 @@ public void TestFromJsonLeadingTrailingCTL() {
10770
10777
}
10771
10778
}
10772
10779
// Trailing CTL
10773
- chars = new char [] { (char )0x31 , (char )i };
10780
+ chars = new char [] { (char )0x31 , (char )i };
10774
10781
str = new String (chars , 0 , chars .length );
10775
10782
if (i == 0x09 || i == 0x0d || i == 0x0a || i == 0x20 ) {
10776
10783
try {
0 commit comments