X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ftest.hpp;h=d904070008c8a64b3fe0586be8aa03490fa5d5d5;hb=61b948a92ab79734b009a438b5cf3bfad03cb59d;hp=71cd707f4f612f6cfe72b5418deb222d2f537fa0;hpb=9cd57ce737375540f6c3b5e2e3684160e5c4bfce;p=awesomized%2Flibmemcached

diff --git a/libtest/test.hpp b/libtest/test.hpp
index 71cd707f..d9040700 100644
--- a/libtest/test.hpp
+++ b/libtest/test.hpp
@@ -1,9 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest, libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  Copyright (C) 2006-2009 Brian Aker
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -35,48 +34,69 @@
  *
  */
 
-
 /*
   Structures for generic tests.
 */
 
+#pragma once
+
+#ifndef YATL_FULL
+# define YATL_FULL 1
+#endif
+
+#ifndef __PRETTY_FUNCTION__
+# define __PRETTY_FUNCTION__ __func__
+#endif
+
+#define YATL_STRINGIFY(x) #x
+#define YATL_TOSTRING(x) YATL_STRINGIFY(x)
+#define YATL_AT __FILE__ ":" YATL_TOSTRING(__LINE__)
+#define YATL_AT_PARAM __func__, AT
+#define YATL_UNIQUE __FILE__ ":" YATL_TOSTRING(__LINE__) "_unique"
+#define YATL_UNIQUE_FUNC_NAME __FILE__ ":" YATL_TOSTRING(__LINE__) "_unique_func"
+
+#define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
+
 #include <cstdio>
 #include <cstdlib>
-#include <stdint.h>
 #include <arpa/inet.h>
 
 #include <libtest/visibility.h>
+#include <libtest/version.h>
 
+#include <libtest/vchar.hpp>
 #include <libtest/error.h>
+#include <libtest/exception.hpp>
+#include <libtest/exception/disconnected.hpp>
+#include <libtest/exception/fatal.hpp>
+#include <libtest/result.hpp>
+
+#include <libtest/has.hpp>
+#include <libtest/error.h>
+#include <libtest/strerror.h>
+#include <libtest/timer.hpp>
+#include <libtest/alarm.h>
+#include <libtest/stream.h>
+#include <libtest/comparison.hpp>
+#include <libtest/server.h>
+#include <libtest/server_container.h>
+#include <libtest/wait.h>
 #include <libtest/callbacks.h>
 #include <libtest/test.h>
-#include <libtest/strerror.h>
+#include <libtest/dream.h>
 #include <libtest/core.h>
 #include <libtest/runner.h>
-#include <libtest/stats.h>
+#include <libtest/port.h>
+#include <libtest/is_local.hpp>
+#include <libtest/socket.hpp>
 #include <libtest/collection.h>
 #include <libtest/framework.h>
 #include <libtest/get.h>
-#include <libtest/stream.h>
-
-#pragma once
-
-LIBTEST_API
-  in_port_t default_port();
-
-LIBTEST_API
-  void set_default_port(in_port_t port);
-
-LIBTEST_API
-  const char* default_socket();
-
-LIBTEST_API
-  void set_default_socket(const char *socket);
-
-#ifdef __cplusplus
-#define test_literal_param(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
-#else
-#define test_literal_param(X) (X), ((size_t)((sizeof(X) - 1)))
-#endif
-
-#define test_string_make_from_cstr(X) (X), ((X) ? strlen(X) : 0)
+#include <libtest/cmdline.h>
+#include <libtest/string.hpp>
+#include <libtest/binaries.h>
+#include <libtest/http.hpp>
+#include <libtest/cpu.hpp>
+#include <libtest/tmpfile.hpp>
+#include <libtest/client.hpp>
+#include <libtest/thread.hpp>