From: Tor Didriksen Date: January 14 2011 2:38pm Subject: bzr commit into mysql-trunk branch (tor.didriksen:3366) List-Archive: http://lists.mysql.com/commits/128791 Message-Id: <20110114143807.731DA3784@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4319920987284210315==" --===============4319920987284210315== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/next-mr-gtest-bitmap/ based on revid:tor.didriksen@stripped 3366 Tor Didriksen 2011-01-14 unit test for bitmap: use << rather than printf for error reporting modified: unittest/gunit/my_bitmap-t.cc === modified file 'unittest/gunit/my_bitmap-t.cc' --- a/unittest/gunit/my_bitmap-t.cc 2011-01-14 12:38:40 +0000 +++ b/unittest/gunit/my_bitmap-t.cc 2011-01-14 14:38:04 +0000 @@ -43,10 +43,10 @@ bool test_set_get_clear_bit(MY_BITMAP *m } return FALSE; error1: - printf("Error in set bit, bit %u, bitsize = %u", test_bit, bitsize); + ADD_FAILURE() << "Error in set bit, bit " << test_bit; return TRUE; error2: - printf("Error in clear bit, bit %u, bitsize = %u", test_bit, bitsize); + ADD_FAILURE() << "Error in clear bit, bit " << test_bit; return TRUE; } @@ -66,10 +66,10 @@ bool test_flip_bit(MY_BITMAP *map, uint } return FALSE; error1: - printf("Error in flip bit 1, bit %u, bitsize = %u", test_bit, bitsize); + ADD_FAILURE() << "Error in flip bit 1, bit " << test_bit; return TRUE; error2: - printf("Error in flip bit 2, bit %u, bitsize = %u", test_bit, bitsize); + ADD_FAILURE() << "Error in flip bit 2, bit " << test_bit; return TRUE; } @@ -102,22 +102,22 @@ bool test_get_all_bits(MY_BITMAP *map, u goto error4; return FALSE; error1: - printf("Error in set_all, bitsize = %u", bitsize); + ADD_FAILURE() << "Error in set_all"; return TRUE; error2: - printf("Error in clear_all, bitsize = %u", bitsize); + ADD_FAILURE() << "Error in clear_all"; return TRUE; error3: - printf("Error in bitmap_is_set_all, bitsize = %u", bitsize); + ADD_FAILURE() << "Error in bitmap_is_set_all"; return TRUE; error4: - printf("Error in bitmap_is_clear_all, bitsize = %u", bitsize); + ADD_FAILURE() << "Error in bitmap_is_clear_all"; return TRUE; error5: - printf("Error in set_all through set_prefix, bitsize = %u", bitsize); + ADD_FAILURE() << "Error in set_all through set_prefix"; return TRUE; error6: - printf("Error in clear_all through set_prefix, bitsize = %u", bitsize); + ADD_FAILURE() << "Error in clear_all through set_prefix"; return TRUE; } @@ -206,24 +206,24 @@ bool test_compare_operators(MY_BITMAP *m } return FALSE; error1: - printf("intersect error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); + ADD_FAILURE() << "intersect error " + << "size1=" << test_bit1 << ",size2=" << test_bit2; return TRUE; error2: - printf("union error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); + ADD_FAILURE() << "union error " + << "size1=" << test_bit1 << ",size2=" << test_bit2; return TRUE; error3: - printf("xor error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); + ADD_FAILURE() << "xor error " + << "size1=" << test_bit1 << ",size2=" << test_bit2; return TRUE; error4: - printf("subtract error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); + ADD_FAILURE() << "subtract error " + << "size1=" << test_bit1 << ",size2=" << test_bit2; return TRUE; error5: - printf("invert error bitsize=%u,size=%u", bitsize, - test_bit1); + ADD_FAILURE() << "invert error " + << "size1=" << test_bit1 << ",size2=" << test_bit2; return TRUE; } @@ -246,10 +246,10 @@ bool test_count_bits_set(MY_BITMAP *map, goto error2; return FALSE; error1: - printf("No bits set bitsize = %u", bitsize); + ADD_FAILURE() << "No bits set"; return TRUE; error2: - printf("Wrong count of bits set, bitsize = %u", bitsize); + ADD_FAILURE() << "Wrong count of bits set"; return TRUE; } @@ -271,10 +271,10 @@ bool test_get_first_bit(MY_BITMAP *map, } return FALSE; error1: - printf("get_first_set error bitsize=%u,prefix_size=%u",bitsize,test_bit); + ADD_FAILURE() << "get_first_set error ,prefix_size=%u" << test_bit; return TRUE; error2: - printf("get_first error bitsize= %u, prefix_size= %u",bitsize,test_bit); + ADD_FAILURE() << "get_first error prefix_size=" << test_bit; return TRUE; } @@ -293,7 +293,7 @@ bool test_get_next_bit(MY_BITMAP *map, u } return FALSE; error1: - printf("get_next error bitsize= %u, prefix_size= %u", bitsize,test_bit); + ADD_FAILURE() << "get_next error prefix_size=" << test_bit; return TRUE; } @@ -321,13 +321,13 @@ bool test_prefix(MY_BITMAP *map, uint bi } return FALSE; error1: - printf("prefix1 error bitsize = %u, prefix_size = %u", bitsize,test_bit); + ADD_FAILURE() << "prefix1 error, prefix_size = " << test_bit; return TRUE; error2: - printf("prefix2 error bitsize = %u, prefix_size = %u", bitsize,test_bit); + ADD_FAILURE() << "prefix2 error, prefix_size = " << test_bit; return TRUE; error3: - printf("prefix3 error bitsize = %u, prefix_size = %u", bitsize,test_bit); + ADD_FAILURE() << "prefix3 error, prefix_size = " << test_bit; return TRUE; } @@ -352,47 +352,47 @@ INSTANTIATE_TEST_CASE_P(Foo, BitMapTest, TEST_P(BitMapTest, TestSetGetClearBit) { - EXPECT_FALSE(test_set_get_clear_bit(&map, bitsize)); + EXPECT_FALSE(test_set_get_clear_bit(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestFlipBit) { - EXPECT_FALSE(test_flip_bit(&map, bitsize)); + EXPECT_FALSE(test_flip_bit(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestOperators) { - EXPECT_FALSE(test_operators(&map, bitsize)); + EXPECT_FALSE(test_operators(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestGetAllBits) { - EXPECT_FALSE(test_get_all_bits(&map, bitsize)); + EXPECT_FALSE(test_get_all_bits(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestCompareOperators) { - EXPECT_FALSE(test_compare_operators(&map, bitsize)); + EXPECT_FALSE(test_compare_operators(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestCountBitsSet) { - EXPECT_FALSE(test_count_bits_set(&map, bitsize)); + EXPECT_FALSE(test_count_bits_set(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestGetFirstBit) { - EXPECT_FALSE(test_get_first_bit(&map, bitsize)); + EXPECT_FALSE(test_get_first_bit(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestGetNextBit) { - EXPECT_FALSE(test_get_next_bit(&map, bitsize)); + EXPECT_FALSE(test_get_next_bit(&map, bitsize)) << "bitsize=" << bitsize; } TEST_P(BitMapTest, TestPrefix) { - EXPECT_FALSE(test_prefix(&map, bitsize)); + EXPECT_FALSE(test_prefix(&map, bitsize)) << "bitsize=" << bitsize; } #endif --===============4319920987284210315== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # tcf6cnevzg5zgbty # target_branch: file:///export/home/didrik/repo/next-mr-gtest-bitmap/ # testament_sha1: bf58ac94bcdc62de7b65f9a9c08fb418857ec959 # timestamp: 2011-01-14 15:38:07 +0100 # base_revision_id: tor.didriksen@stripped\ # g33qwq8x1hjoo4h7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfhQev8ABBDfgEAUU2f//38l XsC////wYAY/PEfQDyMLbWw0ANjmmJkyaMJgmJpgEwCGCMCMAlEKngp7TTSYoD0g2oABoaAAAOaY mTJowmCYmmATAIYIwIwDNSJpqRppp6gNAAAAAAAAEUkp6ZNTTQHqYgyGgGmmg0aABoAkUBGgmSMC E0yMk09TEGgaBo0ZM9nUcgA/f5zfIwMGSSVw000jhpzySQcaIi5tFL+cSiCFZSDnOU8EYNJRQg+K PMv8DtEJX529eqJtgl7eTTdZ2wRcXFxMwmERSrVlMqytKgpXUvTxpyUiZWcQK0kSsi0kTnExKowY MGAwHYUJRFCC81lpJLA0u8SawQ8xtrVoPMHxNZFDj8KIN6CS/asGVaeWnhlQpb+ev97CNaQhmoF2 cJEf8GfyVoCJlPieW5HDzpB8mRS3dznr1TRRXh8zMpMBTYxoGMf1oJG1NU/BJLEIYbAOBCFNpCgt 7mBDYaq04T4prM4lkjbeFuqR1b8/FKs1okXJGlb3KIjDAgjuaTa8GeLN7OtxjKUkV8btgSjKkpqI LZBCnYheelige5ip5WsFpqbx+RD7c0JUaidKO2ZK6h1xVQXpcCM4DPQertopITmZMiCZOm2JsFal d3CxkS7VEFcL3nZlbKhTKxw7IzMkY8tu4J0Bc7QAe1vqKS2FTgheuQFwwkJ3jOpkjGEhhgbrXdBM 1iHNG1F5eQ2RCqOAzIwPrBxDoYt7GKlAiG5ludjf3wC6+oF8NCsYEIYi2oktrQujdAC+lRyzC3D5 CByB9SQqL311xY5znMqYKTmXLAowC585GwqzGBriVzVk4x6OnoaPvyXzXFtliWIK1lIkIPGGeLlB 5mBuiRTIsxxWnQGREtJ34kFYxGKz5FIC1yw442ziUN+Gp/obbtOna04bdDWMWyLZabCW7UuLGiuj uPPfG8MsccnPCBQgnRyKhSrqit4Z0gvjroQHQAhcEDrSEAyEBOhbSlJFETXpRyRKrLzTqWVTxACx owwYxMyp4qlj2VPdCj3Q0ENIT7ACkAPZUm+0M6p8ofKHLJUn00NNUzoXeqIiIjDIUzPJL4MF08qE Aim1L3QgM96G7pB6fafTy78MwXry+zOQTHbgiRjCTEAozqDxGjlU6eqoz4dA29hrYiRBSESHLIkQ QIYEKfXuHEoFp19GMhLwbdNdwXHle2kbFoXCvSNkZO+jz6uu2CpNSIyX24610M0jbKEc1q+3YQgH LITe35i9NeJ0TeivgNqVVIb+61DJVbfLorW2gE1cX9y5Pdg8ElP1FCN91ryXbBGzS58ZJJOgHQhs ZgGqCanzh2eHHgdZ1xFE2kTlsP07unvXEFAhrAPQeMWHIF50RoeLY/EpHmban6hDqDji/QDNBAfA ga9hpnovZxSI1gUBcVE3JFgwj0U/jhpSeeoepdeS1O8IioxNiEu6YKoKUOELhxlQXwZxuhQEpGKC WOelSCEqd2wxavtu8EL5IOSXJU4YnRWTkdnH9nXa0UZVqCikPslII7Rb7OUnbQL24jTaYfQ6fnUN MusyQrkeE/6B5jS/DDm4gG9I+aQwimewazmYmJuEcXBmkd8GoEarptu0XBXo/12vOAYv2BilJoTa xayaRBRCCRow77TJ7ATRHDzQJ7PUCrerfScukSPSXC/MQxXD2pkEXlG5QH4T3z9YLTZkxsYyB3Rv BqyDijiiAgiDW3HBjYJNl4VftLw3MnzKw07H9VJDG0RjLZvJgi+oVowRWMBpjZCBBjUR1FDOevtY I8kDPqlCzHwz1HmlAPUdA4eWgXFl5ncr2CUE4i+lOGJmfTFxJDTC4GiiROUKKg0AoGL5RLyxRVXF 6pq7ZZRTEPSNn/F3JFOFCQ+FB6/w --===============4319920987284210315==--