TheCloud/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-08-04 10:36:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

#ifdef stuff that should only be used with JSON_USE_EXCEPTION.

Browse Source
This commit is contained in:
bcsgh 2025-03-16 16:09:01 -07:00
parent 1ecfc091f7
commit 8751d1528e
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test_lib_json/jsontest.h
View File

@ -228,6 +228,8 @@ TestResult& checkStringEqual(TestResult& result, const Json::String& expected,
JsonTest::ToJsonString(actual), __FILE__, \ JsonTest::ToJsonString(actual), __FILE__, \
__LINE__, #expected " == " #actual) __LINE__, #expected " == " #actual)
#if JSON_USE_EXCEPTION
/// \brief Asserts that a given expression throws an exception /// \brief Asserts that a given expression throws an exception
#define JSONTEST_ASSERT_THROWS(expr) \ #define JSONTEST_ASSERT_THROWS(expr) \
do { \ do { \
@ -242,6 +244,8 @@ TestResult& checkStringEqual(TestResult& result, const Json::String& expected,
"expected exception thrown: " #expr); \ "expected exception thrown: " #expr); \
} while (0) } while (0)
#endif // JSON_USE_EXCEPTION
/// \brief Begin a fixture test case. /// \brief Begin a fixture test case.
#define JSONTEST_FIXTURE(FixtureType, name) \ #define JSONTEST_FIXTURE(FixtureType, name) \
class Test##FixtureType##name : public FixtureType { \ class Test##FixtureType##name : public FixtureType { \

10
src/test_lib_json/main.cpp
View File

@ -1888,7 +1888,7 @@ JSONTEST_FIXTURE_LOCAL(ValueTest, typeChecksThrowExceptions) {
JSONTEST_ASSERT_THROWS(objVal.asBool()); JSONTEST_ASSERT_THROWS(objVal.asBool());
JSONTEST_ASSERT_THROWS(arrVal.asBool()); JSONTEST_ASSERT_THROWS(arrVal.asBool());
#endif #endif // JSON_USE_EXCEPTION
} }
JSONTEST_FIXTURE_LOCAL(ValueTest, offsetAccessors) { JSONTEST_FIXTURE_LOCAL(ValueTest, offsetAccessors) {
@ -3323,6 +3323,8 @@ JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseWithDetailError) {
} }
JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseWithStackLimit) { JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseWithStackLimit) {
#if JSON_USE_EXCEPTION
Json::CharReaderBuilder b; Json::CharReaderBuilder b;
Json::Value root; Json::Value root;
char const doc[] = R"({ "property" : "value" })"; char const doc[] = R"({ "property" : "value" })";
@ -3342,6 +3344,8 @@ JSONTEST_FIXTURE_LOCAL(CharReaderTest, parseWithStackLimit) {
JSONTEST_ASSERT_THROWS( JSONTEST_ASSERT_THROWS(
reader->parse(doc, doc + std::strlen(doc), &root, &errs)); reader->parse(doc, doc + std::strlen(doc), &root, &errs));
} }
#endif // JSON_USE_EXCEPTION
} }
JSONTEST_FIXTURE_LOCAL(CharReaderTest, testOperator) { JSONTEST_FIXTURE_LOCAL(CharReaderTest, testOperator) {
@ -3961,6 +3965,8 @@ JSONTEST_FIXTURE_LOCAL(IteratorTest, indexes) {
} }
JSONTEST_FIXTURE_LOCAL(IteratorTest, constness) { JSONTEST_FIXTURE_LOCAL(IteratorTest, constness) {
#if JSON_USE_EXCEPTION
Json::Value const v; Json::Value const v;
JSONTEST_ASSERT_THROWS( JSONTEST_ASSERT_THROWS(
Json::Value::iterator it(v.begin())); // Compile, but throw. Json::Value::iterator it(v.begin())); // Compile, but throw.
@ -3982,6 +3988,8 @@ JSONTEST_FIXTURE_LOCAL(IteratorTest, constness) {
} }
Json::String expected = R"(" 9","10","11",)"; Json::String expected = R"(" 9","10","11",)";
JSONTEST_ASSERT_STRING_EQUAL(expected, out.str()); JSONTEST_ASSERT_STRING_EQUAL(expected, out.str());
#endif // JSON_USE_EXCEPTION
} }
struct RValueTest : JsonTest::TestCase {}; struct RValueTest : JsonTest::TestCase {};