X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftestsuite.cpp;h=8f89fd65e144b63b689a7b7fea3854e7071cffd0;hb=22862b8f1a6f42be6640224ee3f704f532604723;hp=8343aed27a38012e3762aa12885d7c4ec5771358;hpb=4b8661270d999e302d183de5184c8cafd574aa62;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 8343aed27..8f89fd65e 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -1,12 +1,12 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*	   +------------------------------------+
+ *	   | Inspire Internet Relay Chat Daemon |
+ *	   +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
- *          the file COPYING for details.
+ *		  the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -111,45 +111,57 @@ bool TestSuite::DoWildTests()
 	cout << "\n\nWildcard and CIDR tests\n\n";
 	bool passed = false;
 
-    WCTEST("foobar", "*");
-    WCTEST("foobar", "foo*");
-    WCTEST("foobar", "*bar");
-    WCTEST("foobar", "foo??r");
-    WCTEST("foobar.test", "fo?bar.*t");
-    WCTEST("foobar.test", "fo?bar.t*t");
-    WCTEST("foobar.tttt", "fo?bar.**t");
-    WCTEST("foobar", "foobar");
-    WCTEST("foobar", "foo***bar");
-    WCTEST("foobar", "*foo***bar");
-    WCTEST("foobar", "**foo***bar");
-    WCTEST("foobar", "**foobar*");
-    WCTEST("foobar", "**foobar**");
-    WCTEST("foobar", "**foobar");
-    WCTEST("foobar", "**f?*?ar");
-    WCTEST("foobar", "**f?*b?r");
-    WCTEST("foofar", "**f?*f*r");
-    WCTEST("foofar", "**f?*f*?");
-    WCTEST("r", "*");
-    WCTEST("", "");
-    WCTEST("test@foo.bar.test", "*@*.bar.test");
-    WCTEST("test@foo.bar.test", "*test*@*.bar.test");
-    WCTEST("test@foo.bar.test", "*@*test");
-
-    WCTESTNOT("foobar", "bazqux");
-    WCTESTNOT("foobar", "*qux");
-    WCTESTNOT("foobar", "foo*x");
-    WCTESTNOT("foobar", "baz*");
-    WCTESTNOT("foobar", "foo???r");
-    WCTESTNOT("foobar", "foobars");
-    WCTESTNOT("foobar", "**foobar**h");
-    WCTESTNOT("foobar", "**foobar**h*");
-    WCTESTNOT("foobar", "**f??*bar?");
-    WCTESTNOT("foobar", "");
-    WCTESTNOT("", "foobar");
-    WCTESTNOT("OperServ", "O");
-    WCTESTNOT("O", "OperServ");
-    WCTESTNOT("foobar.tst", "fo?bar.*g");
-    WCTESTNOT("foobar.test", "fo?bar.*tt");
+	WCTEST("foobar", "*");
+	WCTEST("foobar", "foo*");
+	WCTEST("foobar", "*bar");
+	WCTEST("foobar", "foo??r");
+	WCTEST("foobar.test", "fo?bar.*t");
+	WCTEST("foobar.test", "fo?bar.t*t");
+	WCTEST("foobar.tttt", "fo?bar.**t");
+	WCTEST("foobar", "foobar");
+	WCTEST("foobar", "foo***bar");
+	WCTEST("foobar", "*foo***bar");
+	WCTEST("foobar", "**foo***bar");
+	WCTEST("foobar", "**foobar*");
+	WCTEST("foobar", "**foobar**");
+	WCTEST("foobar", "**foobar");
+	WCTEST("foobar", "**f?*?ar");
+	WCTEST("foobar", "**f?*b?r");
+	WCTEST("foofar", "**f?*f*r");
+	WCTEST("foofar", "**f?*f*?");
+	WCTEST("r", "*");
+	WCTEST("", "");
+	WCTEST("test@foo.bar.test", "*@*.bar.test");
+	WCTEST("test@foo.bar.test", "*test*@*.bar.test");
+	WCTEST("test@foo.bar.test", "*@*test");
+
+	WCTEST("a", "*a");
+	WCTEST("aa", "*a");
+	WCTEST("aaa", "*a");
+	WCTEST("aaaa", "*a");
+	WCTEST("aaaaa", "*a");
+	WCTEST("aaaaaa", "*a");
+	WCTEST("aaaaaaa", "*a");
+	WCTEST("aaaaaaaa", "*a");
+	WCTEST("aaaaaaaaa", "*a");
+	WCTEST("aaaaaaaaaa", "*a");
+	WCTEST("aaaaaaaaaaa", "*a");
+
+	WCTESTNOT("foobar", "bazqux");
+	WCTESTNOT("foobar", "*qux");
+	WCTESTNOT("foobar", "foo*x");
+	WCTESTNOT("foobar", "baz*");
+	WCTESTNOT("foobar", "foo???r");
+	WCTESTNOT("foobar", "foobars");
+	WCTESTNOT("foobar", "**foobar**h");
+	WCTESTNOT("foobar", "**foobar**h*");
+	WCTESTNOT("foobar", "**f??*bar?");
+	WCTESTNOT("foobar", "");
+	WCTESTNOT("", "foobar");
+	WCTESTNOT("OperServ", "O");
+	WCTESTNOT("O", "OperServ");
+	WCTESTNOT("foobar.tst", "fo?bar.*g");
+	WCTESTNOT("foobar.test", "fo?bar.*tt");
 
 	CIDRTEST("brain@1.2.3.4", "*@1.2.0.0/16");
 	CIDRTEST("brain@1.2.3.4", "*@1.2.3.0/24");
@@ -174,9 +186,7 @@ bool TestSuite::DoThreadTests()
 	cout << "Creating new ThreadEngine class...\n";
 	try
 	{
-		ThreadEngineFactory* tef = new ThreadEngineFactory();
-		te = tef->Create(ServerInstance);
-		delete tef;
+		te = new ThreadEngine(ServerInstance);
 	}
 	catch (...)
 	{
@@ -193,7 +203,7 @@ bool TestSuite::DoThreadTests()
 	{
 		try
 		{
-			te->Create(tst);
+			te->Start(tst);
 		}
 		catch (CoreException &ce)
 		{