j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add tests to cover the new input adapter

Browse source
This commit is contained in:
Jonathan Dumaresq 2018-12-12 10:18:37 -05:00
parent 3335da622a
commit ef283e0cf8
2 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/nlohmann/detail/input/input_adapters.hpp
View file

@ -52,18 +52,18 @@ Input adapter for stdio file access. This adapter read only 1 byte and do not us
*/ */
class file_input_adapter : public input_adapter_protocol class file_input_adapter : public input_adapter_protocol
{ {
public: public:
explicit file_input_adapter(const FILE *file) noexcept explicit file_input_adapter(const FILE* file) noexcept
: file(file) : file(file)
{} {}
std::char_traits<char>::int_type get_character() noexcept override std::char_traits<char>::int_type get_character() noexcept override
{ {
return fgetc(const_cast<FILE *>(file)); return fgetc(const_cast<FILE*>(file));
} }
private: private:
/// the file pointer to read from /// the file pointer to read from
const FILE * file; const FILE* file;
}; };
@ -309,8 +309,8 @@ class input_adapter
{ {
public: public:
// native support // native support
input_adapter(FILE * file) input_adapter(FILE* file)
: ia(std::make_shared<file_input_adapter>(file)) {} : ia(std::make_shared<file_input_adapter>(file)) {}
/// input adapter for input stream /// input adapter for input stream
input_adapter(std::istream& i) input_adapter(std::istream& i)
: ia(std::make_shared<input_stream_adapter>(i)) {} : ia(std::make_shared<input_stream_adapter>(i)) {}

40
test/src/unit-testsuites.cpp
View file

@ -384,6 +384,46 @@ TEST_CASE("json.org examples")
json j; json j;
CHECK_NOTHROW(f >> j); CHECK_NOTHROW(f >> j);
} }
SECTION("FILE 1.json")
{
auto f = fopen("test/data/json.org/1.json", "r");
json j;
CHECK_NOTHROW(j.parse(f));
fclose(f);
}
SECTION("FILE 2.json")
{
auto f = fopen("test/data/json.org/2.json", "r");
json j;
CHECK_NOTHROW(j.parse(f));
fclose(f);
}
SECTION("FILE 3.json")
{
auto f = fopen("test/data/json.org/3.json", "r");
json j;
CHECK_NOTHROW(j.parse(f));
fclose(f);
}
SECTION("FILE 4.json")
{
auto f = fopen("test/data/json.org/4.json", "r");
json j;
CHECK_NOTHROW(j.parse(f));
fclose(f);
}
SECTION("FILE 5.json")
{
auto f = fopen("test/data/json.org/5.json", "r");
json j;
CHECK_NOTHROW(j.parse(f));
fclose(f);
}
} }
TEST_CASE("RFC 7159 examples") TEST_CASE("RFC 7159 examples")