Use new testing infrastructure in Redial test cases

tests/plugins/Redial/basic/test/testcase.cpp

@@ -27,142 +27,52 @@ constexpr KeyAddr key_addr_A{2, 1};
 constexpr KeyAddr key_addr_X{3, 2};
 
 class RedialBasic : public VirtualDeviceTest {
- protected:
-  std::set<uint8_t> expected_keycodes_ = {};
-  std::unique_ptr<State> state_ = nullptr;
 };
 
-TEST_F(RedialBasic, RedialFirst) {
+TEST_F(RedialBasic, RedialWithoutPriorKey) {
 
-  // Press redial key
+  PressKey(Millis{10}, key_addr_Redial);
-  sim_.Press(key_addr_Redial);
+  ReleaseKey(Millis{25}, key_addr_Redial);
 
-  state_ = RunCycle();
+  sim_.RunForMillis(10);
+  LoadState();
 
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 0)
+  ASSERT_EQ(HIDReports()->Keyboard().size(), 0)
-      << "There should be no HID report for a redial key without anything pressed first";
+      << "There should be no HID report without a prior keypress";
-
-  // Release redial key
-  sim_.Release(key_addr_Redial);
-  sim_.RunCycle();
 }
 
 TEST_F(RedialBasic, RedialFirstKey) {
 
-  // Press `A`
+  PressKey(Millis{10}, key_addr_A);
-  sim_.Press(key_addr_A);
+  ExpectReport(Cycles{1}, AddKeycodes{Key_A}, "Report should contain only `A`");
-  state_ = RunCycle();
+  ReleaseKey(Millis{25}, key_addr_A);
-
+  ExpectReport(Cycles{1}, RemoveKeycodes{Key_A}, "Report should be empty");
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should be one report after letter key press";
-
-  expected_keycodes_.insert(Key_A.getKeyCode());
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
-              ::testing::ElementsAreArray(expected_keycodes_))
-      << "The report should include only `A`";
-
-  // Release `A`
-  sim_.Release(key_addr_A);
-  state_ = RunCycle();
-
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should be one report after letter key release";
-
-  expected_keycodes_.erase(Key_A.getKeyCode());
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
-              ::testing::ElementsAreArray(expected_keycodes_))
-      << "The report should be empty";
-
-  sim_.RunCycle();
-
-  // Press redial key
-  sim_.Press(key_addr_Redial);
-
-  state_ = RunCycle();
-
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should now be a redial-key report";
-
-  expected_keycodes_.insert(Key_A.getKeyCode());
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
-              ::testing::ElementsAreArray(expected_keycodes_))
-      << "The report should include only `A`";
-
-  // Release redial key
-  sim_.Release(key_addr_Redial);
-  state_ = RunCycle();
-
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should be one report after redial-key release";
 
-  expected_keycodes_.erase(Key_A.getKeyCode());
+  PressKey(Millis{10}, key_addr_Redial);
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
+  ExpectReport(Cycles{1}, AddKeycodes{Key_A}, "Report should contain only `A`");
-              ::testing::ElementsAreArray(expected_keycodes_))
+  ReleaseKey(Millis{25}, key_addr_Redial);
-      << "The report should be empty";
+  ExpectReport(Cycles{1}, RemoveKeycodes{Key_A}, "Report should be empty");
 
-  sim_.RunCycle();
+  sim_.RunForMillis(10);
 
-  state_ = RunCycle();
+  CHECK_EXPECTED_REPORTS();
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 0);
 }
 
 TEST_F(RedialBasic, RedialNextKey) {
 
-  // Press `X`
+  PressKey(Millis{10}, key_addr_X);
-  sim_.Press(key_addr_X);
+  ExpectReport(Cycles{1}, AddKeycodes{Key_X}, "Report should contain only `X`");
-  state_ = RunCycle();
+  ReleaseKey(Millis{25}, key_addr_X);
-
+  ExpectReport(Cycles{1}, RemoveKeycodes{Key_X}, "Report should be empty");
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should be one report after letter key press";
-
-  expected_keycodes_.insert(Key_X.getKeyCode());
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
-              ::testing::ElementsAreArray(expected_keycodes_))
-      << "The report should include only `X`";
-
-  // Release `X`
-  sim_.Release(key_addr_X);
-  state_ = RunCycle();
-
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should be one report after letter key release";
-
-  expected_keycodes_.erase(Key_X.getKeyCode());
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
-              ::testing::ElementsAreArray(expected_keycodes_))
-      << "The report should be empty";
-
-  sim_.RunCycle();
-
-  // Press redial key
-  sim_.Press(key_addr_Redial);
-
-  state_ = RunCycle();
-
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should now be a redial-key report";
-
-  expected_keycodes_.insert(Key_X.getKeyCode());
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
-              ::testing::ElementsAreArray(expected_keycodes_))
-      << "The report should include only `X`";
-
-  // Release redial key
-  sim_.Release(key_addr_Redial);
-  state_ = RunCycle();
-
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 1)
-      << "There should be one report after redial-key release";
 
-  expected_keycodes_.erase(Key_X.getKeyCode());
+  PressKey(Millis{10}, key_addr_Redial);
-  EXPECT_THAT(state_->HIDReports()->Keyboard(0).ActiveKeycodes(),
+  ExpectReport(Cycles{1}, AddKeycodes{Key_X}, "Report should contain only `X`");
-              ::testing::ElementsAreArray(expected_keycodes_))
+  ReleaseKey(Millis{25}, key_addr_Redial);
-      << "The report should be empty";
+  ExpectReport(Cycles{1}, RemoveKeycodes{Key_X}, "Report should be empty");
 
-  sim_.RunCycle();
+  sim_.RunForMillis(10);
 
-  state_ = RunCycle();
+  CHECK_EXPECTED_REPORTS();
-  ASSERT_EQ(state_->HIDReports()->Keyboard().size(), 0);
 }
 
 }  // namespace