Skip to content

Commit 3f199c6

Browse files
remove bitwise
1 parent b391447 commit 3f199c6

File tree

3 files changed

+0
-265
lines changed

3 files changed

+0
-265
lines changed

code/logic/fossil/pizza/assume.h

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -70,89 +70,6 @@ extern "C" {
7070
#define ASSUME_NOT_FALSE(actual) \
7171
FOSSIL_TEST_ASSUME((actual), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %s to not be false", (actual) ? "true" : "false"))
7272

73-
// **************************************************
74-
//
75-
// Bitwise assumptions
76-
//
77-
// **************************************************
78-
79-
/**
80-
* @brief Assumes that the given bitwise expression is true.
81-
*
82-
* @param actual The bitwise expression to be evaluated.
83-
*/
84-
#define ASSUME_ITS_BITWISE_TRUE(actual) \
85-
FOSSIL_TEST_ASSUME((actual), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %d to be true", (actual) ? 1 : 0))
86-
87-
/**
88-
* @brief Assumes that the given bitwise expression is false.
89-
*
90-
* @param actual The bitwise expression to be evaluated.
91-
*/
92-
#define ASSUME_ITS_BITWISE_FALSE(actual) \
93-
FOSSIL_TEST_ASSUME(!(actual), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %d to be false", (actual) ? 1 : 0))
94-
95-
/**
96-
* @brief Assumes that the given bitwise expression is not true.
97-
*
98-
* @param actual The bitwise expression to be evaluated.
99-
*/
100-
#define ASSUME_NOT_BITWISE_TRUE(actual) \
101-
FOSSIL_TEST_ASSUME(!(actual), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %d to not be true", (actual) ? 1 : 0))
102-
103-
/**
104-
* @brief Assumes that the given bitwise expression is not false.
105-
*
106-
* @param actual The bitwise expression to be evaluated.
107-
*/
108-
#define ASSUME_NOT_BITWISE_FALSE(actual) \
109-
FOSSIL_TEST_ASSUME((actual), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %d to not be false", (actual) ? 1 : 0))
110-
111-
/**
112-
* @brief Assumes that the given value is less than the expected value (bitwise).
113-
*
114-
* @param actual The actual value.
115-
* @param expected The expected value.
116-
*/
117-
#define ASSUME_ITS_LESS_THAN_BITWISE(actual, expected) \
118-
FOSSIL_TEST_ASSUME((actual) < (expected), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %u to be less than " #expected " of value %u (bitwise)", (actual), (expected)))
119-
120-
/**
121-
* @brief Assumes that the given value is more than the expected value (bitwise).
122-
*
123-
* @param actual The actual value.
124-
* @param expected The expected value.
125-
*/
126-
#define ASSUME_ITS_MORE_THAN_BITWISE(actual, expected) \
127-
FOSSIL_TEST_ASSUME((actual) > (expected), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %u to be more than " #expected " of value %u (bitwise)", (actual), (expected)))
128-
129-
/**
130-
* @brief Assumes that the given value is equal to the expected value (bitwise).
131-
*
132-
* @param actual The actual value.
133-
* @param expected The expected value.
134-
*/
135-
#define ASSUME_ITS_EQUAL_BITWISE(actual, expected) \
136-
FOSSIL_TEST_ASSUME((actual) == (expected), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %u to be equal to " #expected " of value %u (bitwise)", (actual), (expected)))
137-
138-
/**
139-
* @brief Assumes that the given value is more than or equal to the expected value (bitwise).
140-
*
141-
* @param actual The actual value.
142-
* @param expected The expected value.
143-
*/
144-
#define ASSUME_ITS_MORE_OR_EQUAL_BITWISE(actual, expected) \
145-
FOSSIL_TEST_ASSUME((actual) >= (expected), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %u to be more than or equal to " #expected " of value %u (bitwise)", (actual), (expected)))
146-
147-
/**
148-
* @brief Assumes that the given value is less than or equal to the expected value (bitwise).
149-
*
150-
* @param actual The actual value.
151-
* @param expected The expected value.
152-
*/
153-
#define ASSUME_ITS_LESS_OR_EQUAL_BITWISE(actual, expected) \
154-
FOSSIL_TEST_ASSUME((actual) <= (expected), _FOSSIL_TEST_ASSUME_MESSAGE("Expected " #actual " of value %u to be less than or equal to " #expected " of value %u (bitwise)", (actual), (expected)))
155-
15673
// **************************************************
15774
//
15875
// Floating point assumtions

code/tests/cases/test_tdd.c

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -948,88 +948,6 @@ FOSSIL_TEST(c_assume_run_of_not_soap_tone_detected) {
948948
ASSUME_NOT_SOAP_TONE_DETECTED(text, expected_tone);
949949
} // end case
950950

951-
FOSSIL_TEST(c_assume_run_of_bitwise_true) {
952-
uint8_t a = 0xAA;
953-
uint8_t b = 0x55;
954-
uint8_t c = a | b; // 0xFF
955-
uint8_t d = a & b; // 0x00
956-
957-
ASSUME_ITS_BITWISE_TRUE(a & 0x80);
958-
ASSUME_ITS_BITWISE_TRUE(b & 0x01);
959-
ASSUME_ITS_BITWISE_TRUE(c == 0xFF);
960-
ASSUME_ITS_BITWISE_TRUE((uint8_t)(~d) == 0xFF);
961-
}
962-
963-
FOSSIL_TEST(c_assume_run_of_bitwise_false) {
964-
uint8_t a = 0xAA;
965-
uint8_t b = 0x55;
966-
uint8_t d = a & b; // 0x00
967-
968-
ASSUME_ITS_BITWISE_FALSE(d & 0x01);
969-
ASSUME_ITS_BITWISE_FALSE(a & 0x01);
970-
ASSUME_ITS_BITWISE_FALSE(b & 0x80);
971-
ASSUME_ITS_BITWISE_FALSE(a == b);
972-
}
973-
974-
FOSSIL_TEST(c_assume_run_of_not_bitwise_true) {
975-
uint8_t a = 0xAA;
976-
uint8_t b = 0x55;
977-
978-
ASSUME_NOT_BITWISE_TRUE(a == b);
979-
ASSUME_NOT_BITWISE_TRUE(a & 0x01);
980-
ASSUME_NOT_BITWISE_TRUE(b & 0x80);
981-
}
982-
983-
FOSSIL_TEST(c_assume_run_of_not_bitwise_false) {
984-
uint8_t a = 0xAA;
985-
uint8_t b = 0x55;
986-
uint8_t c = a | b; // 0xFF
987-
988-
ASSUME_NOT_BITWISE_FALSE(c == 0xFF);
989-
ASSUME_NOT_BITWISE_FALSE(a & 0x80);
990-
ASSUME_NOT_BITWISE_FALSE(b & 0x01);
991-
}
992-
993-
FOSSIL_TEST(c_assume_run_of_less_than_bitwise) {
994-
uint8_t a = 0x0F; // 15
995-
uint8_t b = 0xF0; // 240
996-
997-
ASSUME_ITS_LESS_THAN_BITWISE(a, b);
998-
ASSUME_ITS_LESS_THAN_BITWISE(a & b, a | b);
999-
}
1000-
1001-
FOSSIL_TEST(c_assume_run_of_more_than_bitwise) {
1002-
uint8_t a = 0xF0; // 240
1003-
uint8_t b = 0x0F; // 15
1004-
1005-
ASSUME_ITS_MORE_THAN_BITWISE(a, b);
1006-
ASSUME_ITS_MORE_THAN_BITWISE(a | b, a & b);
1007-
}
1008-
1009-
FOSSIL_TEST(c_assume_run_of_equal_bitwise) {
1010-
uint8_t a = 0xAA;
1011-
uint8_t b = 0xAA;
1012-
1013-
ASSUME_ITS_EQUAL_BITWISE(a, b);
1014-
ASSUME_ITS_EQUAL_BITWISE(a ^ b, 0);
1015-
}
1016-
1017-
FOSSIL_TEST(c_assume_run_of_more_or_equal_bitwise) {
1018-
uint8_t a = 0xAA;
1019-
uint8_t b = 0x55;
1020-
1021-
ASSUME_ITS_MORE_OR_EQUAL_BITWISE(a, b);
1022-
ASSUME_ITS_MORE_OR_EQUAL_BITWISE(a, a);
1023-
}
1024-
1025-
FOSSIL_TEST(c_assume_run_of_less_or_equal_bitwise) {
1026-
uint8_t a = 0x55;
1027-
uint8_t b = 0xAA;
1028-
1029-
ASSUME_ITS_LESS_OR_EQUAL_BITWISE(a, b);
1030-
ASSUME_ITS_LESS_OR_EQUAL_BITWISE(b, b);
1031-
}
1032-
1033951
// * * * * * * * * * * * * * * * * * * * * * * * *
1034952
// * Fossil Logic Test Pool
1035953
// * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1121,15 +1039,6 @@ FOSSIL_TEST_GROUP(c_tdd_test_cases) {
11211039
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_its_soap_rot_brain);
11221040
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_its_soap_tone_detected);
11231041
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_not_soap_tone_detected);
1124-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_bitwise_true);
1125-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_bitwise_false);
1126-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_not_bitwise_true);
1127-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_not_bitwise_false);
1128-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_less_than_bitwise);
1129-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_more_than_bitwise);
1130-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_equal_bitwise);
1131-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_more_or_equal_bitwise);
1132-
FOSSIL_TEST_ADD(c_tdd_suite, c_assume_run_of_less_or_equal_bitwise);
11331042

11341043
FOSSIL_TEST_REGISTER(c_tdd_suite);
11351044
} // end of group

