1 files changed, 33 insertions, 18 deletions
diff --git a/test/buildtool/main/install_cas.test.cpp b/test/buildtool/main/install_cas.test.cpp
index 4d6ef0b8..05de9c0d 100644
--- a/test/buildtool/main/install_cas.test.cpp
+++ b/test/buildtool/main/install_cas.test.cpp
@@ -22,32 +22,47 @@ TEST_CASE("ObjectInfoFromLiberalString", "[artifact]") {
     auto expected_as_tree = *Artifact::ObjectInfo::FromString(
         "[5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:0:t]");
 
+    // Check (default) file hashes
     CHECK(ObjectInfoFromLiberalString(
-              "[5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f]") == expected);
+              "[5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f]",
+              /*has_remote=*/false) == expected);
     CHECK(ObjectInfoFromLiberalString(
-              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f]") == expected);
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f]",
+              /*has_remote=*/false) == expected);
     CHECK(ObjectInfoFromLiberalString(
-              "[5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f") == expected);
+              "[5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f",
+              /*has_remote=*/false) == expected);
     CHECK(ObjectInfoFromLiberalString(
-              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f") == expected);
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:f",
+              /*has_remote=*/false) == expected);
     CHECK(ObjectInfoFromLiberalString(
-              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:file") == expected);
-    CHECK(ObjectInfoFromLiberalString("5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689"
-                                      ":11:notavalidletter") == expected);
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:file",
+              /*has_remote=*/false) == expected);
+    CHECK(ObjectInfoFromLiberalString(
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:11:notavalidletter",
+              /*has_remote=*/false) == expected);
 
     // Without size, which is not honored in equality
-    CHECK(ObjectInfoFromLiberalString(
-              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689") == expected);
-    CHECK(ObjectInfoFromLiberalString(
-              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:") == expected);
+    CHECK(
+        ObjectInfoFromLiberalString("5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689",
+                                    /*has_remote=*/false) == expected);
+    CHECK(
+        ObjectInfoFromLiberalString("5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:",
+                                    /*has_remote=*/false) == expected);
+
     // Syntactically invalid size should be ignored
     CHECK(ObjectInfoFromLiberalString(
-              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:xyz") == expected);
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:xyz",
+              /*has_remote=*/false) == expected);
 
-    CHECK(ObjectInfoFromLiberalString("5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689"
-                                      "::t") == expected_as_tree);
-    CHECK(ObjectInfoFromLiberalString("5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689"
-                                      "::tree") == expected_as_tree);
-    CHECK(ObjectInfoFromLiberalString("5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689"
-                                      ":xyz:t") == expected_as_tree);
+    // Check tree hashes
+    CHECK(ObjectInfoFromLiberalString(
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689::t",
+              /*has_remote=*/false) == expected_as_tree);
+    CHECK(ObjectInfoFromLiberalString(
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689::tree",
+              /*has_remote=*/false) == expected_as_tree);
+    CHECK(ObjectInfoFromLiberalString(
+              "5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689:xyz:t",
+              /*has_remote=*/false) == expected_as_tree);
 }