X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftestsuite.cpp;h=cff6d9b93d480c05538f763a430c569283fb3adc;hb=ce168051e23bf7a33410ad17a4b78f5da478dbbe;hp=719da031319c21455ea8ff360cd4a316c21b0bd2;hpb=4d4882d667c2c2eea180219e0c76d15cc1f49415;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 719da0313..cff6d9b93 100644
--- 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;
@@ -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,47 @@ 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*");
+	WCTESTNOT("foobar", "foo???r");
+	WCTESTNOT("foobar", "");
+
+	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");
+
+	CIDRTESTNOT("brain@1.2.3.4", "*@/24");
+	CIDRTESTNOT("brain@1.2.3.4", "@1.2.3.4/9");
+	CIDRTESTNOT("brain@1.2.3.4", "@");
+	CIDRTESTNOT("brain@1.2.3.4", "");
+
+	return passed;
+}
+
 bool TestSuite::DoThreadTests()
 {
 	std::string anything;
@@ -108,19 +155,33 @@ bool TestSuite::DoThreadTests()
 		cout << "Creation failed, test failure.\n";
 		return false;
 	}
-	cout << "Creation success!\n";
+	cout << "Creation success, type " << te->GetName() << "\n";
 
-	cout << "Creating new thread of type TestSuiteThread...\n";
+	cout << "Allocate: new TestSuiteThread...\n";
 	TestSuiteThread* tst = new TestSuiteThread();
 
-	cout << "Create new thread based on TestSuiteThread...\n";
-	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 any key to end test.\n";
-	getchar();
+	cout << "Type any line and press enter to end test.\n";
+	cin >> anything;
 
 	/* Thread engine auto frees thread on delete */
-	cout << "Waiting for thread to exit...";
+	cout << "Waiting for thread to exit... " << flush;
 	delete tst;
 	cout << "Done!\n";