CDRIVER-2128 update JSON tests

Author: ajdavis

CMakeLists.txt

@@ -259,13 +259,6 @@ if (ENABLE_TESTS)
          ${SOURCE_DIR}/tests/corpus-test.h
          ${SOURCE_DIR}/tests/TestSuite.c
          ${SOURCE_DIR}/tests/TestSuite.h
-         ${SOURCE_DIR}/tests/json/type/decimal128/decimal128-1.json
-         ${SOURCE_DIR}/tests/json/type/decimal128/decimal128-2.json
-         ${SOURCE_DIR}/tests/json/type/decimal128/decimal128-3.json
-         ${SOURCE_DIR}/tests/json/type/decimal128/decimal128-4.json
-         ${SOURCE_DIR}/tests/json/type/decimal128/decimal128-5.json
-         ${SOURCE_DIR}/tests/json/type/decimal128/decimal128-6.json
-         ${SOURCE_DIR}/tests/json/type/decimal128/decimal128-7.json
          ${SOURCE_DIR}/tests/test-libbson.c
          ${SOURCE_DIR}/tests/test-atomic.c
          ${SOURCE_DIR}/tests/test-bson.c
@@ -280,7 +273,6 @@ if (ENABLE_TESTS)
          ${SOURCE_DIR}/tests/test-oid.c
          ${SOURCE_DIR}/tests/test-reader.c
          ${SOURCE_DIR}/tests/test-string.c
-         ${SOURCE_DIR}/tests/test-type.c
          ${SOURCE_DIR}/tests/test-utf8.c
          ${SOURCE_DIR}/tests/test-value.c
          ${SOURCE_DIR}/tests/test-version.c

tests/Makefile.am

@@ -21,7 +21,6 @@ test_libbson_SOURCES = \
 	tests/test-oid.c \
 	tests/test-reader.c \
 	tests/test-string.c \
-	tests/test-type.c \
 	tests/test-utf8.c \
 	tests/test-value.c \
 	tests/test-version.c \

tests/corpus-test.c

@@ -95,10 +95,6 @@ corpus_test (bson_t *scenario, test_bson_type_valid_cb valid)
                corpus_test_print_description (test.test_description);
             }
 
-            if (!strcmp (key, "bson")) {
-               test.B = corpus_test_unhexlify (&test_iter, &test.B_len);
-            }
-
             if (!strcmp (key, "canonical_bson")) {
                test.cB = corpus_test_unhexlify (&test_iter, &test.cB_len);
             }
@@ -107,41 +103,24 @@ corpus_test (bson_t *scenario, test_bson_type_valid_cb valid)
                test.dB = corpus_test_unhexlify (&test_iter, &test.dB_len);
             }
 
-            if (!strcmp (key, "extjson")) {
-               test.E = bson_iter_utf8 (&test_iter, &test.E_len);
-            }
-
             if (!strcmp (key, "canonical_extjson")) {
-               test.cE = bson_iter_utf8 (&test_iter, &test.cE_len);
+               test.cE = bson_iter_utf8 (&test_iter, NULL);
             }
 
             if (!strcmp (key, "relaxed_extjson")) {
-               test.rE = bson_iter_utf8 (&test_iter, &test.rE_len);
+               test.rE = bson_iter_utf8 (&test_iter, NULL);
             }
 
             if (!strcmp (key, "lossy")) {
                test.lossy = bson_iter_bool (&test_iter);
             }
          }
 
-#define SET_DEFAULT(a, b) \
-   if (!test.a) {         \
-      test.a = test.b;    \
-   }
-
-         SET_DEFAULT (cB, B);
-         SET_DEFAULT (cB_len, B_len);
-         SET_DEFAULT (cE, E);
-         SET_DEFAULT (cE_len, E_len);
-
          /* execute the test callback */
          valid (&test);
 
-         if (test.cB != test.B) {
-            bson_free (test.cB);
-         }
-
-         bson_free (test.B);
+         bson_free (test.cB);
+         bson_free (test.dB);
       }
    }
 }

tests/corpus-test.h

@@ -30,18 +30,12 @@ typedef struct _test_bson_type_t {
    const char *scenario_description;
    bson_type_t bson_type;
    const char *test_description;
-   uint8_t *B;          /* "bson" */
-   uint32_t B_len;
    uint8_t *cB;         /* "canonical_bson" */
    uint32_t cB_len;
    uint8_t *dB;         /* "degenerate_bson" */
    uint32_t dB_len;
-   const char *E;       /* "extjson" */
-   uint32_t E_len;
    const char *cE;      /* "canonical_extjson" */
-   uint32_t cE_len;
    const char *rE;      /* "relaxed_extjson" */
-   uint32_t rE_len;
    bool lossy;
 } test_bson_type_t;
 

tests/json/bson_corpus/datetime.json

@@ -11,15 +11,15 @@
         },
         {
             "description": "positive ms",
-            "canonical_bson": "10000000096100C4D8D6CC3B01000000",
-            "relaxed_extjson": "{\"a\" : {\"$date\" : \"2012-12-24T12:15:30.500Z\"}}",
-            "canonical_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"1356351330500\"}}}"
+            "canonical_bson": "10000000096100C5D8D6CC3B01000000",
+            "relaxed_extjson": "{\"a\" : {\"$date\" : \"2012-12-24T12:15:30.501Z\"}}",
+            "canonical_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"1356351330501\"}}}"
         },
         {
             "description": "negative",
-            "canonical_bson": "10000000096100C43CE7B9BDFFFFFF00",
-            "relaxed_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"-284643869500\"}}}",
-            "canonical_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"-284643869500\"}}}"
+            "canonical_bson": "10000000096100C33CE7B9BDFFFFFF00",
+            "relaxed_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"-284643869501\"}}}",
+            "canonical_extjson": "{\"a\" : {\"$date\" : {\"$numberLong\" : \"-284643869501\"}}}"
         }
     ],
     "decodeErrors": [