avoid implicit cast to bool

12 files changed, 16 insertions, 16 deletions

diff --git a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp
index 3dc203b27e2..e6e6c7de686 100644
--- a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp
+++ b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp
@@ -35,7 +35,7 @@ struct Fixture
         vespalib::Memory memory_exp(exp);
         vespalib::Slime expSlime;
         size_t used = vespalib::slime::JsonFormat::decode(memory_exp, expSlime);
-        EXPECT_TRUE(used);
+        EXPECT_TRUE(used > 0);
         EXPECT_EQUAL(expSlime, *slime);
     }
 };
@@ -135,7 +135,7 @@ struct DenseFixture
         vespalib::Memory memory_exp(exp);
         vespalib::Slime expSlime;
         size_t used = vespalib::slime::JsonFormat::decode(memory_exp, expSlime);
-        EXPECT_TRUE(used);
+        EXPECT_TRUE(used > 0);
         EXPECT_EQUAL(expSlime, *slime);
     }
 };
diff --git a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
index 244749c98ab..bd8bdf8cd11 100644
--- a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
+++ b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp
@@ -1267,7 +1267,7 @@ struct TestContext {
         MappedFileInput file(path);
         Slime slime;
         EXPECT_TRUE(file.valid());
-        EXPECT_TRUE(JsonFormat::decode(file, slime));
+        EXPECT_TRUE(JsonFormat::decode(file, slime) > 0);
         int64_t num_tests = slime.get()["num_tests"].asLong();
         Cursor &tests = slime.get()["tests"];
         EXPECT_GREATER(num_tests, 0u);
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index aea13de69da..e9934b6dbbb 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -779,7 +779,7 @@ void MetricManagerTest::testJsonOutput()
     using namespace vespalib::slime;
     vespalib::Slime slime;
     size_t parsed = JsonFormat::decode(vespalib::Memory(jsonData), slime);
-    if (!parsed) {
+    if (parsed == 0) {
         vespalib::SimpleBuffer buffer;
         JsonFormat::encode(slime, buffer, false);
         std::ostringstream ost;
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 26b43d272aa..c2f536e9dda 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -461,12 +461,12 @@ Test::assertSlime(const std::string &exp, const DocsumReply &reply, uint32_t id,
         vespalib::slime::JsonFormat::encode(slime, buf, false);
         vespalib::Slime tmpSlime;
         size_t used = vespalib::slime::JsonFormat::decode(buf.get(), tmpSlime);
-        EXPECT_TRUE(used);
+        EXPECT_TRUE(used > 0);
         slime = std::move(tmpSlime);
     }
     vespalib::Slime expSlime;
     size_t used = vespalib::slime::JsonFormat::decode(exp, expSlime);
-    EXPECT_TRUE(used);
+    EXPECT_TRUE(used > 0);
     return EXPECT_EQUAL(expSlime, slime);
 }
 
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 6d646bf3f4b..2d0ff39efa4 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -119,7 +119,7 @@ FieldBlock::FieldBlock(const vespalib::string &jsonInput)
     : input(jsonInput), slime(), binary(1024), json()
 {
     size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
-    EXPECT_TRUE(used);
+    EXPECT_TRUE(used > 0);
     {
         search::SlimeOutputRawBufAdapter adapter(binary);
         vespalib::slime::JsonFormat::encode(slime, adapter, true);
diff --git a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
index 9c4ce323e1e..db707e4aa97 100644
--- a/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
+++ b/searchcore/src/tests/proton/summaryengine/summaryengine.cpp
@@ -213,12 +213,12 @@ verify(vespalib::stringref exp, const Slime &slime) {
     Memory expMemory(exp);
     vespalib::Slime expSlime;
     size_t used = vespalib::slime::JsonFormat::decode(expMemory, expSlime);
-    EXPECT_TRUE(used);
+    EXPECT_TRUE(used > 0);
     vespalib::SimpleBuffer output;
     vespalib::slime::JsonFormat::encode(slime, output, true);
     Slime reSlimed;
     used = vespalib::slime::JsonFormat::decode(output.get(), reSlimed);
-    EXPECT_TRUE(used);
+    EXPECT_TRUE(used > 0);
     EXPECT_EQUAL(expSlime, reSlimed);
 }
 
diff --git a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
index ce86f274164..b2e324eb42e 100644
--- a/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
+++ b/searchsummary/src/tests/docsummary/slime_summary/slime_summary_test.cpp
@@ -24,7 +24,7 @@ struct FieldBlock {
         : slime(), binary(1024)
     {
         size_t used = vespalib::slime::JsonFormat::decode(jsonInput, slime);
-        EXPECT_TRUE(used);
+        EXPECT_TRUE(used > 0);
         search::SlimeOutputRawBufAdapter adapter(binary);
         vespalib::slime::BinaryFormat::encode(slime, adapter);
     }
diff --git a/storage/src/tests/common/hostreporter/util.cpp b/storage/src/tests/common/hostreporter/util.cpp
index ad4931cb15f..e0563a431e6 100644
--- a/storage/src/tests/common/hostreporter/util.cpp
+++ b/storage/src/tests/common/hostreporter/util.cpp
@@ -26,7 +26,7 @@ reporterToSlime(HostReporter &hostReporter, vespalib::Slime &slime) {
     std::string jsonData = json.str();
     size_t parsed = JsonFormat::decode(Memory(jsonData), slime);
 
-    if (!parsed) {
+    if (parsed == 0) {
         CPPUNIT_FAIL("jsonData is not json:\n" + jsonData);
     }
 }
diff --git a/storage/src/tests/storageserver/statereportertest.cpp b/storage/src/tests/storageserver/statereportertest.cpp
index 32bc0ded492..3a71444e74c 100644
--- a/storage/src/tests/storageserver/statereportertest.cpp
+++ b/storage/src/tests/storageserver/statereportertest.cpp
@@ -130,7 +130,7 @@ vespalib::Slime slime; \
     size_t parsed = JsonFormat::decode(vespalib::Memory(jsonData), slime); \
     vespalib::SimpleBuffer buffer;                                      \
     JsonFormat::encode(slime, buffer, false); \
-    if (!parsed) { \
+    if (parsed == 0) { \
         std::ostringstream error; \
         error << "Failed to parse JSON: '\n" \
               << jsonData << "'\n:" << buffer.get().make_string() << "\n"; \
diff --git a/vespalib/src/tests/slime/slime_binary_format_test.cpp b/vespalib/src/tests/slime/slime_binary_format_test.cpp
index 6f84b264d9b..e6661cbf554 100644
--- a/vespalib/src/tests/slime/slime_binary_format_test.cpp
+++ b/vespalib/src/tests/slime/slime_binary_format_test.cpp
@@ -632,7 +632,7 @@ TEST("testOptionalDecodeOrder") {
 
 Slime from_json(const vespalib::string &json) {
     Slime slime;
-    EXPECT_TRUE(vespalib::slime::JsonFormat::decode(json, slime));
+    EXPECT_TRUE(vespalib::slime::JsonFormat::decode(json, slime) > 0);
     return slime;
 }
 
diff --git a/vespalib/src/tests/slime/slime_json_format_test.cpp b/vespalib/src/tests/slime/slime_json_format_test.cpp
index 313c7bd41c3..d1f77f09af1 100644
--- a/vespalib/src/tests/slime/slime_json_format_test.cpp
+++ b/vespalib/src/tests/slime/slime_json_format_test.cpp
@@ -64,13 +64,13 @@ std::string json_string(const std::string &str) {
 
 std::string normalize(const std::string &json) {
     Slime slime;
-    EXPECT_GREATER(vespalib::slime::JsonFormat::decode(json, slime), 0u);
+    EXPECT_TRUE(vespalib::slime::JsonFormat::decode(json, slime) > 0);
     return make_json(slime, true);
 }
 
 std::string normalize(Input &input) {
     Slime slime;
-    EXPECT_GREATER(vespalib::slime::JsonFormat::decode(input, slime), 0u);
+    EXPECT_TRUE(vespalib::slime::JsonFormat::decode(input, slime) > 0);
     return make_json(slime, true);
 }
 
diff --git a/vsm/src/tests/docsum/docsum.cpp b/vsm/src/tests/docsum/docsum.cpp
index 668fb2e2a08..4409c5f6215 100644
--- a/vsm/src/tests/docsum/docsum.cpp
+++ b/vsm/src/tests/docsum/docsum.cpp
@@ -116,7 +116,7 @@ DocsumTest::assertSlimeFieldWriter(SlimeFieldWriter & sfw, const FieldValue & fv
 
     vespalib::Slime expSlime;
     size_t used = vespalib::slime::JsonFormat::decode(exp, expSlime);
-    EXPECT_TRUE(used);
+    EXPECT_TRUE(used > 0);
     EXPECT_EQUAL(expSlime, gotSlime);
 }