X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2F8byte_tests.c;h=5ebb0db0b918639e14c5fe1514338dfeccd22718;hb=6f3a81ed8287357b54aad16bff27495c6eaca6df;hp=6166f1d7a235f1ede914bf0f828a6c98cd06dd3a;hpb=e5a2a6b9550319cf05c3a3ae93080b17d322078e;p=apps%2Flow-level-can-service.git

diff --git a/tests/8byte_tests.c b/tests/8byte_tests.c
index 6166f1d..5ebb0db 100644
--- a/tests/8byte_tests.c
+++ b/tests/8byte_tests.c
@@ -4,9 +4,6 @@
 
 START_TEST (test_large_bitmask)
 {
-    // yeah, this isn't a public method but I wanted to unit test it to track
-    // down a bug
-    extern uint64_t bitmask(int numBits);
     uint64_t result = bitmask(32);
     fail_if(result != 0xffffffff);
 }
@@ -15,7 +12,7 @@ END_TEST
 START_TEST (test_one_bit_not_swapped)
 {
     uint64_t data = 0x80;
-    uint64_t result = get_bit_field(data, 0, 1, false);
+    uint64_t result = eightbyte_get_bit_field(data, 0, 1, false);
     fail_if(result == 1);
 }
 END_TEST
@@ -23,7 +20,7 @@ END_TEST
 START_TEST (test_one_bit)
 {
     uint64_t data = 0x8000000000000000;
-    uint64_t result = get_bit_field(data, 0, 1, false);
+    uint64_t result = eightbyte_get_bit_field(data, 0, 1, false);
     fail_unless(result == 0x1,
             "First bit in 0x%llx was 0x%llx instead of 0x1", data, result);
 }
