Replace classic C boolean operators with keywords

! => not; && => and, || => or

10 files changed, 29 insertions, 29 deletions

diff --git a/test/buildtool/build_engine/base_maps/directory_map.test.cpp b/test/buildtool/build_engine/base_maps/directory_map.test.cpp
index eaeb806a..d001f50e 100644
--- a/test/buildtool/build_engine/base_maps/directory_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/directory_map.test.cpp
@@ -68,7 +68,7 @@ TEST_CASE("simple usage") {
     bool as_expected{false};
     auto name = ModuleName{"", "."};
     auto consumer = [&as_expected](auto values) {
-        if (values[0]->ContainsBlob("file") &&
+        if (values[0]->ContainsBlob("file") and
             not values[0]->ContainsBlob("does_not_exist")) {
             as_expected = true;
         };
diff --git a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
index 19814231..91e74877 100644
--- a/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
+++ b/test/buildtool/build_engine/base_maps/json_file_map.test.cpp
@@ -100,7 +100,7 @@ TEST_CASE("non existent") {
     auto consumer = [&as_expected](auto values) {
         // Missing optional files are expected to result in empty objects with
         // no entries in it.
-        if (values[0]->is_object() && values[0]->empty()) {
+        if (values[0]->is_object() and values[0]->empty()) {
             as_expected = true;
         };
     };
diff --git a/test/buildtool/build_engine/target_map/target_map.test.cpp b/test/buildtool/build_engine/target_map/target_map.test.cpp
index ae376b14..061ce387 100644
--- a/test/buildtool/build_engine/target_map/target_map.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map.test.cpp
@@ -175,7 +175,7 @@ TEST_CASE("simple targets", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         auto artifacts = result->Artifacts();
         ExpressionPtr artifact = artifacts->Get("c/d/foo", none_t{});
@@ -201,7 +201,7 @@ TEST_CASE("simple targets", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         auto artifacts = result->Artifacts();
         ExpressionPtr artifact = artifacts->Get("c/d/link", none_t{});
@@ -799,7 +799,7 @@ TEST_CASE("generator functions in string arguments", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->ToJson()["index.txt"]["type"] == "KNOWN");
         CHECK(result->Blobs()[0] == "bar.txt;baz.txt;foo.txt;link");
@@ -823,7 +823,7 @@ TEST_CASE("generator functions in string arguments", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->ToJson()["index.txt"]["type"] == "KNOWN");
         CHECK(result->Blobs()[0] == "bar.txt;baz.txt;foo.txt;link");
@@ -920,7 +920,7 @@ TEST_CASE("built-in rules", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->Map().size() == 1);
         CHECK(result->Artifacts()->ToJson()["out"]["type"] == "ACTION");
@@ -945,7 +945,7 @@ TEST_CASE("built-in rules", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts() == result->RunFiles());
         auto stage = result->Artifacts()->ToJson();
@@ -991,7 +991,7 @@ TEST_CASE("built-in rules", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->ToJson()["generated.txt"]["type"] ==
               "KNOWN");
@@ -1017,7 +1017,7 @@ TEST_CASE("built-in rules", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->ToJson()["generated_link"]["type"] ==
               "KNOWN");
@@ -1051,7 +1051,7 @@ TEST_CASE("built-in rules", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(bar_result->Artifacts()->ToJson()["foo.txt."]["type"] == "KNOWN");
         CHECK(
@@ -1155,7 +1155,7 @@ TEST_CASE("target reference", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->ToJson()["hello.txt"]["type"] == "ACTION");
         CHECK(result->Artifacts()->ToJson()["hello.txt"]["data"]["path"] ==
@@ -1187,7 +1187,7 @@ TEST_CASE("target reference", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->ToJson()["link"]["type"] == "ACTION");
         CHECK(result->Artifacts()->ToJson()["link"]["data"]["path"] == "link");
@@ -1218,7 +1218,7 @@ TEST_CASE("target reference", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Artifacts()->ToJson()["absolute"]["data"]["path"] ==
               "x/x/foo");
@@ -1319,7 +1319,7 @@ TEST_CASE("trees", "[target_map]") {
                     error_msg = msg;
                 });
         }
-        CHECK(!error);
+        CHECK(not error);
         CHECK(error_msg == "NONE");
         CHECK(result->Actions().size() == 1);
         CHECK(result->Actions()[0]->ToJson()["input"]["tree"]["type"] ==
diff --git a/test/buildtool/build_engine/target_map/target_map_internals.test.cpp b/test/buildtool/build_engine/target_map/target_map_internals.test.cpp
index c562b8fd..7db66c7c 100644
--- a/test/buildtool/build_engine/target_map/target_map_internals.test.cpp
+++ b/test/buildtool/build_engine/target_map/target_map_internals.test.cpp
@@ -55,11 +55,11 @@ TEST_CASE("No conflict", "[tree_conflict]") {
     REQUIRE(no_overlap);
     auto no_overlap_conflict =
         BuildMaps::Target::Utils::tree_conflict(no_overlap);
-    CHECK(!no_overlap_conflict);
+    CHECK(not no_overlap_conflict);
 
     auto single_root = Expression::FromJson(R"({ ".": "content-1"})"_json);
     REQUIRE(single_root);
     auto single_root_conflict =
         BuildMaps::Target::Utils::tree_conflict(single_root);
-    CHECK(!single_root_conflict);
+    CHECK(not single_root_conflict);
 }
diff --git a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
index 103c7be3..3aae8db2 100644
--- a/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
+++ b/test/buildtool/execution_api/bazel/bazel_cas_client.test.cpp
@@ -61,7 +61,7 @@ TEST_CASE("Bazel internals: CAS Client", "[execution_api]") {
         auto digests = cas_client.FindMissingBlobs(instance_name, {digest});
         CHECK(digests.size() <= 1);
 
-        if (!digests.empty()) {
+        if (not digests.empty()) {
             // Upload blob, if not found
             std::vector<gsl::not_null<BazelBlob const*>> to_upload{&blob};
             CHECK(cas_client.BatchUpdateBlobs(
diff --git a/test/buildtool/execution_engine/traverser/traverser.test.cpp b/test/buildtool/execution_engine/traverser/traverser.test.cpp
index c500a0d2..fcdc5ef7 100644
--- a/test/buildtool/execution_engine/traverser/traverser.test.cpp
+++ b/test/buildtool/execution_engine/traverser/traverser.test.cpp
@@ -174,12 +174,12 @@ class TestProject {
                                     action_id, std::filesystem::path{output})
                                     .Id();
             auto [_, is_inserted] = artifacts_to_be_built_.insert(out_id);
-            if (!is_inserted) {
+            if (not is_inserted) {
                 return false;
             }
         }
         auto inputs_desc = ActionDescription::inputs_t{};
-        if (!inputs.empty()) {
+        if (not inputs.empty()) {
             command.emplace_back("FROM");
             for (auto const& input_desc : inputs) {
                 auto artifact = ArtifactDescription::FromJson(input_desc);
diff --git a/test/buildtool/logging/log_sink_file.test.cpp b/test/buildtool/logging/log_sink_file.test.cpp
index 069480be..2dde74b8 100644
--- a/test/buildtool/logging/log_sink_file.test.cpp
+++ b/test/buildtool/logging/log_sink_file.test.cpp
@@ -114,7 +114,7 @@ TEST_CASE("LogSinkFile", "[logging]") {
         for (auto const& line : lines) {
             CHECK_THAT(
                 line,
-                Catch::Matchers::ContainsSubstring("somecontent") ||
+                Catch::Matchers::ContainsSubstring("somecontent") or
                     Catch::Matchers::ContainsSubstring("this is thread"));
         }
     }
diff --git a/test/buildtool/multithreading/async_map_consumer.test.cpp b/test/buildtool/multithreading/async_map_consumer.test.cpp
index a2de18b7..f65c7851 100644
--- a/test/buildtool/multithreading/async_map_consumer.test.cpp
+++ b/test/buildtool/multithreading/async_map_consumer.test.cpp
@@ -237,7 +237,7 @@ TEST_CASE("ErrorPropagation", "[async_map_consumer]") {
             [&fail_cont_counter]() { fail_cont_counter++; });
     }
     CHECK(execution_failed);
-    CHECK(!consumer_called);
+    CHECK(not consumer_called);
     CHECK(fail_cont_counter == 1);
 }
 
diff --git a/test/buildtool/multithreading/task.test.cpp b/test/buildtool/multithreading/task.test.cpp
index fab83547..772b3e83 100644
--- a/test/buildtool/multithreading/task.test.cpp
+++ b/test/buildtool/multithreading/task.test.cpp
@@ -47,18 +47,18 @@ struct RefCaptureCallable {
 
 TEST_CASE("Default constructed task is empty", "[task]") {
     Task t;
-    CHECK(!t);
-    CHECK(!(Task()));
-    CHECK(!(Task{}));
+    CHECK(not t);
+    CHECK(not(Task()));
+    CHECK(not(Task{}));
 }
 
 TEST_CASE("Task constructed from empty function is empty", "[task]") {
     std::function<void()> empty_function;
     Task t_from_empty_function{empty_function};
 
-    CHECK(!Task(std::function<void()>{}));
-    CHECK(!Task(empty_function));
-    CHECK(!t_from_empty_function);
+    CHECK(not Task(std::function<void()>{}));
+    CHECK(not Task(empty_function));
+    CHECK(not t_from_empty_function);
 }
 
 TEST_CASE("Task constructed from user defined callable object is not empty",
diff --git a/test/utils/large_objects/large_object_utils.cpp b/test/utils/large_objects/large_object_utils.cpp
index de8e6c7d..a30a9276 100644
--- a/test/utils/large_objects/large_object_utils.cpp
+++ b/test/utils/large_objects/large_object_utils.cpp
@@ -95,7 +95,7 @@ auto LargeObjectUtils::GenerateFile(std::filesystem::path const& path,
 
     try {
         std::ofstream stream(path);
-        for (std::size_t i = 0; i < step_count && stream.good(); ++i) {
+        for (std::size_t i = 0; i < step_count and stream.good(); ++i) {
             const std::size_t index = (pool_index + i * pool_shift) % kPoolSize;
             if (i != step_count - 1) {
                 stream << Pool::Instance()[index];