[utest] Fix bogus assertion message arguments
These were all pasto cases that wound up passing nullptr as
ASSERT_*/EXPECT_* failure message. A smart enough compiler
notices statically the attempt to pass nullptr as a printf
%s argument.
Change-Id: I2921fd3a9b5f845946281e6183bd90dd1997ee5f
diff --git a/zircon/system/utest/core/vmo/vmo-clone2.cpp b/zircon/system/utest/core/vmo/vmo-clone2.cpp
index 880a42a..f826235 100644
--- a/zircon/system/utest/core/vmo/vmo-clone2.cpp
+++ b/zircon/system/utest/core/vmo/vmo-clone2.cpp
@@ -659,7 +659,7 @@
ASSERT_EQ(vmo.set_size(0), ZX_OK);
- ASSERT_TRUE(vmo_check(clone, 2), ZX_OK);
+ ASSERT_TRUE(vmo_check(clone, 2));
END_TEST;
}
diff --git a/zircon/system/utest/fidl/decoding_tests.cpp b/zircon/system/utest/fidl/decoding_tests.cpp
index 6681f76..51d4592 100644
--- a/zircon/system/utest/fidl/decoding_tests.cpp
+++ b/zircon/system/utest/fidl/decoding_tests.cpp
@@ -246,7 +246,7 @@
ArrayCount(handles), &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
EXPECT_EQ(message.inline_struct.handle, dummy_handle_0);
END_TEST;
@@ -273,7 +273,7 @@
ArrayCount(handles), &error);
ASSERT_EQ(status, ZX_ERR_INVALID_ARGS);
- ASSERT_NONNULL(error, error);
+ ASSERT_NONNULL(error);
ASSERT_EQ(message.inline_struct.handle, ep0.get());
ASSERT_FALSE(IsPeerValid(zx::unowned_eventpair(ep1)));
@@ -306,7 +306,7 @@
ArrayCount(handles), &error);
ASSERT_EQ(status, ZX_ERR_INVALID_ARGS);
- ASSERT_NONNULL(error, error);
+ ASSERT_NONNULL(error);
ASSERT_EQ(message.inline_struct.handle, ep0.get());
ASSERT_FALSE(IsPeerValid(zx::unowned_eventpair(ep1)));
@@ -742,7 +742,7 @@
nullptr, 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
@@ -822,7 +822,7 @@
sizeof(message), nullptr, 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
@@ -991,7 +991,7 @@
sizeof(message), handles, ArrayCount(handles), &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
@@ -1240,7 +1240,7 @@
sizeof(message), nullptr, 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
diff --git a/zircon/system/utest/fidl/encoding_tests.cpp b/zircon/system/utest/fidl/encoding_tests.cpp
index cc9a171..cecd3fc 100644
--- a/zircon/system/utest/fidl/encoding_tests.cpp
+++ b/zircon/system/utest/fidl/encoding_tests.cpp
@@ -275,7 +275,7 @@
ArrayCount(handles), &actual_handles, &error);
ASSERT_EQ(status, ZX_ERR_INVALID_ARGS);
- ASSERT_NONNULL(error, error);
+ ASSERT_NONNULL(error);
ASSERT_EQ(actual_handles, 0);
ASSERT_EQ(message.inline_struct.handle, FIDL_HANDLE_PRESENT);
ASSERT_EQ(handles[0], ep0.get());
diff --git a/zircon/system/utest/fidl/on_error_handle_tests.cpp b/zircon/system/utest/fidl/on_error_handle_tests.cpp
index 081083f..43e3b86c 100644
--- a/zircon/system/utest/fidl/on_error_handle_tests.cpp
+++ b/zircon/system/utest/fidl/on_error_handle_tests.cpp
@@ -68,7 +68,7 @@
fbl::count_of(handles), &actual_handles, &error);
ASSERT_EQ(status, ZX_ERR_INVALID_ARGS);
- ASSERT_NONNULL(error, error);
+ ASSERT_NONNULL(error);
ASSERT_EQ(handles[0], ZX_HANDLE_INVALID);
ASSERT_EQ(handles[1], event_handle);
@@ -99,7 +99,7 @@
num_handles, &actual_handles, &error);
ASSERT_EQ(status, ZX_ERR_INVALID_ARGS);
- ASSERT_NONNULL(error, error);
+ ASSERT_NONNULL(error);
ASSERT_FALSE(IsPeerValid(zx::unowned_eventpair(eventpair_b)));
}
@@ -128,7 +128,7 @@
fbl::count_of(handles), nullptr, &error);
ASSERT_EQ(status, ZX_ERR_INVALID_ARGS);
- ASSERT_NONNULL(error, error);
+ ASSERT_NONNULL(error);
ASSERT_FALSE(IsPeerValid(zx::unowned_eventpair(eventpair_b)));
END_TEST;
@@ -184,7 +184,7 @@
buffer, buf_size,
handles, fbl::count_of(handles), &out_error);
ASSERT_EQ(status, ZX_ERR_INVALID_ARGS);
- ASSERT_NONNULL(out_error, out_error);
+ ASSERT_NONNULL(out_error);
// The peer was closed by the decoder
ASSERT_FALSE(IsPeerValid(zx::unowned_eventpair(eventpair_a)));
diff --git a/zircon/system/utest/fidl/validating_tests.cpp b/zircon/system/utest/fidl/validating_tests.cpp
index bb038a7..0b7eb34 100644
--- a/zircon/system/utest/fidl/validating_tests.cpp
+++ b/zircon/system/utest/fidl/validating_tests.cpp
@@ -163,7 +163,7 @@
ArrayCount(handles), &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
EXPECT_EQ(message.inline_struct.handle, FIDL_HANDLE_PRESENT);
END_TEST;
@@ -531,7 +531,7 @@
0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
@@ -597,7 +597,7 @@
sizeof(message), 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
@@ -752,7 +752,7 @@
sizeof(message), ArrayCount(handles), &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
@@ -980,7 +980,7 @@
sizeof(message), 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
END_TEST;
}
@@ -1578,7 +1578,7 @@
auto status = fidl_validate(&fidl_test_coding_SampleXUnionStructTable, &message,
sizeof(fidl_xunion_t), 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
EXPECT_STR_EQ(error, "non-nullable xunion is absent");
END_TEST;
@@ -1594,7 +1594,7 @@
auto status = fidl_validate(&fidl_test_coding_SampleNullableXUnionStructTable, &message,
sizeof(fidl_xunion_t), 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
EXPECT_STR_EQ(error, "empty xunion must have zero as ordinal");
END_TEST;
@@ -1614,7 +1614,7 @@
auto status = fidl_validate(&fidl_test_coding_SampleXUnionStructTable, &message,
sizeof(SampleXUnionStruct), 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
EXPECT_STR_EQ(error, "xunion with zero as ordinal must be empty");
END_TEST;
@@ -1634,7 +1634,7 @@
auto status = fidl_validate(&fidl_test_coding_SampleNullableXUnionStructTable, &message,
sizeof(SampleNullableXUnionStruct), 0, &error);
EXPECT_EQ(status, ZX_ERR_INVALID_ARGS);
- EXPECT_NONNULL(error, error);
+ EXPECT_NONNULL(error);
EXPECT_STR_EQ(error, "xunion with zero as ordinal must be empty");
END_TEST;
diff --git a/zircon/system/utest/fvm/fvm.cpp b/zircon/system/utest/fvm/fvm.cpp
index 78ee1af..e0124ff 100644
--- a/zircon/system/utest/fvm/fvm.cpp
+++ b/zircon/system/utest/fvm/fvm.cpp
@@ -3280,7 +3280,7 @@
char fvm_driver[PATH_MAX];
ASSERT_EQ(StartFVMTest(512, 1 << 20, 64lu * (1 << 20), ramdisk_path, fvm_driver), 0);
fbl::unique_fd fd(open(ramdisk_path, O_RDWR));
- ASSERT_TRUE(fd, 0);
+ ASSERT_TRUE(fd);
checker.SetDevice(std::move(fd));
ASSERT_FALSE(checker.Validate(), "Checker should be missing block size");
@@ -3296,7 +3296,7 @@
ASSERT_EQ(StartFVMTest(512, 1 << 20, 64lu * (1 << 20), ramdisk_path, fvm_driver), 0);
fbl::unique_fd fd(open(ramdisk_path, O_RDWR));
- ASSERT_TRUE(fd, 0);
+ ASSERT_TRUE(fd);
fvm::Checker checker(std::move(fd), 512, true);
ASSERT_TRUE(checker.Validate());
