remove need for idx_double_nan_setup to have cleaner tests EOSIO#2460

brightwoo · Apr 18, 2018 · f05a40e · f05a40e
1 parent a76f7a0
commit f05a40e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/contracts/test_api/test_api.hpp b/contracts/test_api/test_api.hpp
@@ -92,7 +92,6 @@ struct test_db {
    static void test_invalid_access(uint64_t receiver, uint64_t code, uint64_t action);
 
    static void idx_double_nan_create_fail(uint64_t receiver, uint64_t code, uint64_t action);
-   static void idx_double_nan_setup(uint64_t receiver, uint64_t code, uint64_t action);
    static void idx_double_nan_modify_fail(uint64_t receiver, uint64_t code, uint64_t action);
    static void idx_double_nan_lookup_fail(uint64_t receiver, uint64_t code, uint64_t action);
 };

diff --git a/contracts/test_api_db/test_api_db.cpp b/contracts/test_api_db/test_api_db.cpp
@@ -18,7 +18,6 @@ extern "C" {
       WASM_TEST_HANDLER_EX(test_db, idx64_upperbound);
       WASM_TEST_HANDLER_EX(test_db, test_invalid_access);
       WASM_TEST_HANDLER_EX(test_db, idx_double_nan_create_fail);
-      WASM_TEST_HANDLER_EX(test_db, idx_double_nan_setup);
       WASM_TEST_HANDLER_EX(test_db, idx_double_nan_modify_fail);
       WASM_TEST_HANDLER_EX(test_db, idx_double_nan_lookup_fail);
 

diff --git a/contracts/test_api_db/test_db.cpp b/contracts/test_api_db/test_db.cpp
@@ -502,13 +502,9 @@ void test_db::idx_double_nan_create_fail(uint64_t receiver, uint64_t, uint64_t)
    db_idx_double_store( N(nan), N(nan), receiver, 0, &x); // should fail
 }
 
-void test_db::idx_double_nan_setup(uint64_t receiver, uint64_t, uint64_t) {
+void test_db::idx_double_nan_modify_fail(uint64_t receiver, uint64_t, uint64_t) {
    double x = 0.0;
    db_idx_double_store( N(nan), N(nan), receiver, 0, &x);
-}
-
-void test_db::idx_double_nan_modify_fail(uint64_t receiver, uint64_t, uint64_t) {
-   double x;
    auto itr = db_idx_double_find_primary(receiver, N(nan), N(nan), &x, 0);
    x = 0.0;
    x = x / x; // create a NaN
@@ -521,6 +517,7 @@ void test_db::idx_double_nan_lookup_fail(uint64_t receiver, uint64_t, uint64_t)
 
    uint64_t pk;
    double x = 0.0;
+   db_idx_double_store( N(nan), N(nan), receiver, 0, &x);
    x = x / x; // create a NaN
    switch( lookup_type ) {
       case 0: // find

diff --git a/tests/api_tests/api_tests.cpp b/tests/api_tests/api_tests.cpp
@@ -947,7 +947,6 @@ BOOST_FIXTURE_TEST_CASE(db_tests, TESTER) { try {
 
    CALL_TEST_FUNCTION_AND_CHECK_EXCEPTION( *this, "test_db", "idx_double_nan_create_fail", {},
                                            transaction_exception, "NaN is not an allowed value for a secondary key");
-   CALL_TEST_FUNCTION( *this, "test_db", "idx_double_nan_setup", {});
    CALL_TEST_FUNCTION_AND_CHECK_EXCEPTION( *this, "test_db", "idx_double_nan_modify_fail", {},
                                            transaction_exception, "NaN is not an allowed value for a secondary key");