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

more test cases

Browse source
This commit is contained in:
Niels 2015-02-08 14:38:52 +01:00
parent 43ec6477bd
commit 7cd9067ea2
3 changed files with 264 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/json.hpp
View file

@ -44,7 +44,7 @@ namespace nlohmann
(@c bool by default) (@c bool by default)
@tparam NumberIntegerType type for JSON integer numbers @tparam NumberIntegerType type for JSON integer numbers
(@c int64_t by default) (@c int64_t by default)
@tparam NumberFloatType type for JSON floating point numbers @tparam NumberFloatType type for JSON floating-point numbers
(@c double by default) (@c double by default)
*/ */
template < template <
@ -104,7 +104,7 @@ class basic_json
using boolean_t = BooleanType; using boolean_t = BooleanType;
/// a type for a number (integer) /// a type for a number (integer)
using number_integer_t = NumberIntegerType; using number_integer_t = NumberIntegerType;
/// a type for a number (floating point) /// a type for a number (floating-point)
using number_float_t = NumberFloatType; using number_float_t = NumberFloatType;
/// a type for list initialization /// a type for list initialization
using list_init_t = std::initializer_list<basic_json>; using list_init_t = std::initializer_list<basic_json>;
@ -127,7 +127,7 @@ class basic_json
boolean_t boolean; boolean_t boolean;
/// number (integer) /// number (integer)
number_integer_t number_integer; number_integer_t number_integer;
/// number (floating point) /// number (floating-point)
number_float_t number_float; number_float_t number_float;
/// default constructor (for null values) /// default constructor (for null values)
@ -142,7 +142,7 @@ class basic_json
json_value(boolean_t v) : boolean(v) {} json_value(boolean_t v) : boolean(v) {}
/// constructor for numbers (integer) /// constructor for numbers (integer)
json_value(number_integer_t v) : number_integer(v) {} json_value(number_integer_t v) : number_integer(v) {}
/// constructor for numbers (floating point) /// constructor for numbers (floating-point)
json_value(number_float_t v) : number_float(v) {} json_value(number_float_t v) : number_float(v) {}
}; };
@ -166,7 +166,7 @@ class basic_json
boolean, boolean,
/// number value (integer) /// number value (integer)
number_integer, number_integer,
/// number value (floating point) /// number value (floating-point)
number_float number_float
}; };
@ -306,12 +306,12 @@ class basic_json
: m_type(value_t::number_integer), m_value(number_integer_t(value)) : m_type(value_t::number_integer), m_value(number_integer_t(value))
{} {}
/// create a floating point number (explicit) /// create a floating-point number (explicit)
inline basic_json(const number_float_t& value) inline basic_json(const number_float_t& value)
: m_type(value_t::number_float), m_value(value) : m_type(value_t::number_float), m_value(value)
{} {}
/// create a floating point number (implicit) /// create a floating-point number (implicit)
template<typename T, typename = typename template<typename T, typename = typename
std::enable_if< std::enable_if<
std::is_constructible<number_float_t, T>::value and std::is_constructible<number_float_t, T>::value and

14
src/json.hpp.re2c
View file

@ -44,7 +44,7 @@ namespace nlohmann
(@c bool by default) (@c bool by default)
@tparam NumberIntegerType type for JSON integer numbers @tparam NumberIntegerType type for JSON integer numbers
(@c int64_t by default) (@c int64_t by default)
@tparam NumberFloatType type for JSON floating point numbers @tparam NumberFloatType type for JSON floating-point numbers
(@c double by default) (@c double by default)
*/ */
template < template <
@ -104,7 +104,7 @@ class basic_json
using boolean_t = BooleanType; using boolean_t = BooleanType;
/// a type for a number (integer) /// a type for a number (integer)
using number_integer_t = NumberIntegerType; using number_integer_t = NumberIntegerType;
/// a type for a number (floating point) /// a type for a number (floating-point)
using number_float_t = NumberFloatType; using number_float_t = NumberFloatType;
/// a type for list initialization /// a type for list initialization
using list_init_t = std::initializer_list<basic_json>; using list_init_t = std::initializer_list<basic_json>;
@ -127,7 +127,7 @@ class basic_json
boolean_t boolean; boolean_t boolean;
/// number (integer) /// number (integer)
number_integer_t number_integer; number_integer_t number_integer;
/// number (floating point) /// number (floating-point)
number_float_t number_float; number_float_t number_float;
/// default constructor (for null values) /// default constructor (for null values)
@ -142,7 +142,7 @@ class basic_json
json_value(boolean_t v) : boolean(v) {} json_value(boolean_t v) : boolean(v) {}
/// constructor for numbers (integer) /// constructor for numbers (integer)
json_value(number_integer_t v) : number_integer(v) {} json_value(number_integer_t v) : number_integer(v) {}
/// constructor for numbers (floating point) /// constructor for numbers (floating-point)
json_value(number_float_t v) : number_float(v) {} json_value(number_float_t v) : number_float(v) {}
}; };
@ -166,7 +166,7 @@ class basic_json
boolean, boolean,
/// number value (integer) /// number value (integer)
number_integer, number_integer,
/// number value (floating point) /// number value (floating-point)
number_float number_float
}; };
@ -306,12 +306,12 @@ class basic_json
: m_type(value_t::number_integer), m_value(number_integer_t(value)) : m_type(value_t::number_integer), m_value(number_integer_t(value))
{} {}
/// create a floating point number (explicit) /// create a floating-point number (explicit)
inline basic_json(const number_float_t& value) inline basic_json(const number_float_t& value)
: m_type(value_t::number_float), m_value(value) : m_type(value_t::number_float), m_value(value)
{} {}
/// create a floating point number (implicit) /// create a floating-point number (implicit)
template<typename T, typename = typename template<typename T, typename = typename
std::enable_if< std::enable_if<
std::is_constructible<number_float_t, T>::value and std::is_constructible<number_float_t, T>::value and

