Skip to content

Commit de6cc36

Browse files
jviottijviotti
authored
Upgrade Core and Blaze (#924)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 9980cbe commit de6cc36

134 files changed

Lines changed: 1771 additions & 42455 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DEPENDENCIES‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
2-
core https://github.com/sourcemeta/core d07b863772ce5ee38e696ebbc8408d4831545a60
3-
blaze https://github.com/sourcemeta/blaze 015713ad9c98fbc4bd9669cffb2ab1fcb37942ea
2+
core https://github.com/sourcemeta/core fe9ef27a95281775fe3a98b9fb8eb4c51837af0a
3+
blaze https://github.com/sourcemeta/blaze fa1310cb51cd7d1afbd08dc47dab5307b0122526
44
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

‎cmake/FindCore.cmake‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ if(NOT Core_FOUND)
88
set(SOURCEMETA_CORE_LANG_PROCESS OFF CACHE BOOL "disable")
99
set(SOURCEMETA_CORE_LANG_PARALLEL OFF CACHE BOOL "disable")
1010
set(SOURCEMETA_CORE_LANG_ERROR OFF CACHE BOOL "disable")
11-
set(SOURCEMETA_CORE_LANG_STACKTRACE OFF CACHE BOOL "disable")
1211
set(SOURCEMETA_CORE_GZIP OFF CACHE BOOL "disable")
1312
set(SOURCEMETA_CORE_JSONL OFF CACHE BOOL "disable JSONL support")
1413
set(SOURCEMETA_CORE_JSONRPC OFF CACHE BOOL "disable")
1514
set(SOURCEMETA_CORE_MCP OFF CACHE BOOL "disable")
1615
set(SOURCEMETA_CORE_HTTP OFF CACHE BOOL "disable")
1716
set(SOURCEMETA_CORE_SEMVER OFF CACHE BOOL "disable")
1817
set(SOURCEMETA_CORE_MARKDOWN OFF CACHE BOOL "disable")
19-
set(SOURCEMETA_CORE_YAML ON CACHE BOOL "needed by Blaze")
20-
set(SOURCEMETA_CORE_CONTRIB_GOOGLETEST ${JSONBINPACK_TESTS} CACHE BOOL "GoogleTest")
2118
set(SOURCEMETA_CORE_CONTRIB_GOOGLEBENCHMARK OFF CACHE BOOL "GoogleBenchmark")
2219
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/core")
2320
include(Sourcemeta)

‎test/compiler/2020_12_compiler_any_test.cc‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
#include <gtest/gtest.h>
2-
31
#include <sourcemeta/core/json.h>
2+
#include <sourcemeta/core/test.h>
43
#include <sourcemeta/jsonbinpack/compiler.h>
54

6-
TEST(JSONBinPack_Compiler_Any_2020_12, enum_singleton) {
5+
TEST(enum_singleton) {
76
auto schema = sourcemeta::core::parse_json(R"JSON({
87
"$schema": "https://json-schema.org/draft/2020-12/schema",
98
"enum": [ 2 ]
@@ -23,7 +22,7 @@ TEST(JSONBinPack_Compiler_Any_2020_12, enum_singleton) {
2322
EXPECT_EQ(schema, expected);
2423
}
2524

26-
TEST(JSONBinPack_Compiler_Any_2020_12, const_scalar) {
25+
TEST(const_scalar) {
2726
auto schema = sourcemeta::core::parse_json(R"JSON({
2827
"$schema": "https://json-schema.org/draft/2020-12/schema",
2928
"const": 2
@@ -43,7 +42,7 @@ TEST(JSONBinPack_Compiler_Any_2020_12, const_scalar) {
4342
EXPECT_EQ(schema, expected);
4443
}
4544

46-
TEST(JSONBinPack_Compiler_Any_2020_12, enum_small_top_level) {
45+
TEST(enum_small_top_level) {
4746
auto schema = sourcemeta::core::parse_json(R"JSON({
4847
"$schema": "https://json-schema.org/draft/2020-12/schema",
4948
"enum": [ 1, 2, 3 ]
@@ -63,7 +62,7 @@ TEST(JSONBinPack_Compiler_Any_2020_12, enum_small_top_level) {
6362
EXPECT_EQ(schema, expected);
6463
}
6564

66-
TEST(JSONBinPack_Compiler_Any_2020_12, only_metaschema) {
65+
TEST(only_metaschema) {
6766
auto schema = sourcemeta::core::parse_json(R"JSON({
6867
"$schema": "https://json-schema.org/draft/2020-12/schema"
6968
})JSON");
@@ -80,7 +79,7 @@ TEST(JSONBinPack_Compiler_Any_2020_12, only_metaschema) {
8079
EXPECT_EQ(schema, expected);
8180
}
8281

83-
TEST(JSONBinPack_Compiler_Any_2020_12, empty) {
82+
TEST(empty) {
8483
auto schema = sourcemeta::core::parse_json("{}");
8584

8685
sourcemeta::jsonbinpack::compile(

‎test/compiler/2020_12_compiler_integer_test.cc‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
#include <gtest/gtest.h>
2-
31
#include <sourcemeta/core/json.h>
2+
#include <sourcemeta/core/test.h>
43
#include <sourcemeta/jsonbinpack/compiler.h>
54

6-
TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_minimum_8_bit) {
5+
TEST(maximum_minimum_8_bit) {
76
auto schema = sourcemeta::core::parse_json(R"JSON({
87
"$schema": "https://json-schema.org/draft/2020-12/schema",
98
"type": "integer",
@@ -27,7 +26,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_minimum_8_bit) {
2726
EXPECT_EQ(schema, expected);
2827
}
2928

30-
TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_minimum_multiplier_8_bit) {
29+
TEST(maximum_minimum_multiplier_8_bit) {
3130
auto schema = sourcemeta::core::parse_json(R"JSON({
3231
"$schema": "https://json-schema.org/draft/2020-12/schema",
3332
"type": "integer",
@@ -52,7 +51,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_minimum_multiplier_8_bit) {
5251
EXPECT_EQ(schema, expected);
5352
}
5453

55-
TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_minimum_greater_than_8_bit) {
54+
TEST(maximum_minimum_greater_than_8_bit) {
5655
auto schema = sourcemeta::core::parse_json(R"JSON({
5756
"$schema": "https://json-schema.org/draft/2020-12/schema",
5857
"type": "integer",
@@ -75,8 +74,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_minimum_greater_than_8_bit) {
7574
EXPECT_EQ(schema, expected);
7675
}
7776

78-
TEST(JSONBinPack_Compiler_Integer_2020_12,
79-
maximum_minimum_multiplier_greater_than_8_bit) {
77+
TEST(maximum_minimum_multiplier_greater_than_8_bit) {
8078
auto schema = sourcemeta::core::parse_json(R"JSON({
8179
"$schema": "https://json-schema.org/draft/2020-12/schema",
8280
"type": "integer",
@@ -100,7 +98,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12,
10098
EXPECT_EQ(schema, expected);
10199
}
102100

103-
TEST(JSONBinPack_Compiler_Integer_2020_12, minimum) {
101+
TEST(minimum) {
104102
auto schema = sourcemeta::core::parse_json(R"JSON({
105103
"$schema": "https://json-schema.org/draft/2020-12/schema",
106104
"type": "integer",
@@ -122,7 +120,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, minimum) {
122120
EXPECT_EQ(schema, expected);
123121
}
124122

125-
TEST(JSONBinPack_Compiler_Integer_2020_12, minimum_multiplier) {
123+
TEST(minimum_multiplier) {
126124
auto schema = sourcemeta::core::parse_json(R"JSON({
127125
"$schema": "https://json-schema.org/draft/2020-12/schema",
128126
"type": "integer",
@@ -145,7 +143,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, minimum_multiplier) {
145143
EXPECT_EQ(schema, expected);
146144
}
147145

148-
TEST(JSONBinPack_Compiler_Integer_2020_12, maximum) {
146+
TEST(maximum) {
149147
auto schema = sourcemeta::core::parse_json(R"JSON({
150148
"$schema": "https://json-schema.org/draft/2020-12/schema",
151149
"type": "integer",
@@ -167,7 +165,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, maximum) {
167165
EXPECT_EQ(schema, expected);
168166
}
169167

170-
TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_multiplier) {
168+
TEST(maximum_multiplier) {
171169
auto schema = sourcemeta::core::parse_json(R"JSON({
172170
"$schema": "https://json-schema.org/draft/2020-12/schema",
173171
"type": "integer",
@@ -190,7 +188,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, maximum_multiplier) {
190188
EXPECT_EQ(schema, expected);
191189
}
192190

193-
TEST(JSONBinPack_Compiler_Integer_2020_12, unbounded) {
191+
TEST(unbounded) {
194192
auto schema = sourcemeta::core::parse_json(R"JSON({
195193
"$schema": "https://json-schema.org/draft/2020-12/schema",
196194
"type": "integer"
@@ -210,7 +208,7 @@ TEST(JSONBinPack_Compiler_Integer_2020_12, unbounded) {
210208
EXPECT_EQ(schema, expected);
211209
}
212210

213-
TEST(JSONBinPack_Compiler_Integer_2020_12, unbounded_multiplier) {
211+
TEST(unbounded_multiplier) {
214212
auto schema = sourcemeta::core::parse_json(R"JSON({
215213
"$schema": "https://json-schema.org/draft/2020-12/schema",
216214
"type": "integer",

‎test/compiler/2020_12_compiler_number_test.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
#include <gtest/gtest.h>
2-
31
#include <sourcemeta/core/json.h>
2+
#include <sourcemeta/core/test.h>
43
#include <sourcemeta/jsonbinpack/compiler.h>
54

6-
TEST(JSONBinPack_Compiler_Number_2020_12, arbitrary) {
5+
TEST(arbitrary) {
76
auto schema = sourcemeta::core::parse_json(R"JSON({
87
"$schema": "https://json-schema.org/draft/2020-12/schema",
98
"type": "number"

‎test/compiler/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
sourcemeta_googletest(NAMESPACE sourcemeta PROJECT jsonbinpack NAME compiler
2-
FOLDER "JSON BinPack/Compiler"
1+
sourcemeta_test(NAMESPACE sourcemeta PROJECT jsonbinpack NAME compiler
32
SOURCES
43
canonicalizer_test.cc compiler_test.cc
54

‎test/compiler/canonicalizer_test.cc‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
#include <gtest/gtest.h>
2-
31
#include <sourcemeta/blaze/foundation.h>
42
#include <sourcemeta/core/json.h>
3+
#include <sourcemeta/core/test.h>
54
#include <sourcemeta/jsonbinpack/compiler.h>
65

76
#include <optional> // std::optional
@@ -19,24 +18,33 @@ static auto test_resolver(std::string_view identifier)
1918
}
2019
}
2120

22-
TEST(JSONBinPack_Canonicalizer, unsupported_draft) {
21+
TEST(unsupported_draft) {
2322
auto schema = sourcemeta::core::parse_json(R"JSON({
2423
"$schema": "https://jsonbinpack.sourcemeta.com/draft/unknown",
2524
"type": "boolean"
2625
})JSON");
2726

28-
EXPECT_THROW(sourcemeta::jsonbinpack::canonicalize(
29-
schema, sourcemeta::blaze::schema_walker, test_resolver),
30-
sourcemeta::blaze::SchemaUnknownBaseDialectError);
27+
try {
28+
sourcemeta::jsonbinpack::canonicalize(
29+
schema, sourcemeta::blaze::schema_walker, test_resolver);
30+
FAIL();
31+
} catch (const sourcemeta::blaze::SchemaUnknownBaseDialectError &error) {
32+
EXPECT_STREQ(error.what(),
33+
"Could not determine the base dialect of the schema");
34+
}
3135
}
3236

33-
TEST(JSONBinPack_Canonicalizer, unknown_draft) {
37+
TEST(unknown_draft) {
3438
auto schema = sourcemeta::core::parse_json(R"JSON({
3539
"type": "boolean"
3640
})JSON");
3741

38-
EXPECT_THROW(sourcemeta::jsonbinpack::canonicalize(
39-
schema, sourcemeta::blaze::schema_walker, test_resolver,
40-
"https://example.com/invalid"),
41-
sourcemeta::blaze::SchemaResolutionError);
42+
try {
43+
sourcemeta::jsonbinpack::canonicalize(
44+
schema, sourcemeta::blaze::schema_walker, test_resolver,
45+
"https://example.com/invalid");
46+
FAIL();
47+
} catch (const sourcemeta::blaze::SchemaResolutionError &error) {
48+
EXPECT_EQ(error.identifier(), "https://example.com/invalid");
49+
}
4250
}

‎test/compiler/compiler_test.cc‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
#include <gtest/gtest.h>
2-
31
#include <sourcemeta/core/json.h>
2+
#include <sourcemeta/core/test.h>
43
#include <sourcemeta/jsonbinpack/compiler.h>
54

65
#include <stdexcept>
76

8-
TEST(JSONBinPack_Compiler, dialect_2020_12) {
7+
TEST(dialect_2020_12) {
98
auto schema = sourcemeta::core::parse_json(R"JSON({
109
"$schema": "https://json-schema.org/draft/2020-12/schema"
1110
})JSON");
@@ -22,7 +21,7 @@ TEST(JSONBinPack_Compiler, dialect_2020_12) {
2221
EXPECT_EQ(schema, expected);
2322
}
2423

25-
TEST(JSONBinPack_Compiler, dialect_2019_09) {
24+
TEST(dialect_2019_09) {
2625
auto schema = sourcemeta::core::parse_json(R"JSON({
2726
"$schema": "https://json-schema.org/draft/2019-09/schema"
2827
})JSON");
@@ -39,7 +38,7 @@ TEST(JSONBinPack_Compiler, dialect_2019_09) {
3938
EXPECT_EQ(schema, expected);
4039
}
4140

42-
TEST(JSONBinPack_Compiler, dialect_draft7) {
41+
TEST(dialect_draft7) {
4342
auto schema = sourcemeta::core::parse_json(R"JSON({
4443
"$schema": "http://json-schema.org/draft-07/schema#"
4544
})JSON");
@@ -56,7 +55,7 @@ TEST(JSONBinPack_Compiler, dialect_draft7) {
5655
EXPECT_EQ(schema, expected);
5756
}
5857

59-
TEST(JSONBinPack_Compiler, dialect_draft6) {
58+
TEST(dialect_draft6) {
6059
auto schema = sourcemeta::core::parse_json(R"JSON({
6160
"$schema": "http://json-schema.org/draft-06/schema#"
6261
})JSON");
@@ -73,7 +72,7 @@ TEST(JSONBinPack_Compiler, dialect_draft6) {
7372
EXPECT_EQ(schema, expected);
7473
}
7574

76-
TEST(JSONBinPack_Compiler, dialect_draft4) {
75+
TEST(dialect_draft4) {
7776
auto schema = sourcemeta::core::parse_json(R"JSON({
7877
"$schema": "http://json-schema.org/draft-04/schema#"
7978
})JSON");
@@ -90,7 +89,7 @@ TEST(JSONBinPack_Compiler, dialect_draft4) {
9089
EXPECT_EQ(schema, expected);
9190
}
9291

93-
TEST(JSONBinPack_Compiler, dialect_draft3) {
92+
TEST(dialect_draft3) {
9493
auto schema = sourcemeta::core::parse_json(R"JSON({
9594
"$schema": "http://json-schema.org/draft-03/schema#"
9695
})JSON");
@@ -107,7 +106,7 @@ TEST(JSONBinPack_Compiler, dialect_draft3) {
107106
EXPECT_EQ(schema, expected);
108107
}
109108

110-
TEST(JSONBinPack_Compiler, dialect_draft2) {
109+
TEST(dialect_draft2) {
111110
auto schema = sourcemeta::core::parse_json(R"JSON({
112111
"$schema": "http://json-schema.org/draft-02/schema#"
113112
})JSON");
@@ -124,7 +123,7 @@ TEST(JSONBinPack_Compiler, dialect_draft2) {
124123
EXPECT_EQ(schema, expected);
125124
}
126125

127-
TEST(JSONBinPack_Compiler, dialect_draft1) {
126+
TEST(dialect_draft1) {
128127
auto schema = sourcemeta::core::parse_json(R"JSON({
129128
"$schema": "http://json-schema.org/draft-01/schema#"
130129
})JSON");
@@ -141,7 +140,7 @@ TEST(JSONBinPack_Compiler, dialect_draft1) {
141140
EXPECT_EQ(schema, expected);
142141
}
143142

144-
TEST(JSONBinPack_Compiler, dialect_draft0) {
143+
TEST(dialect_draft0) {
145144
auto schema = sourcemeta::core::parse_json(R"JSON({
146145
"$schema": "http://json-schema.org/draft-00/schema#"
147146
})JSON");
@@ -158,7 +157,7 @@ TEST(JSONBinPack_Compiler, dialect_draft0) {
158157
EXPECT_EQ(schema, expected);
159158
}
160159

161-
TEST(JSONBinPack_Compiler, unknown_dialect_default) {
160+
TEST(unknown_dialect_default) {
162161
auto schema = sourcemeta::core::parse_json(R"JSON({
163162
"type": "integer"
164163
})JSON");
@@ -179,25 +178,32 @@ TEST(JSONBinPack_Compiler, unknown_dialect_default) {
179178
EXPECT_EQ(schema, expected);
180179
}
181180

182-
TEST(JSONBinPack_Compiler, unknown_dialect_without_default) {
181+
TEST(unknown_dialect_without_default) {
183182
auto schema = sourcemeta::core::parse_json(R"JSON({
184183
"type": "integer"
185184
})JSON");
186185

187-
EXPECT_THROW(
188-
sourcemeta::jsonbinpack::compile(schema, sourcemeta::blaze::schema_walker,
189-
sourcemeta::blaze::schema_resolver),
190-
sourcemeta::blaze::SchemaUnknownBaseDialectError);
186+
try {
187+
sourcemeta::jsonbinpack::compile(schema, sourcemeta::blaze::schema_walker,
188+
sourcemeta::blaze::schema_resolver);
189+
FAIL();
190+
} catch (const sourcemeta::blaze::SchemaUnknownBaseDialectError &error) {
191+
EXPECT_STREQ(error.what(),
192+
"Could not determine the base dialect of the schema");
193+
}
191194
}
192195

193-
TEST(JSONBinPack_Compiler, invalid_dialect) {
196+
TEST(invalid_dialect) {
194197
auto schema = sourcemeta::core::parse_json(R"JSON({
195198
"$schema": "https://foo.com",
196199
"type": "integer"
197200
})JSON");
198201

199-
EXPECT_THROW(
200-
sourcemeta::jsonbinpack::compile(schema, sourcemeta::blaze::schema_walker,
201-
sourcemeta::blaze::schema_resolver),
202-
sourcemeta::blaze::SchemaResolutionError);
202+
try {
203+
sourcemeta::jsonbinpack::compile(schema, sourcemeta::blaze::schema_walker,
204+
sourcemeta::blaze::schema_resolver);
205+
FAIL();
206+
} catch (const sourcemeta::blaze::SchemaResolutionError &error) {
207+
EXPECT_EQ(error.identifier(), "https://foo.com");
208+
}
203209
}

‎test/runtime/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
sourcemeta_googletest(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
2-
FOLDER "JSON BinPack/Runtime"
1+
sourcemeta_test(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
32
SOURCES
43
decode_any_test.cc
54
decode_array_test.cc

0 commit comments

Comments
 (0)