Tidy up some of the internals a bit, making things a bit more extensible and future...

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

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index f294ae70d5394a96ffd219773c8c6636b2a24cd1..8343aed27a38012e3762aa12885d7c4ec5771358 100644 (file)
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -11,12 +11,11 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDtestsuite */
+/* $Core */
 
 #include "inspircd.h"
 #include "testsuite.h"
 #include "threadengine.h"
-#include "wildcard.h"
 #include <iostream>
 
 using namespace std;
@@ -98,42 +97,67 @@ 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))) ? " SUCCESS!\n" : " FAILURE\n")
+#define WCTEST(x, y) cout << "match(\"" << x << "\",\"" << y "\") " << ((passed = (InspIRCd::Match(x, y, NULL))) ? " 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)))) ? " SUCCESS!\n" : " FAILURE\n")
+#define WCTESTNOT(x, y) cout << "!match(\"" << x << "\",\"" << y "\") " << ((passed = ((!InspIRCd::Match(x, y, NULL)))) ? " 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))) ? " SUCCESS!\n" : " FAILURE\n")
+#define CIDRTEST(x, y) cout << "match(\"" << x << "\",\"" << y "\", true) " << ((passed = (InspIRCd::MatchCIDR(x, y, NULL))) ? " 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)))) ? " SUCCESS!\n" : " FAILURE\n")
+#define CIDRTESTNOT(x, y) cout << "!match(\"" << x << "\",\"" << y "\", true) " << ((passed = ((!InspIRCd::MatchCIDR(x, y, NULL)))) ? " 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*");
-       WCTESTNOT("foobar", "foo???r");
-       WCTESTNOT("foobar", "");
+    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");
 
        CIDRTEST("brain@1.2.3.4", "*@1.2.0.0/16");
        CIDRTEST("brain@1.2.3.4", "*@1.2.3.0/24");
-
        CIDRTEST("192.168.3.97", "192.168.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");
-
        CIDRTESTNOT("1.2.3.4", "1.2.4.0/24");
-
        CIDRTESTNOT("brain@1.2.3.4", "*@/24");
        CIDRTESTNOT("brain@1.2.3.4", "@1.2.3.4/9");
        CIDRTESTNOT("brain@1.2.3.4", "@");