diff --git a/test/source/scwx/provider/warnings_provider.test.cpp b/test/source/scwx/provider/warnings_provider.test.cpp index 78ef9b95..de315b4b 100644 --- a/test/source/scwx/provider/warnings_provider.test.cpp +++ b/test/source/scwx/provider/warnings_provider.test.cpp @@ -13,53 +13,27 @@ static const std::string& kAlternateUrl {"https://warnings.cod.edu"}; class WarningsProviderTest : public testing::TestWithParam { }; -TEST_P(WarningsProviderTest, ListFiles) -{ - WarningsProvider provider(GetParam()); - - auto [newObjects, totalObjects] = provider.ListFiles(); - - // No objects, skip test - if (totalObjects == 0) - { - GTEST_SKIP(); - } - - EXPECT_GT(newObjects, 0); - EXPECT_GT(totalObjects, 0); - EXPECT_EQ(newObjects, totalObjects); -} TEST_P(WarningsProviderTest, LoadUpdatedFiles) { WarningsProvider provider(GetParam()); - auto [newObjects, totalObjects] = provider.ListFiles(); - auto updatedFiles = provider.LoadUpdatedFiles(); + std::chrono::sys_time now = + std::chrono::floor(std::chrono::system_clock::now()); + std::chrono::sys_time startTime = + now - std::chrono::days {3}; + + auto updatedFiles = provider.LoadUpdatedFiles(startTime); // No objects, skip test - if (totalObjects == 0) + if (updatedFiles.empty()) { GTEST_SKIP(); } - EXPECT_GT(newObjects, 0); - EXPECT_GT(totalObjects, 0); - EXPECT_EQ(newObjects, totalObjects); - EXPECT_EQ(updatedFiles.size(), newObjects); + EXPECT_GT(updatedFiles.size(), 0); - auto [newObjects2, totalObjects2] = provider.ListFiles(); - auto updatedFiles2 = provider.LoadUpdatedFiles(); - - // There should be no more than 2 updated warnings files since the last query - // (assumption that the previous newest file was updated, and a new file was - // created on the hour) - EXPECT_LE(newObjects2, 2); - EXPECT_EQ(updatedFiles2.size(), newObjects2); - - // The total number of objects may have changed, since the oldest file could - // have dropped off the list - EXPECT_GT(totalObjects2, 0); + auto updatedFiles2 = provider.LoadUpdatedFiles(); } INSTANTIATE_TEST_SUITE_P(WarningsProvider,