commit cf453ab8e7e013a6bdd3268e81200523735284ae
author Ravago Jones <ravagojones@gmail.com> Wed May 06 21:14:53 2020 -0700
committer Ravago Jones <ravagojones@gmail.com> Fri Jun 26 20:13:52 2020 -0700
tree 4ea9f11a15251b78315215952ec72f36979422c4
parent 3b79ffa2dc480b74dcfa6aeb463c1f5dde195377

Factor out JsonOptions into a struct

Change-Id: I2441069e86ea2eb95d8e1952be7c2a7a43036c74

aos/json_to_flatbuffer_test.cc

diff --git a/aos/json_to_flatbuffer_test.cc b/aos/json_to_flatbuffer_test.cc
index 6dbb7ea..80dec7c 100644
--- a/aos/json_to_flatbuffer_test.cc
+++ b/aos/json_to_flatbuffer_test.cc
@@ -78,7 +78,6 @@
   EXPECT_TRUE(JsonAndBack("{ \"foo_double\": 5.1 }"));
 }
 
-
 // Test what happens if you pass a field name that we don't know.
 TEST_F(JsonToFlatbufferTest, InvalidFieldName) {
   EXPECT_FALSE(JsonAndBack("{ \"foo\": 5 }"));
@@ -156,7 +155,8 @@
 
   EXPECT_TRUE(JsonAndBack("{ \"vector_foo_string\": [ \"bar\", \"baz\" ] }"));
   EXPECT_TRUE(JsonAndBack("{ \"vector_foo_string\": [  ] }"));
-  EXPECT_TRUE(JsonAndBack("{ \"vector_foo_enum\": [ \"None\", \"UType\", \"Bool\" ] }"));
+  EXPECT_TRUE(JsonAndBack(
+      "{ \"vector_foo_enum\": [ \"None\", \"UType\", \"Bool\" ] }"));
   EXPECT_TRUE(JsonAndBack("{ \"vector_foo_enum\": [  ] }"));
 }
 
@@ -170,8 +170,7 @@
   EXPECT_TRUE(JsonAndBack(
       "{ \"apps\": [ { \"name\": \"woot\" }, { \"name\": \"wow\" } ] }"));
 
-  EXPECT_TRUE(JsonAndBack(
-      "{ \"apps\": [ {  }, {  } ] }"));
+  EXPECT_TRUE(JsonAndBack("{ \"apps\": [ {  }, {  } ] }"));
 }
 
 // Test that we can parse an empty message.
@@ -198,7 +197,8 @@
 // Tests that multiple arrays get properly handled.
 TEST_F(JsonToFlatbufferTest, NestedArrays) {
   EXPECT_TRUE(
-      JsonAndBack("{ \"vov\": { \"v\": [ { \"str\": [ \"a\", \"b\" ] }, { \"str\": [ \"c\", \"d\" ] } ] } }"));
+      JsonAndBack("{ \"vov\": { \"v\": [ { \"str\": [ \"a\", \"b\" ] }, { "
+                  "\"str\": [ \"c\", \"d\" ] } ] } }"));
 }
 
 // TODO(austin): Missmatched values.
@@ -222,10 +222,10 @@
       JsonToFlatbuffer(json_long.data(), ConfigurationTypeTable());
   ASSERT_GT(fb_long.size(), 0);
 
-  const std::string back_json_short =
-      FlatbufferToJson(fb_short, ConfigurationTypeTable(), false, 100);
-  const std::string back_json_long =
-      FlatbufferToJson(fb_long, ConfigurationTypeTable(), false, 100);
+  const std::string back_json_short = FlatbufferToJson(
+      fb_short, ConfigurationTypeTable(), {.multi_line = false, .max_vector_size = 100});
+  const std::string back_json_long = FlatbufferToJson(
+      fb_long, ConfigurationTypeTable(), {.multi_line = false, .max_vector_size = 100});
 
   EXPECT_EQ(json_short, back_json_short);
   EXPECT_EQ("{ \"vector_foo_int\": [ ... 101 elements ... ] }", back_json_long);
@@ -234,7 +234,7 @@
 // Tests that a nullptr buffer prints nullptr.
 TEST_F(JsonToFlatbufferTest, NullptrData) {
   EXPECT_EQ("null", TableFlatbufferToJson((const flatbuffers::Table *)(nullptr),
-                                          ConfigurationTypeTable(), false));
+                                          ConfigurationTypeTable()));
 }
 
 }  // namespace testing