Skip to content

Commit e5b762d

Browse files
committed
[lib][fixed_point] make sure the expected value is on the left side of the EXPECTED macros
Doesn't really change much except when there's an actual error it prints things the right way around.
1 parent 0a80fad commit e5b762d

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

lib/fixed_point/test/fixed_point_tests.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ static bool test_fp32_64_div_construct(void) {
1515

1616
// 0/1 -> 0.0
1717
fp_32_64_div_32_32(&f, 0u, 1u);
18-
EXPECT_EQ(f.l0, 0u, "0/1 l0");
19-
EXPECT_EQ(f.l32, 0u, "0/1 l32");
20-
EXPECT_EQ(f.l64, 0u, "0/1 l64");
18+
EXPECT_EQ(0u, f.l0, "0/1 l0");
19+
EXPECT_EQ(0u, f.l32, "0/1 l32");
20+
EXPECT_EQ(0u, f.l64, "0/1 l64");
2121

2222
// 1/1 -> 1.0
2323
fp_32_64_div_32_32(&f, 1u, 1u);
24-
EXPECT_EQ(f.l0, 1u, "1/1 l0");
25-
EXPECT_EQ(f.l32, 0u, "1/1 l32");
26-
EXPECT_EQ(f.l64, 0u, "1/1 l64");
24+
EXPECT_EQ(1u, f.l0, "1/1 l0");
25+
EXPECT_EQ(0u, f.l32, "1/1 l32");
26+
EXPECT_EQ(0u, f.l64, "1/1 l64");
2727

2828
// 1/2 -> 0.5
2929
fp_32_64_div_32_32(&f, 1u, 2u);
30-
EXPECT_EQ(f.l0, 0u, "1/2 l0");
31-
EXPECT_EQ(f.l32, 0x80000000u, "1/2 l32");
32-
EXPECT_EQ(f.l64, 0u, "1/2 l64");
30+
EXPECT_EQ(0u, f.l0, "1/2 l0");
31+
EXPECT_EQ(0x80000000u, f.l32, "1/2 l32");
32+
EXPECT_EQ(0u, f.l64, "1/2 l64");
3333

3434
// 3/2 -> 1.5
3535
fp_32_64_div_32_32(&f, 3u, 2u);
36-
EXPECT_EQ(f.l0, 1u, "3/2 l0");
37-
EXPECT_EQ(f.l32, 0x80000000u, "3/2 l32");
38-
EXPECT_EQ(f.l64, 0u, "3/2 l64");
36+
EXPECT_EQ(1u, f.l0, "3/2 l0");
37+
EXPECT_EQ(0x80000000u, f.l32, "3/2 l32");
38+
EXPECT_EQ(0u, f.l64, "3/2 l64");
3939

4040
END_TEST;
4141
}
@@ -47,17 +47,17 @@ static bool test_u64_mul_u32_fp32_64(void) {
4747

4848
// 10 * 1.5 = 15
4949
fp_32_64_div_32_32(&b, 3u, 2u);
50-
EXPECT_EQ(u64_mul_u32_fp32_64(10u, b), 15u, "10 * 1.5 ~= 15");
50+
EXPECT_EQ(15u, u64_mul_u32_fp32_64(10u, b), "10 * 1.5 ~= 15");
5151

5252
// 1 * 0.5 rounds to 1 (ties away from zero)
5353
fp_32_64_div_32_32(&b, 1u, 2u);
54-
EXPECT_EQ(u64_mul_u32_fp32_64(1u, b), 1u, "1 * 0.5 ~= 1");
54+
EXPECT_EQ(1u, u64_mul_u32_fp32_64(1u, b), "1 * 0.5 ~= 1");
5555

5656
// 1 * 1/3 ~= 0, 2 * 1/3 ~= 1, 3 * 1/3 = 1
5757
fp_32_64_div_32_32(&b, 1u, 3u);
58-
EXPECT_EQ(u64_mul_u32_fp32_64(1u, b), 0u, "1 * 1/3 ~= 0");
59-
EXPECT_EQ(u64_mul_u32_fp32_64(2u, b), 1u, "2 * 1/3 ~= 1");
60-
EXPECT_EQ(u64_mul_u32_fp32_64(3u, b), 1u, "3 * 1/3 = 1");
58+
EXPECT_EQ(0u, u64_mul_u32_fp32_64(1u, b), "1 * 1/3 ~= 0");
59+
EXPECT_EQ(1u, u64_mul_u32_fp32_64(2u, b), "2 * 1/3 ~= 1");
60+
EXPECT_EQ(1u, u64_mul_u32_fp32_64(3u, b), "3 * 1/3 = 1");
6161

6262
END_TEST;
6363
}
@@ -71,12 +71,12 @@ static bool test_u32_mul_u64_fp32_64(void) {
7171
// (2^32) * 0.5 = 2^31
7272
fp_32_64_div_32_32(&b, 1u, 2u);
7373
a = 0x0000000100000000ULL;
74-
EXPECT_EQ(u32_mul_u64_fp32_64(a, b), 0x80000000u, "2^32 * 0.5 = 2^31");
74+
EXPECT_EQ(0x80000000u, u32_mul_u64_fp32_64(a, b), "2^32 * 0.5 = 2^31");
7575

7676
// 65536 * 1.5 = 98304
7777
fp_32_64_div_32_32(&b, 3u, 2u);
7878
a = 1ULL << 16;
79-
EXPECT_EQ(u32_mul_u64_fp32_64(a, b), (uint32_t)((1u << 16) + (1u << 15)), "65536 * 1.5 = 98304");
79+
EXPECT_EQ((uint32_t)((1u << 16) + (1u << 15)), u32_mul_u64_fp32_64(a, b), "65536 * 1.5 = 98304");
8080

8181
END_TEST;
8282
}
@@ -90,11 +90,11 @@ static bool test_u64_mul_u64_fp32_64(void) {
9090
// (2^40) * 0.5 = 2^39
9191
fp_32_64_div_32_32(&b, 1u, 2u);
9292
a = 1ULL << 40;
93-
EXPECT_EQ(u64_mul_u64_fp32_64(a, b), (1ULL << 39), "2^40 * 0.5 = 2^39");
93+
EXPECT_EQ((1ULL << 39), u64_mul_u64_fp32_64(a, b), "2^40 * 0.5 = 2^39");
9494

9595
// 100 * 0.7 ~= 70
9696
fp_32_64_div_32_32(&b, 7u, 10u);
97-
EXPECT_EQ(u64_mul_u64_fp32_64(100u, b), 70u, "100 * 0.7 ~= 70");
97+
EXPECT_EQ(70u, u64_mul_u64_fp32_64(100u, b), "100 * 0.7 ~= 70");
9898

9999
END_TEST;
100100
}
@@ -213,11 +213,11 @@ static bool test_time_conversion(void) {
213213
fp_32_64_div_64_32(&ms_to_tsc, tsc_hz, 1000); // ticks per ms
214214

215215
// 1 ms = 2,500,000 ticks
216-
EXPECT_EQ(u64_mul_u32_fp32_64(1u, ms_to_tsc), 2500000u, "1 ms to ticks");
216+
EXPECT_EQ(2500000u, u64_mul_u32_fp32_64(1u, ms_to_tsc), "1 ms to ticks");
217217

218218
// 1,000,000 ticks ~ 0.4 ms (integer ms rounds to 0), 400 us
219-
EXPECT_EQ(u32_mul_u64_fp32_64(1000000u, tsc_to_ms), 0u, "1,000,000 ticks to ms int");
220-
EXPECT_EQ(u32_mul_u64_fp32_64(1000000u, tsc_to_us), 400u, "1,000,000 ticks to us int");
219+
EXPECT_EQ(0u, u32_mul_u64_fp32_64(1000000u, tsc_to_ms), "1,000,000 ticks to ms int");
220+
EXPECT_EQ(400u, u32_mul_u64_fp32_64(1000000u, tsc_to_us), "1,000,000 ticks to us int");
221221

222222
// High precision frequency > 32-bit: ~ (1<<40) + 123 Hz
223223
uint64_t tsc_hz_hp = (1ULL << 40) + 123ULL; // ~1.0995 THz
@@ -236,15 +236,15 @@ static bool test_time_conversion(void) {
236236
uint64_t ms_expected = (sample_ticks * 1000ULL) / tsc_hz_hp; // truncated reference
237237
uint64_t diff = (ms_est > ms_expected) ? (ms_est - ms_expected) : (ms_expected - ms_est);
238238
// Allow a slightly larger tolerance due to rounding across large ratios
239-
EXPECT_LE(diff, 16ULL, "ms conversion diff <=16");
239+
EXPECT_GE(16ULL, diff, "ms conversion diff <=16");
240240

241241
// Fractional small frequency: 1 Hz
242242
uint64_t tsc_hz_1 = 1ULL;
243243
struct fp_32_64 tsc1_to_ms, ms_to_tsc1;
244244
fp_32_64_div_32_64(&tsc1_to_ms, 1000, tsc_hz_1); // ms per tick at 1 Hz = 1000
245245
fp_32_64_div_64_32(&ms_to_tsc1, tsc_hz_1, 1000); // ticks per ms ~ 0.001
246-
EXPECT_EQ(u64_mul_u32_fp32_64(1u, ms_to_tsc1), 0u, "1 ms to ticks @1Hz");
247-
EXPECT_EQ(u32_mul_u64_fp32_64(1u, tsc1_to_ms), 1000u, "1 tick to ms @1Hz");
246+
EXPECT_EQ(0u, u64_mul_u32_fp32_64(1u, ms_to_tsc1), "1 ms to ticks @1Hz");
247+
EXPECT_EQ(1000u, u32_mul_u64_fp32_64(1u, tsc1_to_ms), "1 tick to ms @1Hz");
248248

249249
// Asymmetric rounding case: ticks chosen so fractional part near .5 boundary
250250
uint64_t boundary_ticks = tsc_hz / 2000ULL; // expects 0.5 ms

0 commit comments

Comments
 (0)