Replace classic C boolean operators with keywords

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

4 files changed, 17 insertions, 17 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);
 }