Skip to content

Commit 3eb9116

Browse files
johnboilesjohnboiles
authored
Update view tests to the new pattern everywhere (#1157)
1 parent c8514b2 commit 3eb9116

File tree

6 files changed

+150
-122
lines changed

6 files changed

+150
-122
lines changed

‎test/CatchTests/KindleShortPagesTest.cpp‎

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -349,42 +349,51 @@ TEST_CASE("Test Kindle multi-page fetching with short pages visual", "[.][kindle
349349
// Take initial screenshot of main menu
350350
// First screen renders twice
351351
WAIT_FOR_DRAW(display);
352-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest00-MainMenu", true);
352+
WAIT_FOR_DRAW(display, false);
353+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest00-MainMenu");
353354

354355
// Navigate to Kindle section
355356
SendRemoteCommand(RIGHT);
356357
WAIT_FOR_DRAW(display);
357-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest01-KindleSection", true);
358+
WAIT_FOR_DRAW(display, false);
359+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest01-KindleSection");
358360

359361
// Go to the last book in the list
360362
SendRemoteCommand(UP);
361363
WAIT_FOR_DRAW(display);
362-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest02-ShortPagesBookSelected", true);
364+
WAIT_FOR_DRAW(display, false);
365+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest02-ShortPagesBookSelected");
363366

364367
// Open the book - this should load then trigger the first last-read dialog from /open-book
365368
SendRemoteCommand(ENTER);
366-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest03-Connecting", true);
369+
WAIT_FOR_DRAW(display, false);
370+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest03-Connecting");
367371

368372
auto screen = UIGetCurrentScreen();
369373
auto kindleScreen = std::dynamic_pointer_cast<KindleReadableScreen>(screen);
370374
REQUIRE(kindleScreen != nullptr);
371375

372-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest04-Opening", true);
376+
WAIT_FOR_DRAW(display, false);
377+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest04-Opening");
373378

374379
// Wait for the last-read dialog to be shown
375380
WAIT_FOR_DRAW(display);
376-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest05-FirstLastReadDialog", true);
381+
WAIT_FOR_DRAW(display, false);
382+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest05-FirstLastReadDialog");
377383

378384
// Accept the first dialog - should go to Chapter 42
379385
SendRemoteCommand(ENTER);
380386

381387
// Wait for the "Sync to last read page" message
382-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest06-SyncingToLastRead", true);
388+
WAIT_FOR_DRAW(display, false);
389+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest06-SyncingToLastRead");
383390
// TODO: Unknown why message page renders twice
384-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest06.5-SyncingToLastRead", true);
391+
WAIT_FOR_DRAW(display, false);
392+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest06.5-SyncingToLastRead");
385393

386394
// Wait for content to render - this will be Chapter 42
387-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest07-Chapter42Initial", true);
395+
WAIT_FOR_DRAW(display, false);
396+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest07-Chapter42Initial");
388397

389398
// Wait for POST to complete via mock server
390399
REQUIRE(waitForLastReadPostCount(1));
@@ -393,27 +402,33 @@ TEST_CASE("Test Kindle multi-page fetching with short pages visual", "[.][kindle
393402
log_i("TEST: Paging forward through Chapter 42");
394403
for (int i = 0; i < 3; i++) {
395404
SendRemoteCommand(RIGHT);
396-
ASSERT_VIEW_UNCHANGED(
397-
display, "ShortPagesTest09-Chapter42Forward" + std::to_string(i + 1), true);
405+
WAIT_FOR_DRAW(display, false);
406+
ASSERT_VIEW_UNCHANGED(display,
407+
"ShortPagesTest09-Chapter42Forward" + std::to_string(i + 1));
398408
}
399409

400410
// Navigate to page 4 - should trigger second last-read dialog
401411
SendRemoteCommand(RIGHT);
402412

403413
// Three: one to render the page, then two to render the menu
404-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest10-BeforeSecondLastReadDialog", true);
414+
WAIT_FOR_DRAW(display, false);
415+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest10-BeforeSecondLastReadDialog");
405416
WAIT_FOR_DRAW(display);
406-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest12-SecondLastReadDialog", true);
417+
WAIT_FOR_DRAW(display, false);
418+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest12-SecondLastReadDialog");
407419

408420
SendRemoteCommand(ENTER);
409421

410422
// Wait for the "Sync to last read page" message
411-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest13-SyncingToPage10", true);
423+
WAIT_FOR_DRAW(display, false);
424+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest13-SyncingToPage10");
412425
// TODO: Unknown why message page renders twice
413-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest13.5-SyncingToPage10", true);
426+
WAIT_FOR_DRAW(display, false);
427+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest13.5-SyncingToPage10");
414428

415429
// Wait for content to render - this will be Page 10
416-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest14-Page10Initial", true);
430+
WAIT_FOR_DRAW(display, false);
431+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest14-Page10Initial");
417432

418433
// Wait for POST to complete via mock server
419434
REQUIRE(waitForLastReadPostCount(2));
@@ -426,22 +441,25 @@ TEST_CASE("Test Kindle multi-page fetching with short pages visual", "[.][kindle
426441

427442
// First RIGHT press - should move to PAGE 11
428443
SendRemoteCommand(RIGHT);
429-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest16-ForwardFrom10-1", true);
444+
WAIT_FOR_DRAW(display, false);
445+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest16-ForwardFrom10-1");
430446

431447
// Second RIGHT press - should move to PAGE 12
432448
SendRemoteCommand(RIGHT);
433-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest16-ForwardFrom10-2", true);
449+
WAIT_FOR_DRAW(display, false);
450+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest16-ForwardFrom10-2");
434451

435452
// Third RIGHT press - should move to PAGE 13
436453
SendRemoteCommand(RIGHT);
437-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest16-ForwardFrom10-3", true);
454+
WAIT_FOR_DRAW(display, false);
455+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest16-ForwardFrom10-3");
438456

439457
// Page backward to verify backward navigation works
440458
log_i("TEST: Paging backward to verify backward navigation");
441459
for (int i = 0; i < 2; i++) {
442460
SendRemoteCommand(LEFT);
443-
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest19-Backward" + std::to_string(i + 1),
444-
true);
461+
WAIT_FOR_DRAW(display, false);
462+
ASSERT_VIEW_UNCHANGED(display, "ShortPagesTest19-Backward" + std::to_string(i + 1));
445463
}
446464
}
447465

‎test/CatchTests/KindleTests.cpp‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,8 @@ TEST_CASE("Test Kindle navigation visual traversal", "[.][kindle]") {
887887
// 0. Open Kindle book
888888
SendRemoteCommand(RIGHT);
889889
WAIT_FOR_DRAW(display);
890-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest00-BookMenu", true);
890+
WAIT_FOR_DRAW(display, false);
891+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest00-BookMenu");
891892

892893
SendRemoteCommand(ENTER);
893894

@@ -902,66 +903,85 @@ TEST_CASE("Test Kindle navigation visual traversal", "[.][kindle]") {
902903
// Capture the initial page 0 (Lines 1-20)
903904
// Note: Initial content is already rendered before we can set up the callback,
904905
// so we just wait for the draw
905-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest01-InitialPage0", true);
906+
WAIT_FOR_DRAW(display, false);
907+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest01-InitialPage0");
906908

907909
// 1. Navigate forward through 6 pages to pages 1-6 (clears buffer)
908910
SendRemoteCommand(ENTER);
909-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest02-ForwardToPage1", true);
911+
WAIT_FOR_DRAW(display, false);
912+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest02-ForwardToPage1");
910913

911914
SendRemoteCommand(ENTER);
912-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest03-ForwardToPage2", true);
915+
WAIT_FOR_DRAW(display, false);
916+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest03-ForwardToPage2");
913917

914918
SendRemoteCommand(ENTER);
915-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest04-ForwardToPage3", true);
919+
WAIT_FOR_DRAW(display, false);
920+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest04-ForwardToPage3");
916921

917922
SendRemoteCommand(ENTER);
918-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest05-ForwardToPage4", true);
923+
WAIT_FOR_DRAW(display, false);
924+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest05-ForwardToPage4");
919925

920926
SendRemoteCommand(ENTER);
921-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest06-ForwardToPage5", true);
927+
WAIT_FOR_DRAW(display, false);
928+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest06-ForwardToPage5");
922929

923930
SendRemoteCommand(ENTER);
924-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest07-ForwardToPage6", true);
931+
WAIT_FOR_DRAW(display, false);
932+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest07-ForwardToPage6");
925933

926934
// 2. Navigate backward through 6 pages
927935
// We're now on page 6, navigate back to page 0
928936
// Navigate back 6 pages: 6 -> 5 -> 4 -> 3 -> 2 -> 1 -> 0
929937
SendRemoteCommand(LEFT);
930-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest08-BackToPage5", true);
938+
WAIT_FOR_DRAW(display, false);
939+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest08-BackToPage5");
931940

932941
SendRemoteCommand(LEFT);
933-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest09-BackToPage4", true);
942+
WAIT_FOR_DRAW(display, false);
943+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest09-BackToPage4");
934944

935945
SendRemoteCommand(LEFT);
936-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest10-BackToPage3", true);
946+
WAIT_FOR_DRAW(display, false);
947+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest10-BackToPage3");
937948

938949
SendRemoteCommand(LEFT);
939-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest11-BackToPage2", true);
950+
WAIT_FOR_DRAW(display, false);
951+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest11-BackToPage2");
940952

941953
SendRemoteCommand(LEFT);
942-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest12-BackToPage1", true);
954+
WAIT_FOR_DRAW(display, false);
955+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest12-BackToPage1");
943956

944957
SendRemoteCommand(LEFT);
945-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest13-BackToPage0", true);
958+
WAIT_FOR_DRAW(display, false);
959+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest13-BackToPage0");
946960

947961
// 3. Navigate forward again through 6 pages from page 0 to page 6
948962
SendRemoteCommand(ENTER);
949-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest14-ForwardAgainToPage1", true);
963+
WAIT_FOR_DRAW(display, false);
964+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest14-ForwardAgainToPage1");
950965

951966
SendRemoteCommand(ENTER);
952-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest15-ForwardAgainToPage2", true);
967+
WAIT_FOR_DRAW(display, false);
968+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest15-ForwardAgainToPage2");
953969

954970
SendRemoteCommand(ENTER);
955-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest16-ForwardAgainToPage3", true);
971+
WAIT_FOR_DRAW(display, false);
972+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest16-ForwardAgainToPage3");
956973

957974
SendRemoteCommand(ENTER);
958-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest17-ForwardAgainToPage4", true);
975+
WAIT_FOR_DRAW(display, false);
976+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest17-ForwardAgainToPage4");
959977

960978
SendRemoteCommand(ENTER);
961-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest18-ForwardAgainToPage5", true);
979+
WAIT_FOR_DRAW(display, false);
980+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest18-ForwardAgainToPage5");
962981

963982
SendRemoteCommand(ENTER);
964-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest19-ForwardAgainToPage6", true);
983+
WAIT_FOR_DRAW(display, false);
984+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest19-ForwardAgainToPage6");
965985

966986
// Verify mock server was called the expected number of times
967987
// With the buffer filling logic and 6-page navigation, we expect more calls:
@@ -978,7 +998,8 @@ TEST_CASE("Test Kindle navigation visual traversal", "[.][kindle]") {
978998

979999
// 4. Navigate to page 7 and beyond to trigger new server request
9801000
SendRemoteCommand(ENTER);
981-
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest20-ForwardToPage7", true);
1001+
WAIT_FOR_DRAW(display, false);
1002+
ASSERT_VIEW_UNCHANGED(display, "KindleNavTest20-ForwardToPage7");
9821003

9831004
// After navigating to page 4, we should have more calls
9841005
log_i("Mock server: Total navigate calls after page 4: %d", mockNavigateCallCount.load());

‎test/CatchTests/TestEPub.cpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,17 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
108108

109109
// First screen renders twice once with a full refresh and once with a AU4
110110
WAIT_FOR_DRAW(display);
111-
WAIT_FOR_DRAW(display);
111+
WAIT_FOR_DRAW(display, false);
112112

113113
ASSERT_VIEW_UNCHANGED(display, "FirstScreen");
114114

115115
SECTION("Books") {
116116
SendRemoteCommand(ENTER);
117-
WAIT_FOR_DRAW(display);
118-
// WAIT_FOR_DRAW(display);
117+
WAIT_FOR_DRAW(display, false);
119118

120119
ASSERT_VIEW_UNCHANGED(display, "OnePageTutorial");
121120
SendRemoteCommand(ENTER);
122-
WAIT_FOR_DRAW(display);
121+
WAIT_FOR_DRAW(display, false);
123122

124123
auto screen = UIGetCurrentScreen();
125124
auto readableScreen = std::dynamic_pointer_cast<ReadableScreen>(screen);
@@ -147,7 +146,7 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
147146
if (readableScreen->checkAtEnd()) break;
148147

149148
SendRemoteCommand(ENTER);
150-
WAIT_FOR_DRAW(display);
149+
WAIT_FOR_DRAW(display, false);
151150
}
152151
}
153152

@@ -158,13 +157,13 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
158157

159158
SendRemoteCommand(UP);
160159
WAIT_FOR_DRAW(display);
161-
WAIT_FOR_DRAW(display);
160+
WAIT_FOR_DRAW(display, false);
162161

163162
ASSERT_VIEW_UNCHANGED(display, "LastPagePopupMenu");
164163

165164
SendRemoteCommand(ENTER);
166165
WAIT_FOR_DRAW(display);
167-
WAIT_FOR_DRAW(display);
166+
WAIT_FOR_DRAW(display, false);
168167

169168
ASSERT_VIEW_UNCHANGED(display, "MainMenu");
170169

@@ -178,7 +177,7 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
178177
WAIT_FOR_DRAW(display);
179178

180179
SendRemoteCommand(ENTER);
181-
WAIT_FOR_DRAW(display);
180+
WAIT_FOR_DRAW(display, false);
182181

183182
screen = UIGetCurrentScreen();
184183
readableScreen = std::dynamic_pointer_cast<ReadableScreen>(screen);
@@ -208,7 +207,7 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
208207
if (readableScreen->checkAtEnd()) break;
209208

210209
SendRemoteCommand(ENTER);
211-
WAIT_FOR_DRAW(display);
210+
WAIT_FOR_DRAW(display, false);
212211
}
213212

214213
} else {
@@ -218,13 +217,13 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
218217

219218
SendRemoteCommand(UP);
220219
WAIT_FOR_DRAW(display);
221-
WAIT_FOR_DRAW(display);
220+
WAIT_FOR_DRAW(display, false);
222221

223222
ASSERT_VIEW_UNCHANGED(display, "MainMenu");
224223

225224
SendRemoteCommand(ENTER);
226225
WAIT_FOR_DRAW(display);
227-
WAIT_FOR_DRAW(display);
226+
WAIT_FOR_DRAW(display, false);
228227

229228
ASSERT_VIEW_UNCHANGED(display, "ThirdScreen");
230229

@@ -236,7 +235,7 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
236235
WAIT_FOR_DRAW(display);
237236

238237
SendRemoteCommand(ENTER);
239-
WAIT_FOR_DRAW(display);
238+
WAIT_FOR_DRAW(display, false);
240239

241240
screen = UIGetCurrentScreen();
242241
readableScreen = std::dynamic_pointer_cast<ReadableScreen>(screen);
@@ -266,7 +265,7 @@ TEST_CASE("Test EPub Books Rendering", "[.][epub]") {
266265
if (readableScreen->checkAtEnd()) break;
267266

268267
SendRemoteCommand(ENTER);
269-
WAIT_FOR_DRAW(display);
268+
WAIT_FOR_DRAW(display, false);
270269
}
271270
} else {
272271
UNSCOPED_INFO("Unable to get ReadableScreen instance for Book3.");

0 commit comments

Comments
 (0)