try {
_SUCCESS;
}
- catch (libtest::__success)
+ catch (const libtest::__success&)
{
return TEST_SUCCESS;
}
return TEST_FAILURE;
}
+static test_return_t test_throw_skip_macro_TEST(void *)
+{
+ try {
+ SKIP_IF(true);
+ }
+ catch (const libtest::__skipped&)
+ {
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ FAIL("SLIP_IF() failed to throw libtest::_skipped");
+ }
+
+ FAIL("SLIP_IF() failed to throw");
+
+ return TEST_FAILURE;
+}
+
+static test_return_t test_throw_skip_unless_macro_TEST(void *)
+{
+ try {
+ SKIP_UNLESS(false);
+ }
+ catch (const libtest::__skipped&)
+ {
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ FAIL("SLIP_UNLESS() failed to throw libtest::_skipped");
+ }
+
+ FAIL("SLIP_UNLESS() failed to throw");
+
+ return TEST_FAILURE;
+}
+
static test_return_t test_throw_skip_TEST(void *)
{
try {
- SKIP;
+ throw libtest::__skipped(LIBYATL_DEFAULT_PARAM, "basic test");
}
- catch (libtest::__skipped)
+ catch (const libtest::__skipped&)
{
return TEST_SUCCESS;
}
catch (...)
{
- return TEST_FAILURE;
+ FAIL("SLIP_IF() failed to throw libtest::_skipped");
}
+ FAIL("SLIP_IF() failed to throw");
+
return TEST_FAILURE;
}
}
#pragma GCC diagnostic ignored "-Wstack-protector"
+#ifdef __clang__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wformat-security"
+#endif
+
static test_return_t ASSERT_FALSE__TEST(void *)
{
try {
- ASSERT_FALSE_(true, __func__);
+ ASSERT_FALSE(true);
}
catch (const libtest::__failure& e)
{
- ASSERT_STREQ(e.what(), "Assertion '!true' [ ASSERT_FALSE__TEST ]");
+ ASSERT_STREQ(e.what(), "Assertion '!true'");
return TEST_SUCCESS;
}
catch (...)
return TEST_FAILURE;
}
+#ifdef __clang__
+# pragma GCC diagnostic pop
+#endif
+
+static test_return_t ASSERT_NEQ_FAIL_TEST(void *)
+{
+ try {
+ ASSERT_NEQ(1,1);
+ }
+ catch (const libtest::__failure& e)
+ {
+ ASSERT_STREQ(e.what(), "Assertion '1' == '1'");
+ return TEST_SUCCESS;
+ }
+ catch (...)
+ {
+ return TEST_FAILURE;
+ }
+
+ return TEST_FAILURE;
+}
+
+static test_return_t ASSERT_NEQ_TEST(void *)
+{
+ ASSERT_NEQ(1,0);
+
+ return TEST_SUCCESS;
+}
+
static test_return_t ASSERT_FALSE_TEST(void *)
{
try {
{
return TEST_SKIPPED; // Only run this when debugging
- test_compare(1, 2);
+ ASSERT_EQ(1, 2);
return TEST_SUCCESS;
}
// unsetenv() will cause issues with valgrind
_compare(__FILE__, __LINE__, __func__, 0, unsetenv("LIBTEST_LOCAL"), true);
- test_compare(0, unsetenv("LIBTEST_LOCAL"));
+ ASSERT_EQ(0, unsetenv("LIBTEST_LOCAL"));
test_false(test_is_local());
- test_compare(0, setenv("LIBTEST_LOCAL", "1", 1));
+ ASSERT_EQ(0, setenv("LIBTEST_LOCAL", "1", 1));
test_true(test_is_local());
if (temp.empty())
{
- test_compare(0, unsetenv("LIBTEST_LOCAL"));
+ ASSERT_EQ(0, unsetenv("LIBTEST_LOCAL"));
}
else
{
char *old_string= strdup(temp.c_str());
- test_compare(0, setenv("LIBTEST_LOCAL", old_string, 1));
+ ASSERT_EQ(0, setenv("LIBTEST_LOCAL", old_string, 1));
}
return TEST_SUCCESS;
static test_return_t var_exists_test(void *)
{
- test_compare(0, access("var", R_OK | W_OK | X_OK));
+ ASSERT_EQ(0, access("var", R_OK | W_OK | X_OK));
return TEST_SUCCESS;
}
static test_return_t var_tmp_exists_test(void *)
{
- test_compare(0, access("var/tmp", R_OK | W_OK | X_OK));
+ ASSERT_EQ(0, access("var/tmp", R_OK | W_OK | X_OK));
return TEST_SUCCESS;
}
static test_return_t var_run_exists_test(void *)
{
- test_compare(0, access("var/run", R_OK | W_OK | X_OK));
+ ASSERT_EQ(0, access("var/run", R_OK | W_OK | X_OK));
return TEST_SUCCESS;
}
static test_return_t var_log_exists_test(void *)
{
- test_compare(0, access("var/log", R_OK | W_OK | X_OK));
+ ASSERT_EQ(0, access("var/log", R_OK | W_OK | X_OK));
return TEST_SUCCESS;
}
static test_return_t var_drizzle_exists_test(void *)
{
- test_compare(0, access("var/drizzle", R_OK | W_OK | X_OK));
+ ASSERT_EQ(0, access("var/drizzle", R_OK | W_OK | X_OK));
return TEST_SUCCESS;
}
static test_return_t _compare_test_return_t_test(void *)
{
- test_compare(TEST_SUCCESS, TEST_SUCCESS);
+ ASSERT_EQ(TEST_SUCCESS, TEST_SUCCESS);
return TEST_SUCCESS;
}
{
test_skip(HAVE_LIBMEMCACHED, true);
#if defined(HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H) && HAVE_LIBMEMCACHED_1_0_TYPES_RETURN_H
- test_compare(MEMCACHED_SUCCESS, MEMCACHED_SUCCESS);
+ ASSERT_EQ(MEMCACHED_SUCCESS, MEMCACHED_SUCCESS);
#endif
return TEST_SUCCESS;
{
test_skip(HAVE_LIBGEARMAN, true);
#if defined(HAVE_LIBGEARMAN_1_0_RETURN_H) && HAVE_LIBGEARMAN_1_0_RETURN_H
- test_compare(GEARMAN_SUCCESS, GEARMAN_SUCCESS);
+ ASSERT_EQ(GEARMAN_SUCCESS, GEARMAN_SUCCESS);
#endif
return TEST_SUCCESS;
test_skip(true, has_drizzled());
- test_skip(true, server_startup(*servers, "drizzled", get_free_port(), 0, NULL, false));
+ test_skip(true, server_startup(*servers, "drizzled", get_free_port(), NULL));
return TEST_SUCCESS;
}
test_true(servers and servers->validate());
test_skip(true, has_gearmand());
- test_skip(true, server_startup(*servers, "gearmand", get_free_port(), 0, NULL, false));
+ test_skip(true, server_startup(*servers, "gearmand", get_free_port(), NULL));
servers->clear();
return TEST_SUCCESS;
static test_return_t test_skip_true_TEST(void*)
{
- test_compare(true, true);
- test_compare(false, false);
- test_compare(TEST_SUCCESS, skip_shim(true, true));
- test_compare(TEST_SUCCESS, skip_shim(false, false));
+ ASSERT_EQ(true, true);
+ ASSERT_EQ(false, false);
+ ASSERT_EQ(TEST_SUCCESS, skip_shim(true, true));
+ ASSERT_EQ(TEST_SUCCESS, skip_shim(false, false));
return TEST_SUCCESS;
}
static test_return_t test_skip_false_TEST(void*)
{
- test_compare(TEST_SKIPPED, skip_shim(true, false));
- test_compare(TEST_SKIPPED, skip_shim(false, true));
+ ASSERT_EQ(TEST_SKIPPED, skip_shim(true, false));
+ ASSERT_EQ(TEST_SKIPPED, skip_shim(false, true));
return TEST_SUCCESS;
}
test_true(servers);
fatal::disable();
- test_compare(servers->start_server(testing_service, LIBTEST_FAIL_PORT, 0, NULL, false), true);
+ ASSERT_EQ(servers->start_server(testing_service, LIBTEST_FAIL_PORT, NULL), true);
fatal::enable();
return TEST_SUCCESS;
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- test_compare(servers->start_server(testing_service, get_free_port(), 0, NULL, false), true);
+ ASSERT_EQ(servers->start_server(testing_service, get_free_port(), NULL), true);
test_true(servers->last());
pid_t last_pid= servers->last()->pid();
- test_compare(servers->last()->pid(), last_pid);
+ ASSERT_EQ(servers->last()->pid(), last_pid);
test_true(last_pid > 1);
- test_compare(kill(last_pid, 0), 0);
+ ASSERT_EQ(kill(last_pid, 0), 0);
test_true(servers->shutdown());
#if 0
- test_compare(servers->last()->pid(), -1);
- test_compare(kill(last_pid, 0), -1);
+ ASSERT_EQ(servers->last()->pid(), -1);
+ ASSERT_EQ(kill(last_pid, 0), -1);
#endif
return TEST_SUCCESS;
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- test_true(servers->start_socket_server(testing_service, get_free_port(), 0, NULL, false));
+ test_true(servers->start_socket_server(testing_service, get_free_port(), NULL));
return TEST_SUCCESS;
}
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- test_skip(false, bool(getenv("TESTS_ENVIRONMENT")));
+ test_skip(false, bool(getenv("LOG_COMPILER")));
if (MEMCACHED_SASL_BINARY)
{
if (HAVE_LIBMEMCACHED)
{
test_true(has_memcached_sasl());
- test_true(server_startup(*servers, "memcached-sasl", get_free_port(), 0, NULL, false));
+ test_true(server_startup(*servers, "memcached-sasl", get_free_port(), NULL));
return TEST_SUCCESS;
}
test_skip(0, access("/usr/bin/true", X_OK ));
Application true_app("/usr/bin/true");
- test_compare(Application::SUCCESS, true_app.run());
- test_compare(Application::SUCCESS, true_app.join());
+ ASSERT_EQ(Application::SUCCESS, true_app.run());
+ ASSERT_EQ(Application::SUCCESS, true_app.join());
return TEST_SUCCESS;
}
Application true_app("/usr/bin/true");
true_app.use_gdb(true);
- test_compare(Application::SUCCESS, true_app.run());
- test_compare(Application::SUCCESS, true_app.join());
+ ASSERT_EQ(Application::SUCCESS, true_app.run());
+ ASSERT_EQ(Application::SUCCESS, true_app.join());
return TEST_SUCCESS;
}
true_app.use_gdb(true);
const char *args[]= { "--fubar", 0 };
- test_compare(Application::SUCCESS, true_app.run(args));
- test_compare(Application::SUCCESS, true_app.join());
+ ASSERT_EQ(Application::SUCCESS, true_app.run(args));
+ ASSERT_EQ(Application::SUCCESS, true_app.join());
return TEST_SUCCESS;
}
Application true_app("/usr/bin/true");
const char *args[]= { "--fubar", 0 };
- test_compare(Application::SUCCESS, true_app.run(args));
- test_compare(Application::SUCCESS, true_app.join());
+ ASSERT_EQ(Application::SUCCESS, true_app.run(args));
+ ASSERT_EQ(Application::SUCCESS, true_app.join());
test_zero(true_app.stdout_result().size());
return TEST_SUCCESS;
true_app.will_fail();
const char *args[]= { "--fubar", 0 };
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
- test_compare(Application::INVALID_POSIX_SPAWN, true_app.run(args));
-#elif defined(TARGET_OS_FREEBSD) && TARGET_OS_FREEBSD
- test_compare(Application::INVALID_POSIX_SPAWN, true_app.run(args));
+#if defined(__APPLE__) && __APPLE__
+ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
+#elif defined(__FreeBSD__) && __FreeBSD__
+ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.run(args));
#else
- test_compare(Application::SUCCESS, true_app.run(args));
- test_compare(Application::INVALID_POSIX_SPAWN, true_app.join());
+ Application::error_t rc = true_app.run(args);
+ if (Application::SUCCESS == rc) {
+ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, true_app.join());
+ } else {
+ ASSERT_EQ(Application::INVALID_POSIX_SPAWN, rc);
+ }
#endif
test_zero(true_app.stdout_result().size());
{
libtest::http::GET get("http://foo.example.com/");
- test_compare(false, get.execute());
+ ASSERT_EQ(false, get.execute());
return TEST_SUCCESS;
}
libtest::vchar_t body;
libtest::http::POST post("http://foo.example.com/", body);
- test_compare(false, post.execute());
+ ASSERT_EQ(false, post.execute());
return TEST_SUCCESS;
}
libtest::vchar_t body;
libtest::http::TRACE trace("http://foo.example.com/", body);
- test_compare(false, trace.execute());
+ ASSERT_EQ(false, trace.execute());
return TEST_SUCCESS;
}
{
libtest::vchar_t response;
libtest::make_vector(response, test_literal_param("fubar\n"));
- test_compare(response, response);
+ ASSERT_EQ(response, response);
+
+ return TEST_SUCCESS;
+}
+
+static test_return_t vchar_t_make_append_TEST(void *)
+{
+ libtest::vchar_t hostname;
+ libtest::vchar::make(hostname, 23);
+ libtest::vchar::append(hostname, ".com");
+ ASSERT_EQ(28, hostname.size());
+ ASSERT_EQ(0, hostname[27]);
return TEST_SUCCESS;
}
Application true_app("/bin/echo");
const char *args[]= { "fubar", 0 };
- test_compare(Application::SUCCESS, true_app.run(args));
+ ASSERT_EQ(Application::SUCCESS, true_app.run(args));
while (true_app.slurp() == false) {} ;
libtest::vchar_t response;
make_vector(response, test_literal_param("fubar\n"));
- test_compare(response, true_app.stdout_result());
+ ASSERT_EQ(response, true_app.stdout_result());
}
return TEST_SUCCESS;
true_app.add_option("fubar");
- test_compare(Application::SUCCESS, true_app.run());
- test_compare(Application::SUCCESS, true_app.join());
+ ASSERT_EQ(Application::SUCCESS, true_app.run());
+ ASSERT_EQ(Application::SUCCESS, true_app.join());
libtest::vchar_t response;
make_vector(response, test_literal_param("fubar\n"));
- test_compare(response, true_app.stdout_result());
+ ASSERT_EQ(response, true_app.stdout_result());
}
return TEST_SUCCESS;
static test_return_t echo_fubar_BINARY(void *)
{
const char *args[]= { "fubar", 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline("/bin/echo", args));
+ ASSERT_EQ(EXIT_SUCCESS, exec_cmdline("/bin/echo", args));
return TEST_SUCCESS;
}
{
const char *args[]= { 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline("libtest/core-count", args, true));
+ ASSERT_EQ(EXIT_SUCCESS, exec_cmdline("libtest/core-count", args, true));
return TEST_SUCCESS;
}
{
const char *args[]= { "--quiet", 0 };
- test_compare(EXIT_FAILURE, exec_cmdline("libtest/wait", args, true));
+ ASSERT_EQ(EXIT_FAILURE, exec_cmdline("libtest/wait", args, true));
return TEST_SUCCESS;
}
{
const char *args[]= { "--quiet", "--help", 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
+ ASSERT_EQ(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
return TEST_SUCCESS;
}
{
const char *args[]= { "--quiet", "--version", 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
+ ASSERT_EQ(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
return TEST_SUCCESS;
}
const char *args[]= { "--quiet", "/etc/services", 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
+ ASSERT_EQ(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
return TEST_SUCCESS;
}
const char *args[]= { "/etc/services", 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
+ ASSERT_EQ(EXIT_SUCCESS, exec_cmdline("libtest/wait", args, true));
return TEST_SUCCESS;
}
wait_app.use_gdb(true);
const char *args[]= { "/etc/services", 0 };
- test_compare(Application::SUCCESS, wait_app.run(args));
- test_compare(Application::SUCCESS, wait_app.join());
+ ASSERT_EQ(Application::SUCCESS, wait_app.run(args));
+ ASSERT_EQ(Application::SUCCESS, wait_app.join());
return TEST_SUCCESS;
}
static test_return_t gdb_wait_services_appliction_TEST(void *)
{
test_skip(true, false);
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
- test_skip(0, TARGET_OS_OSX);
+#if defined(__APPLE__) && __APPLE__
+ test_skip(0, __APPLE__);
#endif
test_skip(0, access("/etc/services", R_OK ));
wait_app.use_gdb(true);
const char *args[]= { "/etc/services", 0 };
- test_compare(Application::SUCCESS, wait_app.run(args));
- test_compare(Application::SUCCESS, wait_app.join());
+ ASSERT_EQ(Application::SUCCESS, wait_app.run(args));
+ ASSERT_EQ(Application::SUCCESS, wait_app.join());
return TEST_SUCCESS;
}
test_skip(0, access("libtest/abort", X_OK ));
test_skip(true, false);
-#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
- test_skip(0, TARGET_OS_OSX);
+#if defined(__APPLE__) && __APPLE__
+ test_skip(0, __APPLE__);
#endif
libtest::Application abort_app("libtest/abort", true);
abort_app.use_gdb(true);
- test_compare(Application::SUCCESS, abort_app.run());
- test_compare(Application::SUCCESS, abort_app.join());
+ ASSERT_EQ(Application::SUCCESS, abort_app.run());
+ ASSERT_EQ(Application::SUCCESS, abort_app.join());
std::string gdb_filename= abort_app.gdb_filename();
test_skip(0, access(gdb_filename.c_str(), R_OK ));
const char *args[]= { "SIGABRT", gdb_filename.c_str(), 0 };
- test_compare(EXIT_SUCCESS, exec_cmdline("grep", args));
+ ASSERT_EQ(EXIT_SUCCESS, exec_cmdline("grep", args));
// Sanity test
args[0]= "THIS_WILL_NOT_BE_FOUND";
- test_compare(EXIT_FAILURE, exec_cmdline("grep", args));
+ ASSERT_EQ(EXIT_FAILURE, exec_cmdline("grep", args));
return TEST_SUCCESS;
}
static test_return_t fatal_TEST(void *)
{
- test_compare(fatal_calls++, fatal::disabled_counter());
+ ASSERT_EQ(fatal_calls++, fatal::disabled_counter());
throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Testing va_args based fatal(): %d", 10);
return TEST_SUCCESS;
check.reset();
check.offset(minutes, 2, 200);
- test_compare(check.minutes(), minutes);
+ ASSERT_EQ(check.minutes(), minutes);
return TEST_SUCCESS;
}
static test_return_t lookup_false_TEST(void *)
{
- if (libtest::lookup("does_not_exist.gearman.info"))
- {
- Error << "Broken DNS server detected";
- return TEST_SKIPPED;
- }
+ SKIP_IF_(libtest::lookup("does_not_exist.gearman.info"),
+ "Broken DNS server detected");
return TEST_SUCCESS;
}
{
test_skip(0, access("/usr/bin/touch", X_OK ));
std::string tmp= create_tmpfile(__func__);
- test_compare(-1, access(tmp.c_str(), R_OK));
- test_compare(-1, access(tmp.c_str(), F_OK));
+ ASSERT_EQ(-1, access(tmp.c_str(), R_OK));
+ ASSERT_EQ(-1, access(tmp.c_str(), F_OK));
Application touch_app("/usr/bin/touch");
const char *args[]= { tmp.c_str(), 0 };
- test_compare(Application::SUCCESS, touch_app.run(args));
- test_compare(Application::SUCCESS, touch_app.join());
+ ASSERT_EQ(Application::SUCCESS, touch_app.run(args));
+ ASSERT_EQ(Application::SUCCESS, touch_app.join());
- test_compare(0, access(tmp.c_str(), R_OK));
- test_compare(0, unlink(tmp.c_str()));
+ ASSERT_EQ(0, access(tmp.c_str(), R_OK));
+ ASSERT_EQ(0, unlink(tmp.c_str()));
return TEST_SUCCESS;
}
static test_return_t fatal_message_TEST(void *)
{
- test_compare(fatal_calls++, fatal::disabled_counter());
- fatal_message("Fatal test");
+ ASSERT_EQ(fatal_calls++, fatal::disabled_counter());
+ FATAL("Fatal test");
return TEST_SUCCESS;
}
static test_return_t default_port_TEST(void *)
{
in_port_t ret_port= default_port();
- test_compare(ret_port, libtest::default_port());
- test_compare(ret_port, libtest::default_port());
+ ASSERT_EQ(ret_port, libtest::default_port());
+ ASSERT_EQ(ret_port, libtest::default_port());
+
+ return TEST_SUCCESS;
+}
+static test_return_t check_for_VALGRIND(void *)
+{
+ test_skip_valgrind();
return TEST_SUCCESS;
}
static test_return_t check_for_drizzle(void *)
{
- test_skip(true, HAVE_LIBDRIZZLE);
test_skip(true, has_drizzled());
testing_service= "drizzled";
{"TEST_FAILURE", false, test_failure_test },
{"TEST_SUCCESS == 0", false, test_success_equals_one_test },
{"SUCCESS", false, test_throw_success_TEST },
- {"SKIP", false, test_throw_skip_TEST },
+ {"libtest::__skipped", false, test_throw_skip_TEST },
+ {"SKIP_IF", false, test_throw_skip_macro_TEST },
+ {"SKIP_UNLESS", false, test_throw_skip_unless_macro_TEST },
{"FAIL", false, test_throw_fail_TEST },
{"ASSERT_FALSE_", false, ASSERT_FALSE__TEST },
{"ASSERT_FALSE", false, ASSERT_FALSE_TEST },
+ {"ASSERT_NEQ", false, ASSERT_NEQ_TEST },
+ {"ASSERT_NEQ FAIL", false, ASSERT_NEQ_FAIL_TEST },
{0, 0, 0}
};
test_st application_tests[] ={
{"vchar_t", 0, vchar_t_TEST },
+ {"vchar_t make() append()", 0, vchar_t_make_append_TEST },
{"vchar_t compare()", 0, vchar_t_compare_neg_TEST },
{"true", 0, application_true_BINARY },
{"gbd true --fubar", 0, application_gdb_true_BINARY },
static test_return_t check_for_curl(void *)
{
+ test_skip_valgrind();
test_skip(true, HAVE_LIBCURL);
return TEST_SUCCESS;
}
{"fatal", disable_fatal_exception, enable_fatal_exception, fatal_message_TESTS },
{"number_of_cpus()", 0, 0, number_of_cpus_TESTS },
{"create_tmpfile()", 0, 0, create_tmpfile_TESTS },
- {"dns", 0, 0, dns_TESTS },
+ {"dns", check_for_VALGRIND, 0, dns_TESTS },
{"libtest::Timer", 0, 0, timer_TESTS },
{0, 0, 0, 0}
};
projects / awesomized / libmemcached / blobdiff