Skip to content

Commit 1f0c83f

Browse files
committed
refactor: remove BOOST_*_TEST_ macros
1 parent 70d807c commit 1f0c83f

File tree

1 file changed

+8
-14
lines changed

1 file changed

+8
-14
lines changed

src/univalue/test/object.cpp

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
#include <string>
1414
#include <vector>
1515

16-
#define BOOST_FIXTURE_TEST_SUITE(a, b)
17-
#define BOOST_AUTO_TEST_CASE(funcName) void funcName()
18-
#define BOOST_AUTO_TEST_SUITE_END()
1916
#define BOOST_CHECK(expr) assert(expr)
2017
#define BOOST_CHECK_EQUAL(v1, v2) assert((v1) == (v2))
2118
#define BOOST_CHECK_THROW(stmt, excMatch) { \
@@ -35,9 +32,7 @@
3532
} \
3633
}
3734

38-
BOOST_FIXTURE_TEST_SUITE(univalue_tests, BasicTestingSetup)
39-
40-
BOOST_AUTO_TEST_CASE(univalue_constructor)
35+
void univalue_constructor()
4136
{
4237
UniValue v1;
4338
BOOST_CHECK(v1.isNull());
@@ -85,7 +80,7 @@ BOOST_AUTO_TEST_CASE(univalue_constructor)
8580
BOOST_CHECK_EQUAL(v9.getValStr(), "zappa");
8681
}
8782

88-
BOOST_AUTO_TEST_CASE(univalue_push_throw)
83+
void univalue_push_throw()
8984
{
9085
UniValue j;
9186
BOOST_CHECK_THROW(j.push_back(1), std::runtime_error);
@@ -95,7 +90,7 @@ BOOST_AUTO_TEST_CASE(univalue_push_throw)
9590
BOOST_CHECK_THROW(j.pushKVs({}), std::runtime_error);
9691
}
9792

98-
BOOST_AUTO_TEST_CASE(univalue_typecheck)
93+
void univalue_typecheck()
9994
{
10095
UniValue v1;
10196
BOOST_CHECK(v1.setNumStr("1"));
@@ -144,7 +139,7 @@ BOOST_AUTO_TEST_CASE(univalue_typecheck)
144139
BOOST_CHECK_THROW(vals[1].get_bool(), std::runtime_error);
145140
}
146141

147-
BOOST_AUTO_TEST_CASE(univalue_set)
142+
void univalue_set()
148143
{
149144
UniValue v(UniValue::VSTR, "foo");
150145
v.clear();
@@ -203,7 +198,7 @@ BOOST_AUTO_TEST_CASE(univalue_set)
203198
BOOST_CHECK(v.isNull());
204199
}
205200

206-
BOOST_AUTO_TEST_CASE(univalue_array)
201+
void univalue_array()
207202
{
208203
UniValue arr(UniValue::VARR);
209204

@@ -262,7 +257,7 @@ BOOST_AUTO_TEST_CASE(univalue_array)
262257
BOOST_CHECK_EQUAL(arr.size(), 0);
263258
}
264259

265-
BOOST_AUTO_TEST_CASE(univalue_object)
260+
void univalue_object()
266261
{
267262
UniValue obj(UniValue::VOBJ);
268263
std::string strKey, strVal;
@@ -381,7 +376,7 @@ BOOST_AUTO_TEST_CASE(univalue_object)
381376
static const char *json1 =
382377
"[1.10000000,{\"key1\":\"str\\u0000\",\"key2\":800,\"key3\":{\"name\":\"martian http://test.com\"}}]";
383378

384-
BOOST_AUTO_TEST_CASE(univalue_readwrite)
379+
void univalue_readwrite()
385380
{
386381
UniValue v;
387382
BOOST_CHECK(v.read(json1));
@@ -424,11 +419,10 @@ BOOST_AUTO_TEST_CASE(univalue_readwrite)
424419
BOOST_CHECK(!v.read("{} 42"));
425420
}
426421

427-
BOOST_AUTO_TEST_SUITE_END()
428-
429422
int main (int argc, char *argv[])
430423
{
431424
univalue_constructor();
425+
univalue_push_throw();
432426
univalue_typecheck();
433427
univalue_set();
434428
univalue_array();

0 commit comments

Comments
 (0)