250
test/unit.cpp
View file

@ -643,4 +643,254 @@ TEST_CASE("Constructors")
CHECK(j == j_reference); CHECK(j == j_reference);
} }
} }
SECTION("create a floating-point number (explicit)")
{
SECTION("uninitialized value")
{
json::number_float_t n{};
json j(n);
CHECK(j.type() == json::value_t::number_float);
}
SECTION("initialized value")
{
json::number_float_t n(42.23);
json j(n);
CHECK(j.type() == json::value_t::number_float);
}
}
SECTION("create a floating-point number (implicit)")
{
// reference object
json::number_float_t n_reference = 42.23;
json j_reference(n_reference);
SECTION("float")
{
float n = 42.23;
json j(n);
CHECK(j.type() == json::value_t::number_float);
CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
}
SECTION("double")
{
double n = 42.23;
json j(n);
CHECK(j.type() == json::value_t::number_float);
CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
}
SECTION("long double")
{
long double n = 42.23;
json j(n);
CHECK(j.type() == json::value_t::number_float);
CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
}
SECTION("floating-point literal without suffix")
{
json j(42.23);
CHECK(j.type() == json::value_t::number_float);
CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
}
SECTION("integer literal with f suffix")
{
json j(42.23f);
CHECK(j.type() == json::value_t::number_float);
CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
}
SECTION("integer literal with l suffix")
{
json j(42.23l);
CHECK(j.type() == json::value_t::number_float);
CHECK(j.m_value.number_float == Approx(j_reference.m_value.number_float));
}
}
SECTION("create a container (array or object) from an initializer list")
{
SECTION("empty initializer list")
{
SECTION("explicit")
{
std::initializer_list<json> l;
json j(l);
CHECK(j.type() == json::value_t::object);
}
SECTION("implicit")
{
json j {};
CHECK(j.type() == json::value_t::null);
}
}
SECTION("one element")
{
SECTION("array")
{
SECTION("explicit")
{
std::initializer_list<json> l = {json(json::array_t())};
json j(l);
CHECK(j.type() == json::value_t::array);
}
SECTION("implicit")
{
json j {json::array_t()};
CHECK(j.type() == json::value_t::array);
}
}
SECTION("object")
{
SECTION("explicit")
{
std::initializer_list<json> l = {json(json::object_t())};
json j(l);
CHECK(j.type() == json::value_t::array);
}
SECTION("implicit")
{
json j {json::object_t()};
CHECK(j.type() == json::value_t::array);
}
}
SECTION("string")
{
SECTION("explicit")
{
std::initializer_list<json> l = {json("Hello world")};
json j(l);
CHECK(j.type() == json::value_t::array);
}
SECTION("implicit")
{
json j {"Hello world"};
CHECK(j.type() == json::value_t::array);
}
}
SECTION("boolean")
{
SECTION("explicit")
{
std::initializer_list<json> l = {json(true)};
json j(l);
CHECK(j.type() == json::value_t::array);
}
SECTION("implicit")
{
json j {true};
CHECK(j.type() == json::value_t::array);
}
}
SECTION("number (integer)")
{
SECTION("explicit")
{
std::initializer_list<json> l = {json(1)};
json j(l);
CHECK(j.type() == json::value_t::array);
}
SECTION("implicit")
{
json j {1};
CHECK(j.type() == json::value_t::array);
}
}
SECTION("number (floating-point)")
{
SECTION("explicit")
{
std::initializer_list<json> l = {json(42.23)};
json j(l);
CHECK(j.type() == json::value_t::array);
}
SECTION("implicit")
{
json j {42.23};
CHECK(j.type() == json::value_t::array);
}
}
}
SECTION("more elements")
{
SECTION("explicit")
{
std::initializer_list<json> l = {1, 42.23, true, nullptr, json::object_t(), json::array_t()};
json j(l);
CHECK(j.type() == json::value_t::array);
}
SECTION("implicit")
{
json j {1, 42.23, true, nullptr, json::object_t(), json::array_t()};
CHECK(j.type() == json::value_t::array);
}
}
SECTION("implicit type deduction")
{
SECTION("object")
{
json j { {"one", 1}, {"two", 2.2}, {"three", false} };
CHECK(j.type() == json::value_t::object);
}
SECTION("array")
{
json j { {"one", 1}, {"two", 2.2}, {"three", false}, 13 };
CHECK(j.type() == json::value_t::array);
}
}
SECTION("explicit type deduction")
{
SECTION("empty object")
{
json j = json::object();
CHECK(j.type() == json::value_t::object);
}
SECTION("object")
{
json j = json::object({ {"one", 1}, {"two", 2.2}, {"three", false} });
CHECK(j.type() == json::value_t::object);
}
SECTION("object with error")
{
CHECK_THROWS_AS(json::object({ {"one", 1}, {"two", 2.2}, {"three", false}, 13 }), std::logic_error);
}
SECTION("empty array")
{
json j = json::array();
CHECK(j.type() == json::value_t::array);
}
SECTION("array")
{
json j = json::array({ {"one", 1}, {"two", 2.2}, {"three", false} });
CHECK(j.type() == json::value_t::array);
}
}
}
} }