Rewrite of all old tests to new unittest framework. Also some work on testdb; more to come...

1 files changed, 12 insertions, 5 deletions

diff --git a/server/src/server.cc b/server/src/server.cc
index d9daf3a..9046594 100644
--- a/server/src/server.cc
+++ b/server/src/server.cc
@@ -129,6 +129,10 @@ void server()
 }
 
 #ifdef TEST_SERVER
+//deps: httpd.cc session.cc configuration.cc journal.cc journal_uploadserver.cc journal_commit.cc mutex.cc debug.cc sessionserialiser.cc sessionparser.cc saxparser.cc environment.cc semaphore.cc artefact.cc xml_encode_decode.cc database.cc pracrodaopgsql.cc pracrodaotest.cc pracrodao.cc entitylist.cc macrolist.cc templatelist.cc macroheaderparser.cc templateheaderparser.cc versionstr.cc exception.cc log.cc inotify.cc client_connection.cc admin_connection.cc admin_rc.cc admin_export.cc transactionparser.cc transactionhandler.cc templateparser.cc macroparser.cc queryhandlerpracro.cc luaquerymapper.cc queryhandlerpentominos.cc resumeparser.cc luaresume.cc luautil.cc widgetgenerator.cc widgetvalue.cc
+//cflags: -I.. -DWITHOUT_ARTEFACT -DWITHOUT_DB $(EXPAT_CFLAGS) $(PTHREAD_CFLAGS) $(HTTPD_CFLAGS) $(LUA_CFLAGS)
+//libs: $(EXPAT_LIBS) $(PTHREAD_LIBS) $(HTTPD_LIBS) $(LUA_LIBS)
+#include <test.h>
 
 #include <sys/types.h>
 #include <signal.h>
@@ -141,8 +145,12 @@ char request[] =
   "  <request macro=\"example\" template=\"example\"/>\n"
   "</pracro>\n";
 
-int main()
-{
+TEST_BEGIN;
+
+// TODO: Put some testcode here (see test.h for usable macros).
+TEST_TRUE(false, "No tests yet!");
+
+/*
   Conf::xml_basedir = "../xml/";
   // Make sure wo don't interrupt an already running server.
   Conf::server_port = 32100;
@@ -187,8 +195,7 @@ int main()
     kill(pid, SIGKILL); // Kill the server again.
     return 0;
   }
-  
-  return 1;
-}
+*/
+TEST_END;
 
 #endif/*TEST_SERVER*/