@@ -1463,16 +1463,41 @@ JSONTEST_FIXTURE(ValueTest, compareObject) {
1463
1463
Json::Value l1aObject;
1464
1464
l1aObject[" key1" ] = 0 ;
1465
1465
Json::Value l1bObject;
1466
- l1aObject [" key1" ] = 10 ;
1466
+ l1bObject [" key1" ] = 10 ;
1467
1467
Json::Value l2aObject;
1468
1468
l2aObject[" key1" ] = 0 ;
1469
1469
l2aObject[" key2" ] = 0 ;
1470
+ Json::Value l2bObject;
1471
+ l2bObject[" key1" ] = 10 ;
1472
+ l2bObject[" key2" ] = 0 ;
1470
1473
JSONTEST_ASSERT_PRED (checkIsLess (emptyObject, l1aObject));
1471
- JSONTEST_ASSERT_PRED (checkIsLess (emptyObject, l2aObject));
1472
- JSONTEST_ASSERT_PRED (checkIsLess (l1aObject, l2aObject));
1474
+ JSONTEST_ASSERT_PRED (checkIsLess (l1aObject, l1bObject));
1475
+ JSONTEST_ASSERT_PRED (checkIsLess (l1bObject, l2aObject));
1476
+ JSONTEST_ASSERT_PRED (checkIsLess (l2aObject, l2bObject));
1473
1477
JSONTEST_ASSERT_PRED (checkIsEqual (emptyObject, Json::Value (emptyObject)));
1474
1478
JSONTEST_ASSERT_PRED (checkIsEqual (l1aObject, Json::Value (l1aObject)));
1479
+ JSONTEST_ASSERT_PRED (checkIsEqual (l1bObject, Json::Value (l1bObject)));
1475
1480
JSONTEST_ASSERT_PRED (checkIsEqual (l2aObject, Json::Value (l2aObject)));
1481
+ JSONTEST_ASSERT_PRED (checkIsEqual (l2bObject, Json::Value (l2bObject)));
1482
+ {
1483
+ Json::Value aObject;
1484
+ aObject[" a" ] = 10 ;
1485
+ Json::Value bObject;
1486
+ bObject[" b" ] = 0 ;
1487
+ Json::Value cObject;
1488
+ cObject[" c" ] = 20 ;
1489
+ cObject[" f" ] = 15 ;
1490
+ Json::Value dObject;
1491
+ dObject[" d" ] = -2 ;
1492
+ dObject[" e" ] = 10 ;
1493
+ JSONTEST_ASSERT_PRED (checkIsLess (aObject, bObject));
1494
+ JSONTEST_ASSERT_PRED (checkIsLess (bObject, cObject));
1495
+ JSONTEST_ASSERT_PRED (checkIsLess (cObject, dObject));
1496
+ JSONTEST_ASSERT_PRED (checkIsEqual (aObject, Json::Value (aObject)));
1497
+ JSONTEST_ASSERT_PRED (checkIsEqual (bObject, Json::Value (bObject)));
1498
+ JSONTEST_ASSERT_PRED (checkIsEqual (cObject, Json::Value (cObject)));
1499
+ JSONTEST_ASSERT_PRED (checkIsEqual (dObject, Json::Value (dObject)));
1500
+ }
1476
1501
}
1477
1502
1478
1503
JSONTEST_FIXTURE (ValueTest, compareType) {
0 commit comments