Remove old hipchat token from Travis CI config.

[apps/agl-service-can-low-level.git] / tests / 8byte_tests.c

diff --git a/tests/8byte_tests.c b/tests/8byte_tests.c
index 5ebb0db..64554ac 100644 (file)
--- a/tests/8byte_tests.c
+++ b/tests/8byte_tests.c
@@ -1,6 +1,7 @@
 #include <check.h>
 #include <stdint.h>
 #include <bitfield/bitfield.h>
+#include <bitfield/8byte.h>
 
 START_TEST (test_large_bitmask)
 {
@@ -12,7 +13,7 @@ END_TEST
 START_TEST (test_one_bit_not_swapped)
 {
     uint64_t data = 0x80;
-    uint64_t result = eightbyte_get_bit_field(data, 0, 1, false);
+    uint64_t result = eightbyte_get_bitfield(data, 0, 1, false);
     fail_if(result == 1);
 }
 END_TEST
@@ -20,7 +21,7 @@ END_TEST
 START_TEST (test_one_bit)
 {
     uint64_t data = 0x8000000000000000;
-    uint64_t result = eightbyte_get_bit_field(data, 0, 1, false);
+    uint64_t result = eightbyte_get_bitfield(data, 0, 1, false);
     fail_unless(result == 0x1,
             "First bit in 0x%llx was 0x%llx instead of 0x1", data, result);
 }
@@ -29,7 +30,7 @@ END_TEST
 START_TEST (test_32_bit_parse)
 {
     uint64_t data = 0x0402574d555a0401;
-    uint64_t result = eightbyte_get_bit_field(data, 16, 32, false);
+    uint64_t result = eightbyte_get_bitfield(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,
@@ -40,7 +41,7 @@ END_TEST
 START_TEST (test_16_bit_parse)
 {
     uint64_t data = 0xF34DFCFF00000000;
-    uint64_t result = eightbyte_get_bit_field(data, 16, 16, false);
+    uint64_t result = eightbyte_get_bitfield(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,
@@ -51,13 +52,13 @@ END_TEST
 START_TEST (test_one_byte)
 {
     uint64_t data = 0xFA00000000000000;
-    uint64_t result = eightbyte_get_bit_field(data, 0, 4, false);
+    uint64_t result = eightbyte_get_bitfield(data, 0, 4, false);
     fail_unless(result == 0xF,
             "First nibble in 0x%llx was 0x%llx instead of 0xF", data, result);
-    result = eightbyte_get_bit_field(data, 4, 4, false);
+    result = eightbyte_get_bitfield(data, 4, 4, false);
     fail_unless(result == 0xA,
             "Second nibble in 0x%llx was 0x%llx instead of 0xA", data, result);
-    result = eightbyte_get_bit_field(data, 0, 8, false);
+    result = eightbyte_get_bitfield(data, 0, 8, false);
     fail_unless(result == 0xFA,
             "All bits in 0x%llx were 0x%llx instead of 0x%llx", data, result, data);
 }
@@ -66,19 +67,19 @@ END_TEST
 START_TEST (test_multi_byte)
 {
     uint64_t data = 0x12FA000000000000;
-    uint64_t result = eightbyte_get_bit_field(data, 0, 4, false);
+    uint64_t result = eightbyte_get_bitfield(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 = eightbyte_get_bit_field(data, 4, 4, false);
+    result = eightbyte_get_bitfield(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 = eightbyte_get_bit_field(data, 8, 4, false);
+    result = eightbyte_get_bitfield(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 = eightbyte_get_bit_field(data, 12, 4, false);
+    result = eightbyte_get_bitfield(data, 12, 4, false);
     fail_unless(result == 0xA,
             "Second 4 bits in 0x%llx was 0x%llx instead of 0x2", (data >> 48) % 0xF,
             result);
@@ -88,7 +89,7 @@ END_TEST
 START_TEST (test_get_multi_byte)
 {
     uint64_t data = 0x12FA000000000000;
-    uint64_t result = eightbyte_get_bit_field(data, 0, 9, false);
+    uint64_t result = eightbyte_get_bitfield(data, 0, 9, false);
     ck_assert_int_eq(result, 0x25);
 }
 END_TEST
@@ -96,31 +97,31 @@ END_TEST
 START_TEST (test_get_off_byte_boundary)
 {
     uint64_t data = 0x000012FA00000000;
-    uint64_t result = eightbyte_get_bit_field(data, 12, 8, false);
+    uint64_t result = eightbyte_get_bitfield(data, 12, 8, false);
     ck_assert_int_eq(result, 0x01);
 } END_TEST
 
 START_TEST (test_set_wont_fit)
 {
     uint64_t data = 0;
-    fail_if(set_bit_field(&data, 100, 0, 1));
+    fail_if(eightbyte_set_bitfield(100, 0, 1, &data));
 }
 END_TEST
 
 START_TEST (test_set_field)
 {
     uint64_t data = 0;
-    fail_unless(set_bit_field(&data, 1, 0, 1));
-    uint64_t result = eightbyte_get_bit_field(data, 0, 1, false);
+    fail_unless(eightbyte_set_bitfield(1, 0, 1, &data));
+    uint64_t result = eightbyte_get_bitfield(data, 0, 1, false);
     ck_assert_int_eq(result, 0x1);
     data = 0;
-    fail_unless(set_bit_field(&data, 1, 1, 1));
-    result = eightbyte_get_bit_field(data, 1, 1, false);
+    fail_unless(eightbyte_set_bitfield(1, 1, 1, &data));
+    result = eightbyte_get_bitfield(data, 1, 1, false);
     ck_assert_int_eq(result, 0x1);
 
     data = 0;
-    fail_unless(set_bit_field(&data, 0xf, 3, 4));
-    result = eightbyte_get_bit_field(data, 3, 4, false);
+    fail_unless(eightbyte_set_bitfield(0xf, 3, 4, &data));
+    result = eightbyte_get_bitfield(data, 3, 4, false);
     ck_assert_int_eq(result, 0xf);
 }
 END_TEST
@@ -128,14 +129,14 @@ END_TEST
 START_TEST (test_set_doesnt_clobber_existing_data)
 {
     uint64_t data = 0xFFFC4DF300000000;
-    fail_unless(set_bit_field(&data, 0x4fc8, 16, 16));
-    uint64_t result = eightbyte_get_bit_field(data, 16, 16, false);
+    fail_unless(eightbyte_set_bitfield(0x4fc8, 16, 16, &data));
+    uint64_t result = eightbyte_get_bitfield(data, 16, 16, false);
     fail_unless(result == 0x4fc8,
             "Field retrieved in 0x%llx was 0x%llx instead of 0x%x", data, result,
             0xc84f);
 
     data = 0x8000000000000000;
-    fail_unless(set_bit_field(&data, 1, 21, 1));
+    fail_unless(eightbyte_set_bitfield(1, 21, 1, &data));
     fail_unless(data == 0x8000040000000000LLU,
             "Expected combined value 0x8000040000000000 but got 0x%llx%llx",
             data >> 32, data);
@@ -145,8 +146,8 @@ END_TEST
 START_TEST (test_set_off_byte_boundary)
 {
     uint64_t data = 0xFFFC4DF300000000;
-    fail_unless(set_bit_field(&data, 0x12, 12, 8));
-    uint64_t result = eightbyte_get_bit_field(data, 12, 12, false);
+    fail_unless(eightbyte_set_bitfield(0x12, 12, 8, &data));
+    uint64_t result = eightbyte_get_bitfield(data, 12, 12, false);
     ck_assert_int_eq(result,0x12d);
 }
 END_TEST
@@ -154,15 +155,15 @@ END_TEST
 START_TEST (test_set_odd_number_of_bits)
 {
     uint64_t data = 0xFFFC4DF300000000LLU;
-    fail_unless(set_bit_field(&data, 0x12, 11, 5));
-    uint64_t result = eightbyte_get_bit_field(data, 11, 5, false);
+    fail_unless(eightbyte_set_bitfield(0x12, 11, 5, &data));
+    uint64_t result = eightbyte_get_bitfield(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 = eightbyte_get_bit_field(data, 11, 5, false);
+    fail_unless(eightbyte_set_bitfield(0x2, 11, 5, &data));
+    result = eightbyte_get_bitfield(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);