Use calculate_eta function in fetchNext
Change-Id: I210a51fc4415cfbd36f721fc0c95585ec0be531c
diff --git a/tests/testthat/test-page-numbering.R b/tests/testthat/test-page-numbering.R
index 1ef2808..9e2b8ec 100644
--- a/tests/testthat/test-page-numbering.R
+++ b/tests/testthat/test-page-numbering.R
@@ -129,17 +129,27 @@
info = "Randomized page numbering format is incorrect or negative in subsequent call"
)
- # Test 2: Check that ETA is displayed - we're now ensuring it contains digits followed by 's'
- expect_match(
- output_str,
- "ETA: \\d+s",
- info = "ETA format should show digits followed by 's'"
- )
+ # Test 2: Check that either ETA is displayed or no ETA (for single page fetches)
+ # ETA may not be shown if there's only one page to fetch
+ if (grepl("ETA:", output_str)) {
+ expect_match(
+ output_str,
+ "ETA: \\d+s",
+ info = "ETA format should show digits followed by 's' when present"
+ )
- # Test 3: Check that completion time is shown in parentheses
- expect_match(
- output_str,
- "\\(\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\)",
- info = "Completion time not found in subsequent call output"
- )
+ # Test 3: Check that completion time is shown in parentheses when ETA is present
+ expect_match(
+ output_str,
+ "\\(\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\)",
+ info = "Completion time not found when ETA is present"
+ )
+ } else {
+ # If no ETA, just check that timing information is present
+ expect_match(
+ output_str,
+ "in\\s+\\d+\\.\\d+s",
+ info = "Timing information should be present even without ETA"
+ )
+ }
})