@@ -32,7 +29,7 @@ END_TEST
 START_TEST (test_32_bit_parse)
 {
     uint64_t data = 0x0402574d555a0401;
-    uint64_t result = get_bit_field(data, 16, 32, false);
+    uint64_t result = eightbyte_get_bit_field(data, 16, 32, false);
     uint64_t expectedValue = 0x574d555a;
     fail_unless(result == expectedValue,
             "Field retrieved in 0x%llx was 0x%llx instead of 0x%llx", data,
@@ -43,7 +40,7 @@ END_TEST
 START_TEST (test_16_bit_parse)
 {
     uint64_t data = 0xF34DFCFF00000000;
-    uint64_t result = get_bit_field(data, 16, 16, false);
+    uint64_t result = eightbyte_get_bit_field(data, 16, 16, false);
     uint64_t expectedValue = 0xFCFF;
     fail_unless(result == expectedValue,
             "Field retrieved in 0x%llx was 0x%llx instead of 0x%llx", data,
@@ -54,13 +51,13 @@ END_TEST
 START_TEST (test_one_byte)
 {
     uint64_t data = 0xFA00000000000000;
-    uint64_t result = get_bit_field(data, 0, 4, false);
+    uint64_t result = eightbyte_get_bit_field(data, 0, 4, false);
     fail_unless(result == 0xF,
             "First nibble in 0x%llx was 0x%llx instead of 0xF", data, result);
-    result = get_bit_field(data, 4, 4, false);
+    result = eightbyte_get_bit_field(data, 4, 4, false);
     fail_unless(result == 0xA,
             "Second nibble in 0x%llx was 0x%llx instead of 0xA", data, result);
-    result = get_bit_field(data, 0, 8, false);
+    result = eightbyte_get_bit_field(data, 0, 8, false);
     fail_unless(result == 0xFA,
             "All bits in 0x%llx were 0x%llx instead of 0x%llx", data, result, data);
 }
@@ -69,19 +66,19 @@ END_TEST
 START_TEST (test_multi_byte)
 {
     uint64_t data = 0x12FA000000000000;
-    uint64_t result = get_bit_field(data, 0, 4, false);
+    uint64_t result = eightbyte_get_bit_field(data, 0, 4, false);
     fail_unless(result == 0x1,
             "First 4 bits in 0x%llx was 0x%llx instead of 0xF", (data >> 60) & 0xF,
             result);
-    result = get_bit_field(data, 4, 4, false);
+    result = eightbyte_get_bit_field(data, 4, 4, false);
     fail_unless(result == 0x2,
             "Second 4 bits in 0x%llx was 0x%llx instead of 0xA", (data >> 56) & 0xF,
             result);
-    result = get_bit_field(data, 8, 4, false);
+    result = eightbyte_get_bit_field(data, 8, 4, false);
     fail_unless(result == 0xF,
             "First 4 bits in 0x%llx was 0x%llx instead of 0x1", (data >> 52) & 0xF,
             result);
-    result = get_bit_field(data, 12, 4, false);
+    result = eightbyte_get_bit_field(data, 12, 4, false);
     fail_unless(result == 0xA,
             "Second 4 bits in 0x%llx was 0x%llx instead of 0x2", (data >> 48) % 0xF,
             result);
@@ -91,7 +88,7 @@ END_TEST
 START_TEST (test_get_multi_byte)
 {
     uint64_t data = 0x12FA000000000000;
-    uint64_t result = get_bit_field(data, 0, 9, false);
+    uint64_t result = eightbyte_get_bit_field(data, 0, 9, false);
     ck_assert_int_eq(result, 0x25);
 }
 END_TEST
@@ -99,7 +96,7 @@ END_TEST
 START_TEST (test_get_off_byte_boundary)
 {
     uint64_t data = 0x000012FA00000000;
-    uint64_t result = get_bit_field(data, 12, 8, false);
+    uint64_t result = eightbyte_get_bit_field(data, 12, 8, false);
     ck_assert_int_eq(result, 0x01);
 } END_TEST
 
@@ -114,16 +111,16 @@ START_TEST (test_set_field)
 {
     uint64_t data = 0;
     fail_unless(set_bit_field(&data, 1, 0, 1));
-    uint64_t result = get_bit_field(data, 0, 1, false);
+    uint64_t result = eightbyte_get_bit_field(data, 0, 1, false);
     ck_assert_int_eq(result, 0x1);
     data = 0;
     fail_unless(set_bit_field(&data, 1, 1, 1));
-    result = get_bit_field(data, 1, 1, false);
+    result = eightbyte_get_bit_field(data, 1, 1, false);
     ck_assert_int_eq(result, 0x1);
 
     data = 0;
     fail_unless(set_bit_field(&data, 0xf, 3, 4));
-    result = get_bit_field(data, 3, 4, false);
+    result = eightbyte_get_bit_field(data, 3, 4, false);
     ck_assert_int_eq(result, 0xf);
 }
 END_TEST
@@ -132,7 +129,7 @@ START_TEST (test_set_doesnt_clobber_existing_data)
 {
     uint64_t data = 0xFFFC4DF300000000;
     fail_unless(set_bit_field(&data, 0x4fc8, 16, 16));
-    uint64_t result = get_bit_field(data, 16, 16, false);
+    uint64_t result = eightbyte_get_bit_field(data, 16, 16, false);
     fail_unless(result == 0x4fc8,
             "Field retrieved in 0x%llx was 0x%llx instead of 0x%x", data, result,
             0xc84f);
@@ -149,7 +146,7 @@ START_TEST (test_set_off_byte_boundary)
 {
     uint64_t data = 0xFFFC4DF300000000;
     fail_unless(set_bit_field(&data, 0x12, 12, 8));
-    uint64_t result = get_bit_field(data, 12, 12, false);
+    uint64_t result = eightbyte_get_bit_field(data, 12, 12, false);
     ck_assert_int_eq(result,0x12d);
 }
 END_TEST
@@ -158,45 +155,74 @@ START_TEST (test_set_odd_number_of_bits)
 {
     uint64_t data = 0xFFFC4DF300000000LLU;
     fail_unless(set_bit_field(&data, 0x12, 11, 5));
-    uint64_t result = get_bit_field(data, 11, 5, false);
+    uint64_t result = eightbyte_get_bit_field(data, 11, 5, false);
     fail_unless(result == 0x12,
             "Field set in 0x%llx%llx%llx%llx was 0x%llx instead of 0x%llx", data, result,
             0x12);
 
     data = 0xFFFC4DF300000000LLU;
     fail_unless(set_bit_field(&data, 0x2, 11, 5));
-    result = get_bit_field(data, 11, 5, false);
+    result = eightbyte_get_bit_field(data, 11, 5, false);
     fail_unless(result == 0x2,
             "Field set in 0x%llx%llx%llx%llx was 0x%llx instead of 0x%llx", data, result,
             0x2);
 }
 END_TEST
 
-START_TEST(test_nth_byte)
+START_TEST(test_eightbyte_get_byte)
 {
     uint64_t data = 0x00000000F34DFCFF;
-    uint8_t result = nth_byte(data, 0);
+    uint8_t result = eightbyte_get_byte(data, 0, false);
     uint8_t expected = 0x0;
     ck_assert_int_eq(result, expected);
 
-    result = nth_byte(data, 4);
+    result = eightbyte_get_byte(data, 4, false);
     expected = 0xF3;
     ck_assert_int_eq(result, expected);
 
-    result = nth_byte(data, 5);
+    result = eightbyte_get_byte(data, 5, false);
     expected = 0x4D;
     ck_assert_int_eq(result, expected);
 
-    result = nth_byte(data, 6);
+    result = eightbyte_get_byte(data, 6, false);
     expected = 0xFC;
     ck_assert_int_eq(result, expected);
 
-    result = nth_byte(data, 7);
+    result = eightbyte_get_byte(data, 7, false);
     expected = 0xFF;
     ck_assert_int_eq(result, expected);
 }
 END_TEST
 
+START_TEST(test_eightbyte_get_nibble)
+{
+    uint64_t data = 0x00000000F34DFCFF;
+    uint8_t result = eightbyte_get_nibble(data, 0, false);
+    uint8_t expected = 0x0;
+    ck_assert_int_eq(result, expected);
+
+    result = eightbyte_get_nibble(data, 2, false);
+    expected = 0x0;
+    ck_assert_int_eq(result, expected);
+
+    result = eightbyte_get_nibble(data, 8, false);
+    expected = 0xF;
+    ck_assert_int_eq(result, expected);
+
+    result = eightbyte_get_nibble(data, 9, false);
+    expected = 0x3;
+    ck_assert_int_eq(result, expected);
+
+    result = eightbyte_get_nibble(data, 10, false);
+    expected = 0x4;
+    ck_assert_int_eq(result, expected);
+
+    result = eightbyte_get_nibble(data, 13, false);
+    expected = 0xC;
+    ck_assert_int_eq(result, expected);
+}
+END_TEST
+
 Suite* bitfieldSuite(void) {
     Suite* s = suite_create("bitfield");
     TCase *tc_core = tcase_create("core");
@@ -214,7 +240,8 @@ Suite* bitfieldSuite(void) {
     tcase_add_test(tc_core, test_set_doesnt_clobber_existing_data);
     tcase_add_test(tc_core, test_set_off_byte_boundary);
     tcase_add_test(tc_core, test_set_odd_number_of_bits);
-    tcase_add_test(tc_core, test_nth_byte);
+    tcase_add_test(tc_core, test_eightbyte_get_nibble);
+    tcase_add_test(tc_core, test_eightbyte_get_byte);
     suite_add_tcase(s, tc_core);
 
     return s;