Remove HermeticLocalTestFixture

...and create StorageConfig and Storage in place if needed.

1 files changed, 51 insertions, 37 deletions

diff --git a/test/buildtool/graph_traverser/graph_traverser_local.test.cpp b/test/buildtool/graph_traverser/graph_traverser_local.test.cpp
index 88990dc8..007d1386 100644
--- a/test/buildtool/graph_traverser/graph_traverser_local.test.cpp
+++ b/test/buildtool/graph_traverser/graph_traverser_local.test.cpp
@@ -14,69 +14,83 @@
 
 #include "catch2/catch_test_macros.hpp"
 #include "src/buildtool/auth/authentication.hpp"
+#include "src/buildtool/storage/config.hpp"
+#include "src/buildtool/storage/storage.hpp"
 #include "test/buildtool/graph_traverser/graph_traverser.test.hpp"
-#include "test/utils/hermeticity/local.hpp"
+#include "test/utils/hermeticity/test_storage_config.hpp"
 #include "test/utils/remote_execution/test_auth_config.hpp"
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Output created when entry point is local artifact",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Output created when entry point is local artifact",
+          "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestCopyLocalFile(&auth);
+
+    TestCopyLocalFile(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Output created and contents are correct",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Output created and contents are correct",
+          "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestHelloWorldCopyMessage(&auth);
+
+    TestHelloWorldCopyMessage(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Actions are not re-run",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Actions are not re-run", "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestSequencePrinterBuildLibraryOnly(&auth);
+
+    TestSequencePrinterBuildLibraryOnly(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: KNOWN artifact",
-                 "[graph_traverser]") {
+TEST_CASE("Local: KNOWN artifact", "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestHelloWorldWithKnownSource(&auth);
+
+    TestHelloWorldWithKnownSource(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Blobs uploaded and correctly used",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Blobs uploaded and correctly used", "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestBlobsUploadedAndUsed(&auth);
+
+    TestBlobsUploadedAndUsed(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Environment variables are set and used",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Environment variables are set and used",
+          "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestEnvironmentVariablesSetAndUsed(&auth);
+
+    TestEnvironmentVariablesSetAndUsed(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Trees correctly used",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Trees correctly used", "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestTreesUsed(&auth);
+
+    TestTreesUsed(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Nested trees correctly used",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Nested trees correctly used", "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestNestedTreesUsed(&auth);
+
+    TestNestedTreesUsed(storage_config.Get(), storage, &auth);
 }
 
-TEST_CASE_METHOD(HermeticLocalTestFixture,
-                 "Local: Detect flaky actions",
-                 "[graph_traverser]") {
+TEST_CASE("Local: Detect flaky actions", "[graph_traverser]") {
+    auto const storage_config = TestStorageConfig::Create();
+    auto const storage = Storage::Create(&storage_config.Get());
     Auth auth{}; /*no TLS needed*/
-    TestFlakyHelloWorldDetected(&auth);
+
+    TestFlakyHelloWorldDetected(storage_config.Get(), storage, &auth);
 }