From d8e718453cf7a29045b648683b0645094bc66ae9 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 Jan 2021 20:22:49 +0100 Subject: Add support for writing terse collections --- test/meson.build | 13 ++++- test/run_test_suite.py | 12 +++- test/terse/blank_object.ttl | 2 + test/terse/blank_subject.ttl | 2 + test/terse/collection_object.ttl | 2 + test/terse/collection_subject.ttl | 2 + test/terse/manifest.ttl | 38 +++++++++++++ test/test_terse_write.c | 114 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 182 insertions(+), 3 deletions(-) create mode 100644 test/terse/blank_object.ttl create mode 100644 test/terse/blank_subject.ttl create mode 100644 test/terse/collection_object.ttl create mode 100644 test/terse/collection_subject.ttl create mode 100644 test/terse/manifest.ttl create mode 100644 test/test_terse_write.c (limited to 'test') diff --git a/test/meson.build b/test/meson.build index 8a76bbb6..cd748c0c 100644 --- a/test/meson.build +++ b/test/meson.build @@ -16,6 +16,7 @@ unit_tests = [ 'sink', 'statement', 'string', + 'terse_write', 'uri', 'world', 'writer', @@ -163,7 +164,7 @@ if get_option('utils') serd_suites = ['good', 'bad'] serd_base = 'http://drobilla.net/sw/serd/test/' - ### Run all suites with no special arguments + ### Run basic suites with no special arguments foreach name : serd_suites manifest = files(name / 'manifest.ttl') base_uri = serd_base + name + '/' @@ -174,6 +175,16 @@ if get_option('utils') timeout: 240) endforeach + ### The terse suite needs to be run with -t + test('terse', run_test_suite, + args: script_args + ['--osyntax', 'turtle', + files('terse/manifest.ttl'), + serd_base + 'terse/', + '--', '-t'], + env: test_env, + suite: ['rdf', 'serd'], + timeout: 240) + ### The lax suite is special because it is run twice... lax_manifest = files('lax/manifest.ttl') lax_base_uri = serd_base + name + '/' diff --git a/test/run_test_suite.py b/test/run_test_suite.py index 5f1d29c8..5223060d 100755 --- a/test/run_test_suite.py +++ b/test/run_test_suite.py @@ -229,6 +229,7 @@ def test_suite( base_uri, report_filename, input_syntax, + output_syntax, command_prefix, ): """Run all tests in a test suite manifest.""" @@ -253,8 +254,11 @@ def test_suite( def run_tests(test_class, tests, expected_return, results): thru_flags = [["-e"], ["-f"], ["-b"], ["-r", "http://example.org/"]] - osyntax = _test_output_syntax(test_class) thru_options_iter = _option_combinations(thru_flags) + if output_syntax is not None: + osyntax = output_syntax + else: + osyntax = _test_output_syntax(test_class) if input_syntax is not None: isyntax = input_syntax @@ -267,7 +271,9 @@ def test_suite( test_name = os.path.basename(test_uri_path) test_path = os.path.join(test_dir, test_name) - command = command_prefix + ["-a"] + [test_path, test_uri] + command = ( + command_prefix + ["-a", "-o", osyntax] + [test_path, test_uri] + ) command_string = " ".join(shlex.quote(c) for c in command) out_filename = os.path.join(out_test_dir, test_name + ".out") @@ -383,6 +389,7 @@ def main(): parser.add_argument("--report", help="path to write result report to") parser.add_argument("--serdi", default="serdi", help="path to serdi") parser.add_argument("--syntax", default=None, help="input syntax") + parser.add_argument("--osyntax", default=None, help="output syntax") parser.add_argument("--wrapper", default="", help="executable wrapper") parser.add_argument("manifest", help="test suite manifest.ttl file") parser.add_argument("base_uri", help="base URI for tests") @@ -400,6 +407,7 @@ def main(): args.base_uri, args.report, args.syntax, + args.osyntax, command_prefix, ) diff --git a/test/terse/blank_object.ttl b/test/terse/blank_object.ttl new file mode 100644 index 00000000..270e406b --- /dev/null +++ b/test/terse/blank_object.ttl @@ -0,0 +1,2 @@ +@prefix eg: . +eg:s eg:p1 [ eg:p11 1 ; eg:p12 2 ] ; eg:p2 [ eg:p23 3 ; eg:p24 4 ] . diff --git a/test/terse/blank_subject.ttl b/test/terse/blank_subject.ttl new file mode 100644 index 00000000..5e3303f9 --- /dev/null +++ b/test/terse/blank_subject.ttl @@ -0,0 +1,2 @@ +@prefix eg: . +[] eg:p1 1 ; eg:p2 2 . diff --git a/test/terse/collection_object.ttl b/test/terse/collection_object.ttl new file mode 100644 index 00000000..3310c418 --- /dev/null +++ b/test/terse/collection_object.ttl @@ -0,0 +1,2 @@ +@prefix eg: . +eg:s eg:p1 ( 1 2 ) ; eg:p2 ( 3 4 ) . diff --git a/test/terse/collection_subject.ttl b/test/terse/collection_subject.ttl new file mode 100644 index 00000000..43670620 --- /dev/null +++ b/test/terse/collection_subject.ttl @@ -0,0 +1,2 @@ +@prefix eg: . +( 1 2 ) eg:p3 3 ; eg:p4 4 . diff --git a/test/terse/manifest.ttl b/test/terse/manifest.ttl new file mode 100644 index 00000000..f8dca816 --- /dev/null +++ b/test/terse/manifest.ttl @@ -0,0 +1,38 @@ +@prefix mf: . +@prefix rdf: . +@prefix rdfs: . +@prefix rdft: . + +<> + rdf:type mf:Manifest ; + rdfs:comment "Serd terse serialisation test cases" ; + mf:entries ( + <#blank_object> + <#blank_subject> + <#collection_object> + <#collection_subject> + ) . + +<#blank_object> + rdf:type rdft:TestTurtleEval ; + mf:name "blank_object" ; + mf:action ; + mf:result . + +<#blank_subject> + rdf:type rdft:TestTurtleEval ; + mf:name "blank_subject" ; + mf:action ; + mf:result . + +<#collection_object> + rdf:type rdft:TestTurtleEval ; + mf:name "collection_object" ; + mf:action ; + mf:result . + +<#collection_subject> + rdf:type rdft:TestTurtleEval ; + mf:name "collection_subject" ; + mf:action ; + mf:result . diff --git a/test/test_terse_write.c b/test/test_terse_write.c new file mode 100644 index 00000000..9a19d493 --- /dev/null +++ b/test/test_terse_write.c @@ -0,0 +1,114 @@ +/* + Copyright 2019-2020 David Robillard + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#undef NDEBUG + +#include "serd/serd.h" + +#include +#include +#include +#include + +#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" + +static void +check_output(SerdWriter* writer, SerdBuffer* buffer, const char* expected) +{ + serd_writer_finish(writer); + serd_buffer_sink_finish(buffer); + + const char* output = (const char*)buffer->buf; + + fprintf(stderr, "%s", output); + assert(!strcmp(output, expected)); + + buffer->len = 0; +} + +static int +test(void) +{ + SerdBuffer buffer = {NULL, 0}; + SerdWorld* world = serd_world_new(); + SerdEnv* env = serd_env_new(SERD_EMPTY_STRING()); + SerdNodes* nodes = serd_nodes_new(); + + const SerdNode* b1 = serd_nodes_blank(nodes, SERD_STRING("b1")); + const SerdNode* l1 = serd_nodes_blank(nodes, SERD_STRING("l1")); + const SerdNode* l2 = serd_nodes_blank(nodes, SERD_STRING("l2")); + const SerdNode* s1 = serd_nodes_string(nodes, SERD_STRING("s1")); + const SerdNode* s2 = serd_nodes_string(nodes, SERD_STRING("s2")); + + const SerdNode* rdf_first = + serd_nodes_uri(nodes, SERD_STRING(NS_RDF "first")); + + const SerdNode* rdf_value = + serd_nodes_uri(nodes, SERD_STRING(NS_RDF "value")); + + const SerdNode* rdf_rest = serd_nodes_uri(nodes, SERD_STRING(NS_RDF "rest")); + const SerdNode* rdf_nil = serd_nodes_uri(nodes, SERD_STRING(NS_RDF "nil")); + + serd_env_set_prefix(env, SERD_STRING("rdf"), SERD_STRING(NS_RDF)); + + SerdWriter* writer = serd_writer_new( + world, SERD_TURTLE, 0, env, (SerdWriteFunc)serd_buffer_sink, &buffer); + + const SerdSink* sink = serd_writer_sink(writer); + + // Simple lone list + serd_sink_write(sink, SERD_TERSE_S | SERD_LIST_S, l1, rdf_first, s1, NULL); + serd_sink_write(sink, 0, l1, rdf_rest, l2, NULL); + serd_sink_write(sink, 0, l2, rdf_first, s2, NULL); + serd_sink_write(sink, 0, l2, rdf_rest, rdf_nil, NULL); + check_output(writer, &buffer, "( \"s1\" \"s2\" ) .\n"); + + // Nested terse lists + serd_sink_write(sink, + SERD_TERSE_S | SERD_LIST_S | SERD_TERSE_O | SERD_LIST_O, + l1, + rdf_first, + l2, + NULL); + serd_sink_write(sink, 0, l2, rdf_first, s1, NULL); + serd_sink_write(sink, 0, l1, rdf_rest, rdf_nil, NULL); + serd_sink_write(sink, 0, l2, rdf_rest, rdf_nil, NULL); + check_output(writer, &buffer, "( ( \"s1\" ) ) .\n"); + + // List as object + serd_sink_write( + sink, SERD_EMPTY_S | SERD_LIST_O | SERD_TERSE_O, b1, rdf_value, l1, NULL); + serd_sink_write(sink, 0, l1, rdf_first, s1, NULL); + serd_sink_write(sink, 0, l1, rdf_rest, l2, NULL); + serd_sink_write(sink, 0, l2, rdf_first, s2, NULL); + serd_sink_write(sink, 0, l2, rdf_rest, rdf_nil, NULL); + check_output(writer, &buffer, "[]\n\trdf:value ( \"s1\" \"s2\" ) .\n"); + + serd_buffer_sink_finish(&buffer); + serd_writer_free(writer); + serd_nodes_free(nodes); + serd_env_free(env); + serd_world_free(world); + free(buffer.buf); + + return 0; +} + +int +main(void) +{ + return test(); +} -- cgit v1.2.1