Imported Upstream version 0.16.0

[platform/upstream/json-glib.git] / json-glib / tests / parser.c

diff --git a/json-glib/tests/parser.c b/json-glib/tests/parser.c
index d3f2404..dc64f75 100644 (file)
--- a/json-glib/tests/parser.c
+++ b/json-glib/tests/parser.c
@@ -20,6 +20,12 @@ verify_int_value (JsonNode *node)
 }
 
 static void
+verify_negative_int_value (JsonNode *node)
+{
+  g_assert_cmpint (-1, ==, json_node_get_int (node));
+}
+
+static void
 verify_boolean_value (JsonNode *node)
 {
   g_assert_cmpint (TRUE, ==, json_node_get_boolean (node));
@@ -37,6 +43,12 @@ verify_double_value (JsonNode *node)
   g_assert_cmpfloat (10.2e3, ==, json_node_get_double (node));
 }
 
+static void
+verify_negative_double_value (JsonNode *node)
+{
+  g_assert_cmpfloat (-3.14, ==, json_node_get_double (node));
+}
+
 static const struct {
   const gchar *str;
   JsonNodeType type;
@@ -47,7 +59,9 @@ static const struct {
   { "42",         JSON_NODE_VALUE, G_TYPE_INT64,   verify_int_value },
   { "true",       JSON_NODE_VALUE, G_TYPE_BOOLEAN, verify_boolean_value },
   { "\"string\"", JSON_NODE_VALUE, G_TYPE_STRING,  verify_string_value },
-  { "10.2e3",     JSON_NODE_VALUE, G_TYPE_DOUBLE,  verify_double_value }
+  { "10.2e3",     JSON_NODE_VALUE, G_TYPE_DOUBLE,  verify_double_value },
+  { "-1",         JSON_NODE_VALUE, G_TYPE_INT64,   verify_negative_int_value },
+  { "-3.14",      JSON_NODE_VALUE, G_TYPE_DOUBLE,  verify_negative_double_value },
 };
 
 static const struct {
@@ -128,21 +142,6 @@ static const struct
   { "{ \"test\" : \"foo \\u00e8\" }", "test", "foo è" }
 };
 
-static const struct
-{
-  const gchar *str;
-  JsonParserError code;
-} test_invalid[] = {
-  { "test", JSON_PARSER_ERROR_INVALID_BAREWORD },
-  { "[ foo, ]", JSON_PARSER_ERROR_INVALID_BAREWORD },
-  { "[ true, ]", JSON_PARSER_ERROR_TRAILING_COMMA },
-  { "{ \"foo\" : true \"bar\" : false }", JSON_PARSER_ERROR_MISSING_COMMA },
-  { "[ true, [ false, ] ]", JSON_PARSER_ERROR_TRAILING_COMMA },
-  { "{ \"foo\" : { \"bar\" : false, } }", JSON_PARSER_ERROR_TRAILING_COMMA },
-  { "[ { }, { }, { }, ]", JSON_PARSER_ERROR_TRAILING_COMMA },
-  { "{ \"foo\" false }", JSON_PARSER_ERROR_MISSING_COLON }
-};
-
 static guint n_test_base_values    = G_N_ELEMENTS (test_base_values);
 static guint n_test_simple_arrays  = G_N_ELEMENTS (test_simple_arrays);
 static guint n_test_nested_arrays  = G_N_ELEMENTS (test_nested_arrays);
@@ -150,7 +149,6 @@ static guint n_test_simple_objects = G_N_ELEMENTS (test_simple_objects);
 static guint n_test_nested_objects = G_N_ELEMENTS (test_nested_objects);
 static guint n_test_assignments    = G_N_ELEMENTS (test_assignments);
 static guint n_test_unicode        = G_N_ELEMENTS (test_unicode);
-static guint n_test_invalid        = G_N_ELEMENTS (test_invalid);
 
 static void
 test_empty (void)
@@ -650,41 +648,6 @@ test_unicode_escape (void)
 }
 
 static void
-test_invalid_json (void)
-{
-  JsonParser *parser;
-  GError *error = NULL;
-  gint i;
-
-  parser = json_parser_new ();
-  g_assert (JSON_IS_PARSER (parser));
-
-  if (g_test_verbose ())
-    g_print ("checking json_parser_load_from_data with invalid data...\n");
-
-  for (i = 0; i < n_test_invalid; i++)
-    {
-      gboolean res;
-
-      if (g_test_verbose ())
-        g_print ("Parsing: '%s'\n", test_invalid[i].str);
-
-      res = json_parser_load_from_data (parser, test_invalid[i].str, -1,
-                                        &error);
-
-      g_assert (!res);
-      g_assert_error (error, JSON_PARSER_ERROR, test_invalid[i].code);
-
-      if (g_test_verbose ())
-        g_print ("Error: %s\n", error->message);
-
-      g_clear_error (&error);
-    }
-
-  g_object_unref (parser);
-}
-
-static void
 test_stream_sync (void)
 {
   JsonParser *parser;
@@ -764,7 +727,9 @@ int
 main (int   argc,
       char *argv[])
 {
+#if !GLIB_CHECK_VERSION (2, 35, 1)
   g_type_init ();
+#endif
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/parser/empty-string", test_empty);
@@ -777,7 +742,6 @@ main (int   argc,
   g_test_add_func ("/parser/nested-object", test_nested_object);
   g_test_add_func ("/parser/assignment", test_assignment);
   g_test_add_func ("/parser/unicode-escape", test_unicode_escape);
-  g_test_add_func ("/parser/invalid-json", test_invalid_json);
   g_test_add_func ("/parser/stream-sync", test_stream_sync);
   g_test_add_func ("/parser/stream-async", test_stream_async);