code/tests/cases/test_tdd.cpp

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -944,88 +944,6 @@ FOSSIL_TEST(cpp_assume_run_of_not_soap_tone_detected) {
944944
ASSUME_NOT_SOAP_TONE_DETECTED(text, expected_tone);
945945
} // end case
946946

947-
FOSSIL_TEST(cpp_assume_run_of_bitwise_true) {
948-
uint8_t a = 0xAA; // 0b10101010
949-
uint8_t b = 0x55; // 0b01010101
950-
uint8_t c = a | b; // 0xFF
951-
uint8_t d = a & b; // 0x00
952-
953-
ASSUME_ITS_BITWISE_TRUE(a & 0x80); // 0b10000000
954-
ASSUME_ITS_BITWISE_TRUE(b & 0x01); // 0b00000001
955-
ASSUME_ITS_BITWISE_TRUE(c == 0xFF);
956-
ASSUME_ITS_BITWISE_TRUE(~d == 0xFF);
957-
}
958-
959-
FOSSIL_TEST(cpp_assume_run_of_bitwise_false) {
960-
uint8_t a = 0xAA; // 0b10101010
961-
uint8_t b = 0x55; // 0b01010101
962-
uint8_t d = a & b; // 0x00
963-
964-
ASSUME_ITS_BITWISE_FALSE(d & 0x01); // 0b00000001
965-
ASSUME_ITS_BITWISE_FALSE(a & 0x01); // 0b00000001
966-
ASSUME_ITS_BITWISE_FALSE(b & 0x80); // 0b10000000
967-
ASSUME_ITS_BITWISE_FALSE(a == b);
968-
}
969-
970-
FOSSIL_TEST(cpp_assume_run_of_not_bitwise_true) {
971-
uint8_t a = 0xAA; // 0b10101010
972-
uint8_t b = 0x55; // 0b01010101
973-
974-
ASSUME_NOT_BITWISE_TRUE(a == b);
975-
ASSUME_NOT_BITWISE_TRUE(a & 0x01); // 0b00000001
976-
ASSUME_NOT_BITWISE_TRUE(b & 0x80); // 0b10000000
977-
}
978-
979-
FOSSIL_TEST(cpp_assume_run_of_not_bitwise_false) {
980-
uint8_t a = 0xAA; // 0b10101010
981-
uint8_t b = 0x55; // 0b01010101
982-
uint8_t c = a | b; // 0xFF
983-
984-
ASSUME_NOT_BITWISE_FALSE(c == 0xFF);
985-
ASSUME_NOT_BITWISE_FALSE(a & 0x80); // 0b10000000
986-
ASSUME_NOT_BITWISE_FALSE(b & 0x01); // 0b00000001
987-
}
988-
989-
FOSSIL_TEST(cpp_assume_run_of_less_than_bitwise) {
990-
uint8_t a = 0x0F; // 15
991-
uint8_t b = 0xF0; // 240
992-
993-
ASSUME_ITS_LESS_THAN_BITWISE(a, b);
994-
ASSUME_ITS_LESS_THAN_BITWISE(a & b, a | b);
995-
}
996-
997-
FOSSIL_TEST(cpp_assume_run_of_more_than_bitwise) {
998-
uint8_t a = 0xF0; // 240
999-
uint8_t b = 0x0F; // 15
1000-
1001-
ASSUME_ITS_MORE_THAN_BITWISE(a, b);
1002-
ASSUME_ITS_MORE_THAN_BITWISE(a | b, a & b);
1003-
}
1004-
1005-
FOSSIL_TEST(cpp_assume_run_of_equal_bitwise) {
1006-
uint8_t a = 0xAA; // 0b10101010
1007-
uint8_t b = 0xAA; // 0b10101010
1008-
1009-
ASSUME_ITS_EQUAL_BITWISE(a, b);
1010-
ASSUME_ITS_EQUAL_BITWISE(a ^ b, 0);
1011-
}
1012-
1013-
FOSSIL_TEST(cpp_assume_run_of_more_or_equal_bitwise) {
1014-
uint8_t a = 0xAA; // 0b10101010
1015-
uint8_t b = 0x55; // 0b01010101
1016-
1017-
ASSUME_ITS_MORE_OR_EQUAL_BITWISE(a, b);
1018-
ASSUME_ITS_MORE_OR_EQUAL_BITWISE(a, a);
1019-
}
1020-
1021-
FOSSIL_TEST(cpp_assume_run_of_less_or_equal_bitwise) {
1022-
uint8_t a = 0x55; // 0b01010101
1023-
uint8_t b = 0xAA; // 0b10101010
1024-
1025-
ASSUME_ITS_LESS_OR_EQUAL_BITWISE(a, b);
1026-
ASSUME_ITS_LESS_OR_EQUAL_BITWISE(b, b);
1027-
}
1028-
1029947
// * * * * * * * * * * * * * * * * * * * * * * * *
1030948
// * Fossil Logic Test Pool
1031949
// * * * * * * * * * * * * * * * * * * * * * * * *
@@ -1117,15 +1035,6 @@ FOSSIL_TEST_GROUP(cpp_tdd_test_cases) {
11171035
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_its_soap_rot_brain);
11181036
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_its_soap_tone_detected);
11191037
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_not_soap_tone_detected);
1120-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_bitwise_true);
1121-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_bitwise_false);
1122-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_not_bitwise_true);
1123-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_not_bitwise_false);
1124-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_less_than_bitwise);
1125-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_more_than_bitwise);
1126-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_equal_bitwise);
1127-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_more_or_equal_bitwise);
1128-
FOSSIL_TEST_ADD(cpp_tdd_suite, cpp_assume_run_of_less_or_equal_bitwise);
11291038

11301039
FOSSIL_TEST_REGISTER(cpp_tdd_suite);
11311040
} // end of group

0 commit comments

Comments
 (0)