* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
}
};
-TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
+TestSuite::TestSuite()
{
cout << "\n\n*** STARTING TESTSUITE ***\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";
case '2':
cout << "Enter module filename to load: ";
cin >> modname;
- cout << (Instance->Modules->Load(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+ 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");
+ {
+ 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");
case '6':
cout << (DoCommaSepStreamTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
break;
+ case '7':
+ cout << (DoSpaceSepStreamTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
+ break;
case 'X':
return;
break;
}
-#define STREQUALTEST(x, y) cout << "commasepstreamtoken(\"" << x << ",\"" << y "\") " << ((passed = (x == y)) ? "SUCCESS\n" : "FAILURE\n")
+#define STREQUALTEST(x, y) cout << "==(\"" << x << ",\"" << y "\") " << ((passed = (x == y)) ? "SUCCESS\n" : "FAILURE\n")
bool TestSuite::DoCommaSepStreamTests()
{
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;
cout << "Creating new ThreadEngine class...\n";
try
{
- te = new ThreadEngine(ServerInstance);
+ te = new ThreadEngine;
}
catch (...)
{