← Back to branch summary

~brianaker/libmemcached/gear-clean

« back to all changes in this revision

Viewing changes to libtest/unittest.cc

  • Committer: Brian Aker
  • Date: 2013-01-24 11:17:17 UTC
  • mto: This revision was merged to the branch mainline in revision 1144.
  • Revision ID: brian@tangent.org-20130124111717-nmiq5yf0v1ov9jhk
Correct style, use of newer YATL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtest/unittest.cc
111
111
  try {
112
112
    _SUCCESS;
113
113
  }
114
 
  catch (libtest::__success)
 
114
  catch (const libtest::__success&)
115
115
  {
116
116
    return TEST_SUCCESS;
117
117
  }
128
128
  try {
129
129
    SKIP_IF(true);
130
130
  }
131
 
  catch (libtest::__skipped e)
 
131
  catch (const libtest::__skipped&)
132
132
  {
133
133
    return TEST_SUCCESS;
134
134
  }
147
147
  try {
148
148
    throw libtest::__skipped(LIBYATL_DEFAULT_PARAM, "basic test");
149
149
  }
150
 
  catch (libtest::__skipped e)
 
150
  catch (const libtest::__skipped&)
151
151
  {
152
152
    return TEST_SUCCESS;
153
153
  }
396
396
 
397
397
  test_skip(true, has_drizzled());
398
398
 
399
 
  test_skip(true, server_startup(*servers, "drizzled", get_free_port(), 0, NULL, false));
 
399
  test_skip(true, server_startup(*servers, "drizzled", get_free_port(), NULL));
400
400
 
401
401
  return TEST_SUCCESS;
402
402
}
407
407
  test_true(servers and servers->validate());
408
408
 
409
409
  test_skip(true, has_gearmand());
410
 
  test_skip(true, server_startup(*servers, "gearmand", get_free_port(), 0, NULL, false));
 
410
  test_skip(true, server_startup(*servers, "gearmand", get_free_port(), NULL));
411
411
  servers->clear();
412
412
 
413
413
  return TEST_SUCCESS;
442
442
  test_true(servers);
443
443
 
444
444
  fatal::disable();
445
 
  ASSERT_EQ(servers->start_server(testing_service, LIBTEST_FAIL_PORT, 0, NULL, false), true);
 
445
  ASSERT_EQ(servers->start_server(testing_service, LIBTEST_FAIL_PORT, NULL), true);
446
446
  fatal::enable();
447
447
 
448
448
  return TEST_SUCCESS;
453
453
  server_startup_st *servers= (server_startup_st*)object;
454
454
  test_true(servers);
455
455
 
456
 
  ASSERT_EQ(servers->start_server(testing_service, get_free_port(), 0, NULL, false), true);
 
456
  ASSERT_EQ(servers->start_server(testing_service, get_free_port(), NULL), true);
457
457
 
458
458
  test_true(servers->last());
459
459
  pid_t last_pid= servers->last()->pid();
476
476
  server_startup_st *servers= (server_startup_st*)object;
477
477
  test_true(servers);
478
478
 
479
 
  test_true(servers->start_socket_server(testing_service, get_free_port(), 0, NULL, false));
 
479
  test_true(servers->start_socket_server(testing_service, get_free_port(), NULL));
480
480
 
481
481
  return TEST_SUCCESS;
482
482
}
494
494
    if (HAVE_LIBMEMCACHED)
495
495
    {
496
496
      test_true(has_memcached_sasl());
497
 
      test_true(server_startup(*servers, "memcached-sasl", get_free_port(), 0, NULL, false));
 
497
      test_true(server_startup(*servers, "memcached-sasl", get_free_port(), NULL));
498
498
 
499
499
      return TEST_SUCCESS;
500
500
    }
893
893
static test_return_t fatal_message_TEST(void *)
894
894
{
895
895
  ASSERT_EQ(fatal_calls++, fatal::disabled_counter());
896
 
  fatal_message("Fatal test");
 
896
  FATAL("Fatal test");
897
897
 
898
898
  return TEST_SUCCESS;
899
899
}
932
932
 
933
933
static test_return_t check_for_drizzle(void *)
934
934
{
935
 
  test_skip(true, HAVE_LIBDRIZZLE);
936
935
  test_skip(true, has_drizzled());
937
936
 
938
937
  testing_service= "drizzled";
1108
1107
 
1109
1108
static test_return_t check_for_curl(void *)
1110
1109
{
 
1110
  test_skip_valgrind();
1111
1111
  test_skip(true, HAVE_LIBCURL);
1112
1112
  return TEST_SUCCESS;
1113
1113
}