Convert CIDR matching and wildcard matching to operate on std::strings

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

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 60817970333b0d0cd85b85bf7d5e5d1873c90953..a4d8c871c29f507cb6a5412307e24640c85a3d92 100644 (file)
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -16,6 +16,7 @@
 #include "inspircd.h"
 #include "testsuite.h"
 #include "threadengine.h"
+#include "wildcard.h"
 #include <iostream>
 
 using namespace std;
@@ -33,10 +34,10 @@ class TestSuiteThread : public Thread
 
        virtual void Run()
        {
-               while (1)
+               while (GetExitFlag() == false)
                {
                        cout << "Test suite thread run...\n";
-                       sleep(10);
+                       sleep(5);
                }
        }
 };
@@ -46,9 +47,7 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
        cout << "\n\n*** STARTING TESTSUITE ***\n";
 
        std::string modname;
-       std::string choice;
-
-       ServerInstance->SE->Blocking(fileno(stdin));
+       char choice;
 
        while (1)
        {
@@ -56,13 +55,17 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
                cout << "(2) Load a module\n";
                cout << "(3) Unload a module\n";
                cout << "(4) Threading tests\n";
+               cout << "(5) Wildcard and CIDR tests\n";
 
                cout << endl << "(X) Exit test suite\n";
 
                cout << "\nChoice: ";
                cin >> choice;
 
-               switch (*choice.begin())
+               if (!choice)
+                       continue;
+
+               switch (choice)
                {
                        case '1':
                                FOREACH_MOD(I_OnRunTestSuite, OnRunTestSuite());
@@ -80,6 +83,9 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
                        case '4':
                                cout << (DoThreadTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
                        break;
+                       case '5':
+                               cout << (DoWildTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
+                       break;
                        case 'X':
                                return;
                        break;
@@ -91,6 +97,40 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
        }
 }
 
+/* Test that x matches y with match() */
+#define WCTEST(x, y) cout << "match(\"" << x << "\",\"" << y "\") " << ((passed = (match(x, y) || passed)) ? " SUCCESS!\n" : " FAILURE\n")
+/* Test that x does not match y with match() */
+#define WCTESTNOT(x, y) cout << "!match(\"" << x << "\",\"" << y "\") " << ((passed = ((!match(x, y)) || passed)) ? " SUCCESS!\n" : " FAILURE\n")
+
+/* Test that x matches y with match() and cidr enabled */
+#define CIDRTEST(x, y) cout << "match(\"" << x << "\",\"" << y "\", true) " << ((passed = (match(x, y, true) || passed)) ? " SUCCESS!\n" : " FAILURE\n")
+/* Test that x does not match y with match() and cidr enabled */
+#define CIDRTESTNOT(x, y) cout << "!match(\"" << x << "\",\"" << y "\", true) " << ((passed = ((!match(x, y, true)) || passed)) ? " SUCCESS!\n" : " FAILURE\n")
+
+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");
+
+       WCTESTNOT("foobar", "bazqux");
+       WCTESTNOT("foobar", "*qux");
+       WCTESTNOT("foobar", "foo*x");
+       WCTESTNOT("foobar", "baz*");
+
+       CIDRTEST("brain@1.2.3.4", "*@1.2.0.0/16");
+       CIDRTEST("brain@1.2.3.4", "*@1.2.3.0/24");
+
+       CIDRTESTNOT("brain@1.2.3.4", "x*@1.2.0.0/16");
+       CIDRTESTNOT("brain@1.2.3.4", "*@1.3.4.0/24");
+
+       return passed;
+}
+
 bool TestSuite::DoThreadTests()
 {
        std::string anything;
@@ -108,21 +148,39 @@ bool TestSuite::DoThreadTests()
                cout << "Creation failed, test failure.\n";
                return false;
        }
-       cout << "Creation success!\n";
-
-       cout << "Creating new thread of type TestSuiteThread\n";
+       cout << "Creation success, type " << te->GetName() << "\n";
 
+       cout << "Allocate: new TestSuiteThread...\n";
        TestSuiteThread* tst = new TestSuiteThread();
 
-       te->Create(tst);
+       cout << "ThreadEngine::Create on TestSuiteThread...\n";
+       try
+       {
+               try
+               {
+                       te->Create(tst);
+               }
+               catch (CoreException &ce)
+               {
+                       cout << "Failure: " << ce.GetReason() << endl;
+               }
+       }
+       catch (...)
+       {
+               cout << "Failure, unhandled exception\n";
+       }
 
-       cout << "Press enter to end test.";
+       cout << "Type any line and press enter to end test.\n";
        cin >> anything;
 
-       /* Auto frees thread */
+       /* Thread engine auto frees thread on delete */
+       cout << "Waiting for thread to exit... " << flush;
        delete tst;
+       cout << "Done!\n";
 
+       cout << "Delete ThreadEngine... ";
        delete te;
+       cout << "Done!\n";
 
        return true;
 }