X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Ftests_structures%2Ftest_hash_table.cpp;fp=nucleus%2Flibrary%2Ftests_structures%2Ftest_hash_table.cpp;h=4d06bab46f11d5a14e64dd09d48d58fd49976ce0;hb=7b39f7e279005c8466ef508220a532ce2aa4abf8;hp=ca0d465fcf9b980617680b0a68e1739436b3f493;hpb=3fbd372b35b15a19fb171d5ae34294ff7b1e6485;p=feisty_meow.git diff --git a/nucleus/library/tests_structures/test_hash_table.cpp b/nucleus/library/tests_structures/test_hash_table.cpp index ca0d465f..4d06bab4 100644 --- a/nucleus/library/tests_structures/test_hash_table.cpp +++ b/nucleus/library/tests_structures/test_hash_table.cpp @@ -259,7 +259,7 @@ bool test_hash_table::test_add() ////////////// -hash_table *_hang_on = NIL; +hash_table *_hang_on = NULL_POINTER; // must be set before calling the apply method. #undef UNIT_BASE_THIS_OBJECT @@ -424,9 +424,9 @@ bool test_hash_table::test_find() _hits[FIND - FIRST_TEST]++; int rand_indy = randomizer().inclusive(0, _keys_in_use.elements() - 1); int find_key = _keys_in_use[rand_indy]; - data_shuttle *found = NIL; + data_shuttle *found = NULL_POINTER; ASSERT_TRUE(_the_table.find(find_key, found), "key should be there as expected"); - ASSERT_NON_NULL(found, "contents should not be NIL"); + ASSERT_NON_NULL(found, "contents should not be null"); ASSERT_EQUAL(found->food_bar, find_key, "stored key should be same as real key"); ASSERT_TRUE(found->snacky_string.length(), "stored string should have length"); return true; @@ -461,9 +461,9 @@ bool test_hash_table::test_find_zap_add() int rand_indy = randomizer().inclusive(0, _keys_in_use.elements() - 1); // this is another key list invariant function, if it works. int find_key = _keys_in_use[rand_indy]; - data_shuttle *found = NIL; + data_shuttle *found = NULL_POINTER; ASSERT_TRUE(_the_table.find(find_key, found), "key should be locateable"); - ASSERT_NON_NULL(found, "key should not have NIL contents"); + ASSERT_NON_NULL(found, "key should not have null contents"); ASSERT_EQUAL(found->food_bar, find_key, "stored key should be equal to real key"); ASSERT_TRUE(found->snacky_string.length(), "stored string should not have zero length"); // zap.