Skip to content

Commit 9b889c2

Browse files
committed
Fixes test cases
1 parent abd436d commit 9b889c2

1 file changed

Lines changed: 16 additions & 20 deletions

File tree

test/embedded/test_finger2/finger2_test.cpp

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -214,43 +214,39 @@ TEST_P(TestFinger2, Basic)
214214
// EXPECT_EQ(params.template_size, 0x2EC8u);
215215
// EXPECT_EQ(params.sensor_type,0x????);
216216
EXPECT_EQ(params.database_capacity, 100u);
217-
EXPECT_EQ(params.score_level, cfg.score_level);
217+
EXPECT_EQ(params.score_level, 3);
218218
EXPECT_EQ(params.address, 0xFFFFFFFFu);
219219
EXPECT_GE(params.packet_size, 0u);
220220
EXPECT_LE(params.packet_size, 3u);
221221
EXPECT_EQ(params.address, 0xFFFFFFFFu);
222222
EXPECT_EQ(params.baud_rate, 6u); // 57600 only (STM32 <-> Chip)
223223

224-
for (uint8_t lv = 1; lv <= 5; ++lv) {
225-
EXPECT_TRUE(unit->writeSystemRegister(RegisterID::ScoreLevel, lv));
226-
EXPECT_TRUE(unit->readSystemParams(params));
227-
EXPECT_EQ(params.score_level, lv);
228-
}
229-
EXPECT_FALSE(unit->writeSystemRegister(RegisterID::ScoreLevel, 0));
230-
EXPECT_FALSE(unit->writeSystemRegister(RegisterID::ScoreLevel, 6));
231-
EXPECT_FALSE(unit->writeSystemRegister(RegisterID::ScoreLevel, 255));
232-
233-
EXPECT_TRUE(unit->writeSystemRegister(RegisterID::ScoreLevel, cfg.score_level));
234-
EXPECT_TRUE(unit->readSystemParams(params));
235-
EXPECT_EQ(params.score_level, cfg.score_level);
224+
//
225+
EXPECT_FALSE(unit->writeSystemRegister(RegisterID::PacketSize, 4));
226+
EXPECT_FALSE(unit->writeSystemRegister(RegisterID::PacketSize, 255));
236227

228+
uint32_t itime[4]{};
237229
for (uint8_t ps = 0; ps <= 3; ++ps) {
238230
EXPECT_TRUE(unit->writeSystemRegister(RegisterID::PacketSize, ps));
239231
EXPECT_TRUE(unit->readSystemParams(params));
240232
EXPECT_EQ(params.packet_size, ps);
233+
234+
uint8_t info[512]{};
235+
uint8_t info_empty[512]{};
236+
auto s = m5::utility::millis();
237+
EXPECT_TRUE(unit->readInformationPage(info));
238+
itime[ps] = m5::utility::millis() - s;
239+
EXPECT_TRUE(memcmp(info, info_empty, sizeof(info)) != 0);
241240
}
242-
EXPECT_FALSE(unit->writeSystemRegister(RegisterID::PacketSize, 4));
243-
EXPECT_FALSE(unit->writeSystemRegister(RegisterID::PacketSize, 255));
241+
EXPECT_GT(itime[0], itime[1]);
242+
EXPECT_GT(itime[1], itime[2]);
243+
EXPECT_GT(itime[2], itime[3]);
244244

245245
EXPECT_TRUE(unit->writeSystemRegister(RegisterID::PacketSize, 1));
246246
EXPECT_TRUE(unit->readSystemParams(params));
247247
EXPECT_EQ(params.packet_size, 1);
248248

249-
uint8_t info[512]{};
250-
uint8_t info_empty[512]{};
251-
EXPECT_TRUE(unit->readInformationPage(info));
252-
EXPECT_TRUE(memcmp(info, info_empty, sizeof(info)) != 0);
253-
249+
//
254250
std::vector<uint32_t> rval{};
255251
for (uint_fast8_t i = 0; i < 100; ++i) {
256252
uint32_t v{};

0 commit comments

Comments
 (0)