Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / src / testsuite.cpp

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index b7a9835e009d888e780f17aac1f0701b9821f54c..bc68cb5f108c360ee95eb025bddcf076547e6d67 100644 (file)
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -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,35 @@ 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;
+                               cout << (ServerInstance->Modules->Unload(modname.c_str()) ? "\nSUCCESS!\n" : "\nFAILURE\n");
+                               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;
        }
@@ -178,6 +186,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;
@@ -186,9 +271,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 (...)
        {
@@ -205,7 +288,7 @@ bool TestSuite::DoThreadTests()
        {
                try
                {
-                       te->Create(tst);
+                       te->Start(tst);
                }
                catch (CoreException &ce)
                {