removed output messages in tests && spaces

This commit is contained in:
Marek Kotewicz 2015-02-06 13:38:28 +01:00
parent 907b18cadc
commit aea7de9556

View File

@ -29,44 +29,32 @@ BOOST_AUTO_TEST_SUITE(natspec)
BOOST_AUTO_TEST_CASE(natspec_eval_function_exists) BOOST_AUTO_TEST_CASE(natspec_eval_function_exists)
{ {
cnote << "testing existance of evaluateExpression function";
// given // given
NatspecExpressionEvaluator e; NatspecExpressionEvaluator e;
// when // when
string result = e.evalExpression("`typeof evaluateExpression`").toStdString(); string result = e.evalExpression("`typeof evaluateExpression`").toStdString();
// then // then
BOOST_CHECK_EQUAL(result, "function"); BOOST_CHECK_EQUAL(result, "function");
} }
BOOST_AUTO_TEST_CASE(natspec_js_eval) BOOST_AUTO_TEST_CASE(natspec_js_eval)
{ {
cnote << "testing natspec basic eval";
// given // given
NatspecExpressionEvaluator e; NatspecExpressionEvaluator e;
// when // when
string result = e.evalExpression("`1 + 2`").toStdString(); string result = e.evalExpression("`1 + 2`").toStdString();
// then // then
BOOST_CHECK_EQUAL(result, "3"); BOOST_CHECK_EQUAL(result, "3");
} }
BOOST_AUTO_TEST_CASE(natspec_create_custom_function) BOOST_AUTO_TEST_CASE(natspec_create_custom_function)
{ {
cnote << "testing creation and usage of custom js function";
// given // given
NatspecExpressionEvaluator e; NatspecExpressionEvaluator e;
// when // when
auto x = e.evalExpression("`test = function (x) { return x + 'ok'; }`"); // ommit var, make it global auto x = e.evalExpression("`test = function (x) { return x + 'ok'; }`"); // ommit var, make it global
string result = e.evalExpression("`test(5)`").toStdString(); string result = e.evalExpression("`test(5)`").toStdString();
string result2 = e.evalExpression("`typeof test`").toStdString(); string result2 = e.evalExpression("`typeof test`").toStdString();
// then // then
BOOST_CHECK_EQUAL(result, "5ok"); BOOST_CHECK_EQUAL(result, "5ok");
BOOST_CHECK_EQUAL(result2, "function"); BOOST_CHECK_EQUAL(result2, "function");
@ -74,22 +62,16 @@ BOOST_AUTO_TEST_CASE(natspec_create_custom_function)
BOOST_AUTO_TEST_CASE(natspec_js_eval_separated_expressions) BOOST_AUTO_TEST_CASE(natspec_js_eval_separated_expressions)
{ {
cnote << "testing natspec evaluation of separated expresioons";
// given // given
NatspecExpressionEvaluator e; NatspecExpressionEvaluator e;
// when // when
string result = e.evalExpression("`x = 1` + `y = 2` will be equal `x + y`").toStdString(); string result = e.evalExpression("`x = 1` + `y = 2` will be equal `x + y`").toStdString();
// then // then
BOOST_CHECK_EQUAL(result, "1 + 2 will be equal 3"); BOOST_CHECK_EQUAL(result, "1 + 2 will be equal 3");
} }
BOOST_AUTO_TEST_CASE(natspec_js_eval_input_params) BOOST_AUTO_TEST_CASE(natspec_js_eval_input_params)
{ {
cnote << "testing natspec evaluation of input params";
// given // given
char const* abi = R"([ char const* abi = R"([
{ {
@ -110,26 +92,19 @@ BOOST_AUTO_TEST_CASE(natspec_js_eval_input_params)
] ]
} }
])"; ])";
NatspecExpressionEvaluator e(abi, "'f'", "[4]"); NatspecExpressionEvaluator e(abi, "'f'", "[4]");
// when // when
string result = e.evalExpression("Will multiply `a` by 7 and return `a * 7`.").toStdString(); string result = e.evalExpression("Will multiply `a` by 7 and return `a * 7`.").toStdString();
// then // then
BOOST_CHECK_EQUAL(result, "Will multiply 4 by 7 and return 28."); BOOST_CHECK_EQUAL(result, "Will multiply 4 by 7 and return 28.");
} }
BOOST_AUTO_TEST_CASE(natspec_js_eval_error) BOOST_AUTO_TEST_CASE(natspec_js_eval_error)
{ {
cnote << "testing natspec evaluation of incorrect input";
// given // given
NatspecExpressionEvaluator e; NatspecExpressionEvaluator e;
// when // when
string result = e.evalExpression("`test(`").toStdString(); string result = e.evalExpression("`test(`").toStdString();
// then // then
BOOST_CHECK_EQUAL(result, "`test(`"); BOOST_CHECK_EQUAL(result, "`test(`");
} }