AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
b52c273d3f
skia2/tests/JSONTest.cpp

417 lines
15 KiB
C++
Raw Normal View History

SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
/*
* Copyright 2018 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "Test.h"
Reland [skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. TBR= Change-Id: Ic609bb74f12cad1756865a2489ad56c03ecc5494 Reviewed-on: https://skia-review.googlesource.com/134845 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 15:24:50 +00:00
#include "SkArenaAlloc.h"
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
#include "SkJSON.h"
Reland [skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. TBR= Change-Id: Ic609bb74f12cad1756865a2489ad56c03ecc5494 Reviewed-on: https://skia-review.googlesource.com/134845 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 15:24:50 +00:00
#include "SkString.h"
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
#include "SkStream.h"
using namespace skjson;
Fold SkJSON into Skia/utils It's a tiny, core-ish component -- might as well treat as such to simplify dependencies. Change-Id: I6f31ce2d151f9a629d88bfc7f15d64891d5150c0 Reviewed-on: https://skia-review.googlesource.com/135780 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 15:27:20 +00:00
DEF_TEST(JSON_Parse, reporter) {
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
static constexpr struct {
const char* in;
const char* out;
} g_tests[] = {
{ "" , nullptr },
{ "[" , nullptr },
{ "]" , nullptr },
Reland [skjson] Size-constrained input API Pass an explicit input size instead of requiring a C string. Thanks to mtklein's clever trick, this has no measurable perf impact. TBR= Change-Id: Ic8cb1dc75f4d0814e5b2c80038d1b8d3a7b072ab Reviewed-on: https://skia-review.googlesource.com/134946 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 19:03:21 +00:00
{ "[[]" , nullptr },
{ "[]]" , nullptr },
{ "[]f" , nullptr },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ "{" , nullptr },
{ "}" , nullptr },
Reland [skjson] Size-constrained input API Pass an explicit input size instead of requiring a C string. Thanks to mtklein's clever trick, this has no measurable perf impact. TBR= Change-Id: Ic8cb1dc75f4d0814e5b2c80038d1b8d3a7b072ab Reviewed-on: https://skia-review.googlesource.com/134946 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 19:03:21 +00:00
{ "{{}" , nullptr },
{ "{}}" , nullptr },
{ "{}f" , nullptr },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ "{]" , nullptr },
{ "[}" , nullptr },
[skjson] Detect end-of-input for unbalanced strings We currently blow through string chars without checking for end-of-input. Maybe we could avoid this upfront, when we locate the stop char: try to determine if it's part of an unterminated string, fail immediately if so. Figuring out if the tail is an unterminated string seems intractable though (requires arbitrarily deep tail parsing). That brings us to plan B: * treat scope-closing tokens (} & ]) as string terminators (we know end-of-input points to one of these for sure) * adjust matchString() to check for end-of-input Bug: oss-fuzz:8899 Change-Id: Ic0a88a405548e8724b76faca525099a7e7037341 Reviewed-on: https://skia-review.googlesource.com/135145 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2018-06-15 20:42:09 +00:00
{ "{\"}" , nullptr },
{ "[\"]" , nullptr },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ "1" , nullptr },
{ "true" , nullptr },
{ "false", nullptr },
{ "null" , nullptr },
{ "[nulll]" , nullptr },
{ "[false2]", nullptr },
{ "[true:]" , nullptr },
{ "[1 2]" , nullptr },
{ "[1,,2]" , nullptr },
{ "[1,2,]" , nullptr },
{ "[,1,2]" , nullptr },
{ "[ \"foo" , nullptr },
{ "[ \"fo\0o\" ]" , nullptr },
[skjson] Catch end-of-stream for unbalanced scopes The input is not guaranteed to contain well-formed scopes, so it's not sufficient to check for end-of-stream only when popping the top-level scope -- we have to check on every scope pop. Bug: oss-fuzz:8898 Change-Id: I7399a8872187ec6714672cac2ff8fc7fbf3c2dfe Reviewed-on: https://skia-review.googlesource.com/135059 Reviewed-by: Kevin Lubick <kjlubick@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-15 13:21:36 +00:00
{ "{\"\":{}" , nullptr },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ "{ null }" , nullptr },
{ "{ \"k\" : }" , nullptr },
{ "{ : null }" , nullptr },
{ "{ \"k\" : : null }" , nullptr },
{ "{ \"k\" : null , }" , nullptr },
{ "{ \"k\" : null \"k\" : 1 }", nullptr },
Reland: [skjson] Unescape strings Reviewed-on: https://skia-review.googlesource.com/c/167240 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org> Change-Id: Icfa1b335f19423422f2fe6fb592b40f7b72b16eb TBR= Reviewed-on: https://skia-review.googlesource.com/c/168265 Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-11-05 16:44:02 +00:00
{R"zzz(["\)zzz" , nullptr},
{R"zzz(["\])zzz" , nullptr},
{R"zzz(["\"])zzz" , nullptr},
{R"zzz(["\z"])zzz" , nullptr},
{R"zzz(["\u"])zzz" , nullptr},
{R"zzz(["\u0"])zzz" , nullptr},
{R"zzz(["\u00"])zzz" , nullptr},
{R"zzz(["\u000"])zzz", nullptr},
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
Reland [skjson] Size-constrained input API Pass an explicit input size instead of requiring a C string. Thanks to mtklein's clever trick, this has no measurable perf impact. TBR= Change-Id: Ic8cb1dc75f4d0814e5b2c80038d1b8d3a7b072ab Reviewed-on: https://skia-review.googlesource.com/134946 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 19:03:21 +00:00
{ "[]" , "[]" },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ " \n\r\t [ \n\r\t ] \n\r\t " , "[]" },
Reland [skjson] Size-constrained input API Pass an explicit input size instead of requiring a C string. Thanks to mtklein's clever trick, this has no measurable perf impact. TBR= Change-Id: Ic8cb1dc75f4d0814e5b2c80038d1b8d3a7b072ab Reviewed-on: https://skia-review.googlesource.com/134946 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 19:03:21 +00:00
{ "[[]]" , "[[]]" },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ "[ null ]" , "[null]" },
{ "[ true ]" , "[true]" },
{ "[ false ]" , "[false]" },
{ "[ 0 ]" , "[0]" },
{ "[ 1 ]" , "[1]" },
{ "[ 1.248 ]" , "[1.248]" },
{ "[ \"\" ]" , "[\"\"]" },
[skjson] Detect end-of-input for unbalanced strings We currently blow through string chars without checking for end-of-input. Maybe we could avoid this upfront, when we locate the stop char: try to determine if it's part of an unterminated string, fail immediately if so. Figuring out if the tail is an unterminated string seems intractable though (requires arbitrarily deep tail parsing). That brings us to plan B: * treat scope-closing tokens (} & ]) as string terminators (we know end-of-input points to one of these for sure) * adjust matchString() to check for end-of-input Bug: oss-fuzz:8899 Change-Id: Ic0a88a405548e8724b76faca525099a7e7037341 Reviewed-on: https://skia-review.googlesource.com/135145 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2018-06-15 20:42:09 +00:00
{ "[ \"foo{bar}baz\" ]" , "[\"foo{bar}baz\"]" },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ "[ \" f o o \" ]" , "[\" f o o \"]" },
{ "[ \"123456\" ]" , "[\"123456\"]" },
{ "[ \"1234567\" ]" , "[\"1234567\"]" },
{ "[ \"12345678\" ]" , "[\"12345678\"]" },
{ "[ \"123456789\" ]" , "[\"123456789\"]" },
{ "[ null , true, false,0,12.8 ]", "[null,true,false,0,12.8]" },
Reland [skjson] Size-constrained input API Pass an explicit input size instead of requiring a C string. Thanks to mtklein's clever trick, this has no measurable perf impact. TBR= Change-Id: Ic8cb1dc75f4d0814e5b2c80038d1b8d3a7b072ab Reviewed-on: https://skia-review.googlesource.com/134946 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 19:03:21 +00:00
{ "{}" , "{}" },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ " \n\r\t { \n\r\t } \n\r\t " , "{}" },
{ "{ \"k\" : null }" , "{\"k\":null}" },
[skjson] Detect end-of-input for unbalanced strings We currently blow through string chars without checking for end-of-input. Maybe we could avoid this upfront, when we locate the stop char: try to determine if it's part of an unterminated string, fail immediately if so. Figuring out if the tail is an unterminated string seems intractable though (requires arbitrarily deep tail parsing). That brings us to plan B: * treat scope-closing tokens (} & ]) as string terminators (we know end-of-input points to one of these for sure) * adjust matchString() to check for end-of-input Bug: oss-fuzz:8899 Change-Id: Ic0a88a405548e8724b76faca525099a7e7037341 Reviewed-on: https://skia-review.googlesource.com/135145 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Kevin Lubick <kjlubick@google.com>
2018-06-15 20:42:09 +00:00
{ "{ \"foo{\" : \"bar}baz\" }" , "{\"foo{\":\"bar}baz\"}" },
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
{ "{ \"k1\" : null, \"k2 \":0 }", "{\"k1\":null,\"k2 \":0}" },
{ "{ \"k1\" : null, \"k1\":0 }" , "{\"k1\":null,\"k1\":0}" },
{ "{ \"k1\" : null, \n\
\"k2\" : 0, \n\
\"k3\" : [ \n\
true, \r\n\
{ \"kk1\" : \"foo\" , \n\
\"kk2\" : \"bar\" , \n\
\"kk3\" : 1.28 , \n\
\"kk4\" : [ 42 ] \n\
} , \n\
\"boo\" , \n\
null \n\
] \n\
}",
"{\"k1\":null,\"k2\":0,\"k3\":[true,"
"{\"kk1\":\"foo\",\"kk2\":\"bar\",\"kk3\":1.28,\"kk4\":[42]},\"boo\",null]}" },
Reland: [skjson] Unescape strings Reviewed-on: https://skia-review.googlesource.com/c/167240 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org> Change-Id: Icfa1b335f19423422f2fe6fb592b40f7b72b16eb TBR= Reviewed-on: https://skia-review.googlesource.com/c/168265 Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-11-05 16:44:02 +00:00
{R"zzz(["\""])zzz" , "[\"\"\"]"},
{R"zzz(["\\"])zzz" , "[\"\\\"]"},
{R"zzz(["\/"])zzz" , "[\"/\"]" },
{R"zzz(["\b"])zzz" , "[\"\b\"]"},
{R"zzz(["\f"])zzz" , "[\"\f\"]"},
{R"zzz(["\n"])zzz" , "[\"\n\"]"},
{R"zzz(["\r"])zzz" , "[\"\r\"]"},
{R"zzz(["\t"])zzz" , "[\"\t\"]"},
{R"zzz(["\u1234"])zzz", "[\"\u1234\"]"},
{R"zzz(["foo\"bar"])zzz" , "[\"foo\"bar\"]"},
{R"zzz(["foo\\bar"])zzz" , "[\"foo\\bar\"]"},
{R"zzz(["foo\/bar"])zzz" , "[\"foo/bar\"]" },
{R"zzz(["foo\bbar"])zzz" , "[\"foo\bbar\"]"},
{R"zzz(["foo\fbar"])zzz" , "[\"foo\fbar\"]"},
{R"zzz(["foo\nbar"])zzz" , "[\"foo\nbar\"]"},
{R"zzz(["foo\rbar"])zzz" , "[\"foo\rbar\"]"},
{R"zzz(["foo\tbar"])zzz" , "[\"foo\tbar\"]"},
{R"zzz(["foo\u1234bar"])zzz", "[\"foo\u1234bar\"]"},
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
};
for (const auto& tst : g_tests) {
Reland [skjson] Size-constrained input API Pass an explicit input size instead of requiring a C string. Thanks to mtklein's clever trick, this has no measurable perf impact. TBR= Change-Id: Ic8cb1dc75f4d0814e5b2c80038d1b8d3a7b072ab Reviewed-on: https://skia-review.googlesource.com/134946 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 19:03:21 +00:00
DOM dom(tst.in, strlen(tst.in));
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
const auto success = !dom.root().is<NullValue>();
REPORTER_ASSERT(reporter, success == (tst.out != nullptr));
if (!success) continue;
SkDynamicMemoryWStream str;
dom.write(&str);
str.write8('\0');
auto data = str.detachAsData();
REPORTER_ASSERT(reporter, !strcmp(tst.out, static_cast<const char*>(data->data())));
}
}
template <typename T, typename VT>
static void check_primitive(skiatest::Reporter* reporter, const Value& v, T pv,
bool is_type) {
REPORTER_ASSERT(reporter, v.is<VT>() == is_type);
Reland [skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. TBR= Change-Id: Ic609bb74f12cad1756865a2489ad56c03ecc5494 Reviewed-on: https://skia-review.googlesource.com/134845 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 15:24:50 +00:00
const VT* cast_t = v;
REPORTER_ASSERT(reporter, (cast_t != nullptr) == is_type);
if (is_type) {
REPORTER_ASSERT(reporter, &v.as<VT>() == cast_t);
REPORTER_ASSERT(reporter, *v.as<VT>() == pv);
}
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
}
template <typename T>
static void check_vector(skiatest::Reporter* reporter, const Value& v, size_t expected_size,
bool is_vector) {
REPORTER_ASSERT(reporter, v.is<T>() == is_vector);
Reland [skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. TBR= Change-Id: Ic609bb74f12cad1756865a2489ad56c03ecc5494 Reviewed-on: https://skia-review.googlesource.com/134845 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 15:24:50 +00:00
const T* cast_t = v;
REPORTER_ASSERT(reporter, (cast_t != nullptr) == is_vector);
if (is_vector) {
const auto& vec = v.as<T>();
REPORTER_ASSERT(reporter, &vec == cast_t);
REPORTER_ASSERT(reporter, vec.size() == expected_size);
REPORTER_ASSERT(reporter, vec.begin() != nullptr);
REPORTER_ASSERT(reporter, vec.end() == vec.begin() + expected_size);
}
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
}
static void check_string(skiatest::Reporter* reporter, const Value& v, const char* s) {
check_vector<StringValue>(reporter, v, s ? strlen(s) : 0, !!s);
if (s) {
REPORTER_ASSERT(reporter, !strcmp(v.as<StringValue>().begin(), s));
}
}
Fold SkJSON into Skia/utils It's a tiny, core-ish component -- might as well treat as such to simplify dependencies. Change-Id: I6f31ce2d151f9a629d88bfc7f15d64891d5150c0 Reviewed-on: https://skia-review.googlesource.com/135780 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 15:27:20 +00:00
DEF_TEST(JSON_DOM_visit, reporter) {
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
static constexpr char json[] = "{ \n\
\"k1\": null, \n\
\"k2\": false, \n\
\"k3\": true, \n\
\"k4\": 42, \n\
\"k5\": .75, \n\
\"k6\": \"foo\", \n\
\"k7\": [ 1, true, \"bar\" ], \n\
\"k8\": { \"kk1\": 2, \"kk2\": false, \"kk1\": \"baz\" } \n\
}";
Reland [skjson] Size-constrained input API Pass an explicit input size instead of requiring a C string. Thanks to mtklein's clever trick, this has no measurable perf impact. TBR= Change-Id: Ic8cb1dc75f4d0814e5b2c80038d1b8d3a7b072ab Reviewed-on: https://skia-review.googlesource.com/134946 Reviewed-by: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 19:03:21 +00:00
DOM dom(json, strlen(json));
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
const auto& jroot = dom.root().as<ObjectValue>();
REPORTER_ASSERT(reporter, jroot.is<ObjectValue>());
{
const auto& v = jroot["k1"];
REPORTER_ASSERT(reporter, v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, false, false);
check_primitive<float, NumberValue>(reporter, v, 0, false);
check_string(reporter, v, nullptr);
check_vector<ArrayValue >(reporter, v, 0, false);
check_vector<ObjectValue>(reporter, v, 0, false);
}
{
const auto& v = jroot["k2"];
REPORTER_ASSERT(reporter, !v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, false, true);
check_primitive<float, NumberValue>(reporter, v, 0, false);
check_string(reporter, v, nullptr);
check_vector<ArrayValue >(reporter, v, 0, false);
check_vector<ObjectValue>(reporter, v, 0, false);
}
{
const auto& v = jroot["k3"];
REPORTER_ASSERT(reporter, !v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, true, true);
check_primitive<float, NumberValue>(reporter, v, 0, false);
check_string(reporter, v, nullptr);
check_vector<ArrayValue >(reporter, v, 0, false);
check_vector<ObjectValue>(reporter, v, 0, false);
}
{
const auto& v = jroot["k4"];
REPORTER_ASSERT(reporter, !v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, false, false);
check_primitive<float, NumberValue>(reporter, v, 42, true);
check_string(reporter, v, nullptr);
check_vector<ArrayValue >(reporter, v, 0, false);
check_vector<ObjectValue>(reporter, v, 0, false);
}
{
const auto& v = jroot["k5"];
REPORTER_ASSERT(reporter, !v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, false, false);
check_primitive<float, NumberValue>(reporter, v, .75f, true);
check_string(reporter, v, nullptr);
check_vector<ArrayValue >(reporter, v, 0, false);
check_vector<ObjectValue>(reporter, v, 0, false);
}
{
const auto& v = jroot["k6"];
REPORTER_ASSERT(reporter, !v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, false, false);
check_primitive<float, NumberValue>(reporter, v, 0, false);
check_string(reporter, v, "foo");
check_vector<ArrayValue >(reporter, v, 0, false);
check_vector<ObjectValue>(reporter, v, 0, false);
}
{
const auto& v = jroot["k7"];
REPORTER_ASSERT(reporter, !v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, false, false);
check_primitive<float, NumberValue>(reporter, v, 0, false);
check_string(reporter, v, nullptr);
check_vector<ObjectValue>(reporter, v, 0, false);
check_vector<ArrayValue >(reporter, v, 3, true);
check_primitive<float, NumberValue>(reporter, v.as<ArrayValue>()[0], 1, true);
check_primitive<bool, BoolValue>(reporter, v.as<ArrayValue>()[1], true, true);
check_vector<StringValue>(reporter, v.as<ArrayValue>()[2], 3, true);
}
{
const auto& v = jroot["k8"];
REPORTER_ASSERT(reporter, !v.is<NullValue>());
check_primitive<bool, BoolValue>(reporter, v, false, false);
check_primitive<float, NumberValue>(reporter, v, 0, false);
check_string(reporter, v, nullptr);
check_vector<ArrayValue >(reporter, v, 0, false);
check_vector<ObjectValue>(reporter, v, 3, true);
const auto& m0 = v.as<ObjectValue>().begin()[0];
check_string(reporter, m0.fKey, "kk1");
check_primitive<float, NumberValue>(reporter, m0.fValue, 2, true);
const auto& m1 = v.as<ObjectValue>().begin()[1];
check_string(reporter, m1.fKey, "kk2");
check_primitive<bool, BoolValue>(reporter, m1.fValue, false, true);
const auto& m2 = v.as<ObjectValue>().begin()[2];
check_string(reporter, m2.fKey, "kk1");
check_string(reporter, m2.fValue, "baz");
REPORTER_ASSERT(reporter, v.as<ObjectValue>()[""].is<NullValue>());
REPORTER_ASSERT(reporter, v.as<ObjectValue>()["nosuchkey"].is<NullValue>());
check_string(reporter, v.as<ObjectValue>()["kk1"], "baz");
check_primitive<bool, BoolValue>(reporter, v.as<ObjectValue>()["kk2"], false, true);
}
Reland [skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. TBR= Change-Id: Ic609bb74f12cad1756865a2489ad56c03ecc5494 Reviewed-on: https://skia-review.googlesource.com/134845 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 15:24:50 +00:00
}
[skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. Change-Id: I24a7c75db3aa8b12c740c77ac7df4af4e3a1dff8 Reviewed-on: https://skia-review.googlesource.com/134610 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@google.com>
2018-06-14 14:45:22 +00:00
Reland [skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. TBR= Change-Id: Ic609bb74f12cad1756865a2489ad56c03ecc5494 Reviewed-on: https://skia-review.googlesource.com/134845 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 15:24:50 +00:00
template <typename T>
void check_value(skiatest::Reporter* reporter, const Value& v, const char* expected_string) {
REPORTER_ASSERT(reporter, v.is<T>());
const T* cast_t = v;
REPORTER_ASSERT(reporter, cast_t == &v.as<T>());
const auto vstr = v.toString();
REPORTER_ASSERT(reporter, 0 == strcmp(expected_string, vstr.c_str()));
}
Fold SkJSON into Skia/utils It's a tiny, core-ish component -- might as well treat as such to simplify dependencies. Change-Id: I6f31ce2d151f9a629d88bfc7f15d64891d5150c0 Reviewed-on: https://skia-review.googlesource.com/135780 Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 15:27:20 +00:00
DEF_TEST(JSON_DOM_build, reporter) {
Reland [skjson] Implementation/API tweaks * move most common accessor methods to the header, for inlining * drop the lazy type checking semantics in favor of explicit guarded/unguarded conversions * revisit the public class hierarchy to better constrain type-bound APIs * expose public type factories and add tests * drop the empty-vector optimization -- allocating an external size_t in these uncommon cases is better than paying for a conditional on every access. TBR= Change-Id: Ic609bb74f12cad1756865a2489ad56c03ecc5494 Reviewed-on: https://skia-review.googlesource.com/134845 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-14 15:24:50 +00:00
SkArenaAlloc alloc(4096);
const auto v0 = NullValue();
check_value<NullValue>(reporter, v0, "null");
const auto v1 = BoolValue(true);
check_value<BoolValue>(reporter, v1, "true");
const auto v2 = BoolValue(false);
check_value<BoolValue>(reporter, v2, "false");
const auto v3 = NumberValue(0);
check_value<NumberValue>(reporter, v3, "0");
const auto v4 = NumberValue(42);
check_value<NumberValue>(reporter, v4, "42");
const auto v5 = NumberValue(42.75f);
check_value<NumberValue>(reporter, v5, "42.75");
const auto v6 = StringValue(nullptr, 0, alloc);
check_value<StringValue>(reporter, v6, "\"\"");
const auto v7 = StringValue(" foo ", 5, alloc);
check_value<StringValue>(reporter, v7, "\" foo \"");
const auto v8 = StringValue(" foo bar baz ", 13, alloc);
check_value<StringValue>(reporter, v8, "\" foo bar baz \"");
const auto v9 = ArrayValue(nullptr, 0, alloc);
check_value<ArrayValue>(reporter, v9, "[]");
const Value values0[] = { v0, v3, v9 };
const auto v10 = ArrayValue(values0, SK_ARRAY_COUNT(values0), alloc);
check_value<ArrayValue>(reporter, v10, "[null,0,[]]");
const auto v11 = ObjectValue(nullptr, 0, alloc);
check_value<ObjectValue>(reporter, v11, "{}");
const Member members0[] = {
{ StringValue("key_0", 5, alloc), v1 },
{ StringValue("key_1", 5, alloc), v4 },
{ StringValue("key_2", 5, alloc), v11 },
};
const auto v12 = ObjectValue(members0, SK_ARRAY_COUNT(members0), alloc);
check_value<ObjectValue>(reporter, v12, "{"
"\"key_0\":true,"
"\"key_1\":42,"
"\"key_2\":{}"
"}");
const Value values1[] = { v2, v6, v12 };
const auto v13 = ArrayValue(values1, SK_ARRAY_COUNT(values1), alloc);
check_value<ArrayValue>(reporter, v13, "["
"false,"
"\"\","
"{"
"\"key_0\":true,"
"\"key_1\":42,"
"\"key_2\":{}"
"}"
"]");
const Member members1[] = {
{ StringValue("key_00", 6, alloc), v5 },
{ StringValue("key_01", 6, alloc), v7 },
{ StringValue("key_02", 6, alloc), v13 },
};
const auto v14 = ObjectValue(members1, SK_ARRAY_COUNT(members1), alloc);
check_value<ObjectValue>(reporter, v14, "{"
"\"key_00\":42.75,"
"\"key_01\":\" foo \","
"\"key_02\":["
"false,"
"\"\","
"{"
"\"key_0\":true,"
"\"key_1\":42,"
"\"key_2\":{}"
"}"
"]"
"}");
SkJson For now this is only wired to a bench and a couple of tests. Local numbers, for a ~500KB BM "compressed" json: micros bench 2456.54 json_rapidjson nonrendering 1192.38 json_skjson nonrendering Change-Id: I7b3514f84c7c525d1787722c43ad6095e3692563 Reviewed-on: https://skia-review.googlesource.com/127622 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-08 16:25:38 +00:00
}
Reference in New Issue Copy Permalink