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

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 8343aed27..c61e106b6 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-2010 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.
  *
  * ---------------------------------------------------
  */
@@ -41,7 +41,7 @@ class TestSuiteThread : public Thread
 	}
 };
 
-TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
+TestSuite::TestSuite()
 {
 	cout << "\n\n*** STARTING TESTSUITE ***\n";
 
@@ -55,6 +55,8 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
 		cout << "(3) Unload a module\n";
 		cout << "(4) Threading tests\n";
 		cout << "(5) Wildcard and CIDR tests\n";
+		cout << "(6) Comma sepstream tests\n";
+		cout << "(7) Space sepstream tests\n";
 
 		cout << endl << "(X) Exit test suite\n";
 
@@ -68,29 +70,39 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
 		{
 			case '1':
 				FOREACH_MOD(I_OnRunTestSuite, OnRunTestSuite());
-			break;
+				break;
 			case '2':
 				cout << "Enter module filename to load: ";
 				cin >> modname;
-				cout << (Instance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
-			break;
+				cout << (ServerInstance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+				break;
 			case '3':
 				cout << "Enter module filename to unload: ";
 				cin >> modname;
-				cout << (Instance->Modules->Unload(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
-			break;
+				{
+					Module* m = ServerInstance->Modules->Find(modname);
+					cout << (ServerInstance->Modules->Unload(m) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+					ServerInstance->AtomicActions.Run();
+				}
+				break;
 			case '4':
 				cout << (DoThreadTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
-			break;
+				break;
 			case '5':
 				cout << (DoWildTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
-			break;
+				break;
+			case '6':
+				cout << (DoCommaSepStreamTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
+				break;
+			case '7':
+				cout << (DoSpaceSepStreamTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
+				break;
 			case 'X':
 				return;
-			break;
+				break;
 			default:
 				cout << "Invalid option\n";
-			break;
+				break;
 		}
 		cout << endl;
 	}
@@ -111,45 +123,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");
@@ -166,6 +190,83 @@ bool TestSuite::DoWildTests()
 	return true;
 }
 
+
+#define STREQUALTEST(x, y) cout << "==(\"" << x << ",\"" << y "\") " << ((passed = (x == y)) ? "SUCCESS\n" : "FAILURE\n")
+
+bool TestSuite::DoCommaSepStreamTests()
+{
+	bool passed = false;
+	irc::commasepstream items("this,is,a,comma,stream");
+	std::string item;
+	int idx = 0;
+
+	while (items.GetToken(item))
+	{
+		idx++;
+
+		switch (idx)
+		{
+			case 1:
+				STREQUALTEST(item, "this");
+				break;
+			case 2:
+				STREQUALTEST(item, "is");
+				break;
+			case 3:
+				STREQUALTEST(item, "a");
+				break;
+			case 4:
+				STREQUALTEST(item, "comma");
+				break;
+			case 5:
+				STREQUALTEST(item, "stream");
+				break;
+			default:
+				cout << "COMMASEPSTREAM: FAILURE: Got an index too many! " << idx << " items\n";
+				break;
+		}
+	}
+
+	return true;
+}
+
+bool TestSuite::DoSpaceSepStreamTests()
+{
+	bool passed = false;
+
+	irc::spacesepstream list("this is a space stream");
+	std::string item;
+	int idx = 0;
+
+	while (list.GetToken(item))
+	{
+		idx++;
+
+		switch (idx)
+		{
+			case 1:
+				STREQUALTEST(item, "this");
+				break;
+			case 2:
+				STREQUALTEST(item, "is");
+				break;
+			case 3:
+				STREQUALTEST(item, "a");
+				break;
+			case 4:
+				STREQUALTEST(item, "space");
+				break;
+			case 5:
+				STREQUALTEST(item, "stream");
+				break;
+			default:
+				cout << "SPACESEPSTREAM: FAILURE: Got an index too many! " << idx << " items\n";
+				break;
+		}
+	}
+	return true;
+}
+
 bool TestSuite::DoThreadTests()
 {
 	std::string anything;
@@ -174,9 +275,7 @@ bool TestSuite::DoThreadTests()
 	cout << "Creating new ThreadEngine class...\n";
 	try
 	{
-		ThreadEngineFactory* tef = new ThreadEngineFactory();
-		te = tef->Create(ServerInstance);
-		delete tef;
+		te = new ThreadEngine;
 	}
 	catch (...)
 	{
@@ -193,7 +292,7 @@ bool TestSuite::DoThreadTests()
 	{
 		try
 		{
-			te->Create(tst);
+			te->Start(tst);
 		}
 		catch (CoreException &ce)
 		{