Use (un)expected for serve API

1 files changed, 13 insertions, 12 deletions

diff --git a/test/buildtool/serve_api/source_tree_client.test.cpp b/test/buildtool/serve_api/source_tree_client.test.cpp
index b5650e9f..4d70f2cd 100644
--- a/test/buildtool/serve_api/source_tree_client.test.cpp
+++ b/test/buildtool/serve_api/source_tree_client.test.cpp
@@ -40,35 +40,36 @@ TEST_CASE("Serve service client: tree-of-commit request", "[serve_api]") {
 
     SECTION("Commit in bare checkout") {
         auto root_id = st_client.ServeCommitTree(kRootCommit, ".", false);
-        REQUIRE(std::holds_alternative<std::string>(root_id));
-        CHECK(std::get<std::string>(root_id) == kRootId);
+        REQUIRE(root_id);
+        CHECK(*root_id == kRootId);
 
         auto baz_id = st_client.ServeCommitTree(kRootCommit, "baz", false);
-        REQUIRE(std::holds_alternative<std::string>(baz_id));
-        CHECK(std::get<std::string>(baz_id) == kBazId);
+        REQUIRE(baz_id);
+        CHECK(*baz_id == kBazId);
     }
 
     SECTION("Commit in non-bare checkout") {
         auto root_id = st_client.ServeCommitTree(kRootSymCommit, ".", false);
-        REQUIRE(std::holds_alternative<std::string>(root_id));
-        CHECK(std::get<std::string>(root_id) == kRootSymId);
+        REQUIRE(root_id);
+        CHECK(*root_id == kRootSymId);
 
         auto baz_id = st_client.ServeCommitTree(kRootSymCommit, "baz", false);
-        REQUIRE(std::holds_alternative<std::string>(baz_id));
-        CHECK(std::get<std::string>(baz_id) == kBazSymId);
+        REQUIRE(baz_id);
+        CHECK(*baz_id == kBazSymId);
     }
 
     SECTION("Subdir not found") {
         auto root_id =
             st_client.ServeCommitTree(kRootCommit, "does_not_exist", false);
-        REQUIRE(std::holds_alternative<bool>(root_id));
-        CHECK(std::get<bool>(root_id));  // fatal failure
+        REQUIRE_FALSE(root_id);
+        CHECK(root_id.error() == GitLookupError::Fatal);  // fatal failure
     }
 
     SECTION("Commit not known") {
         auto root_id = st_client.ServeCommitTree(
             "0123456789abcdef0123456789abcdef01234567", ".", false);
-        REQUIRE(std::holds_alternative<bool>(root_id));
-        CHECK_FALSE(std::get<bool>(root_id));  // non-fatal failure
+        REQUIRE_FALSE(root_id);
+        CHECK_FALSE(root_id.error() ==
+                    GitLookupError::Fatal);  // non-fatal failure
     }
 }