Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/command_decode.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <sourcemeta/jsonbinpack/compiler.h>
#include <sourcemeta/jsonbinpack/runtime.h>

#include <cassert> // assert
#include <filesystem> // std::filesystem
#include <fstream> // std::ifstream

Expand Down Expand Up @@ -55,11 +54,7 @@ auto sourcemeta::jsonschema::decode(const sourcemeta::core::Options &options)
custom_resolver);
const auto encoding{sourcemeta::jsonbinpack::load(schema)};

std::ifstream input_stream{
sourcemeta::core::weakly_canonical(options.positional().front()),
std::ios::binary};
assert(!input_stream.fail());
assert(input_stream.is_open());
auto input_stream{sourcemeta::core::read_file(options.positional().front())};

const std::filesystem::path output{options.positional().at(1)};
std::ofstream output_stream(sourcemeta::core::weakly_canonical(output),
Expand Down
1 change: 1 addition & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1196,6 +1196,7 @@ add_jsonschema_test(decode/pass_schema_less)
add_jsonschema_test(decode/pass_schema_less_jsonl)
add_jsonschema_test(decode/pass_schema_less_jsonl_verbose)
add_jsonschema_test(decode/fail_no_document)
add_jsonschema_test(decode/fail_enoent)
add_jsonschema_test(decode/fail_truncated_document)
add_jsonschema_test(decode/fail_no_output)

Expand Down
28 changes: 28 additions & 0 deletions test/decode/fail_enoent.clitest
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// A nonexistent input file is reported the same way every other command
// reports it, not as a bogus "truncated document" error

// Other input error
RUN decode document.binpack decoded.json STDIN /dev/null IN . INTO result_0.txt EXPECTING 6

REPLACE $CWD WITH '[CWD]' IN result_0.txt

WRITE expected_0.txt UNTIL EOF
2> error: No such file or directory
2> at file path [CWD]/document.binpack
EOF

COMPARE result_0.txt AGAINST expected_0.txt

// Other input error
RUN decode document.binpack decoded.json --json STDIN /dev/null IN . INTO result_1.txt EXPECTING 6

REPLACE $CWD WITH '[CWD]' IN result_1.txt

WRITE expected_1.txt UNTIL EOF
1> {
1> "error": "No such file or directory",
1> "filePath": "[CWD]/document.binpack"
1> }
EOF

COMPARE result_1.txt AGAINST expected_1.txt
Loading