Converted inter_tests...

lemire · lemire · commit 5fb149f8334e · 2020-03-26T19:52:17.000-04:00
diff --git a/tests/basictests.cpp b/tests/basictests.cpp
@@ -212,7 +212,6 @@ namespace number_tests {
   bool powers_of_ten() {
     std::cout << __func__ << std::endl;
     char buf[1024];
-    simdjson::ParsedJson pj;
     for (int i = -1000000; i <= 308; ++i) {// large negative values should be zero.
       auto n = sprintf(buf,"1e%d", i);
       buf[n] = '\0';
diff --git a/tests/integer_tests.cpp b/tests/integer_tests.cpp
@@ -32,19 +32,21 @@ template <typename T>
 static void parse_and_validate(const std::string src, T expected) {
   std::cout << "src: " << src << ", ";
   const padded_string pstr{src};
-  auto json = build_parsed_json(pstr);
+  simdjson::document::parser parser;
+  auto [pj, error] = parser.parse(pstr);
+  if(error) {
+    printf("could not parse\n");
+    abort();
+  }
+  
 
-  ASSERT(json.is_valid());
-  ParsedJson::Iterator it{json};
-  ASSERT(it.down());
-  ASSERT(it.next());
   bool result;
   if constexpr (std::is_same<int64_t, T>::value) {
-    const auto actual = it.get_integer();
-    result = expected == actual;
+    int64_t actual = pj.root().as_object()["key"].as_int64_t();
+    result = (expected == actual);
   } else {
-    const auto actual = it.get_unsigned_integer();
-    result = expected == actual;
+    uint64_t actual = pj.root().as_object()["key"].as_uint64_t();
+    result = (expected == actual);
   }
   std::cout << std::boolalpha << "test: " << result << std::endl;
   if(!result) {
@@ -56,25 +58,28 @@ static void parse_and_validate(const std::string src, T expected) {
 static bool parse_and_check_signed(const std::string src) {
   std::cout << "src: " << src << ", expecting signed" << std::endl;
   const padded_string pstr{src};
-  auto json = build_parsed_json(pstr);
-
-  ASSERT(json.is_valid());
-  ParsedJson::Iterator it{json};
-  ASSERT(it.down());
-  ASSERT(it.next());
-  return it.is_integer() && it.is_number();
+  simdjson::document::parser parser;
+  auto [pj, error] = parser.parse(pstr);
+  if(error) {
+    printf("could not parse\n");
+    abort();
+  }
+  auto [v,e] = pj.root().as_object()["key"];
+  return v.is_integer() && v.is_number();
 }
 
+
 static bool parse_and_check_unsigned(const std::string src) {
-  std::cout << "src: " << src << ", expecting unsigned" << std::endl;
+  std::cout << "src: " << src << ", expecting signed" << std::endl;
   const padded_string pstr{src};
-  auto json = build_parsed_json(pstr);
-
-  ASSERT(json.is_valid());
-  ParsedJson::Iterator it{json};
-  ASSERT(it.down());
-  ASSERT(it.next());
-  return it.is_unsigned_integer() && it.is_number();
+  simdjson::document::parser parser;
+  auto [pj, error] = parser.parse(pstr);
+  if(error) {
+    printf("could not parse\n");
+    abort();
+  }
+  auto [v,e] = pj.root().as_object()["key"];
+  return v.is_unsigned_integer() && v.is_number();
 }
 
 
