X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftestsuite.cpp;h=9ab30ff2d2b1a2c7805f74392593e8326ee421a9;hb=985c2bd1e6ea0bba467143406b83ba4a9f77fce1;hp=f02b3aed36602b48da13b55d86c47aedd2ce8c42;hpb=14b1960421814bcc6e5a744dad3d0b6d81a2771c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index f02b3aed3..9ab30ff2d 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -11,19 +11,43 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDtestsuite */
+/* $Core */
 
 #include "inspircd.h"
 #include "testsuite.h"
+#include "threadengine.h"
+#include "wildcard.h"
 #include <iostream>
 
 using namespace std;
 
+class TestSuiteThread : public Thread
+{
+ public:
+	TestSuiteThread() : Thread()
+	{
+	}
+
+	virtual ~TestSuiteThread()
+	{
+	}
+
+	virtual void Run()
+	{
+		while (GetExitFlag() == false)
+		{
+			cout << "Test suite thread run...\n";
+			sleep(5);
+		}
+	}
+};
+
 TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	cout << "\n\n*** STARTING TESTSUITE ***\n";
 
 	std::string modname;
+	char choice;
 
 	while (1)
 	{
@@ -31,8 +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";
-	
-		switch (fgetc(stdin))
+		cout << "(5) Wildcard and CIDR tests\n";
+
+		cout << endl << "(X) Exit test suite\n";
+
+		cout << "\nChoices (Enter one or more options as a list then press enter, e.g. 15X): ";
+		cin >> choice;
+
+		if (!choice)
+			continue;
+
+		switch (choice)
 		{
 			case '1':
 				FOREACH_MOD(I_OnRunTestSuite, OnRunTestSuite());
@@ -50,13 +83,123 @@ 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;
+			default:
+				cout << "Invalid option\n";
+			break;
 		}
 		cout << endl;
 	}
 }
 
+/* Test that x matches y with match() */
+#define WCTEST(x, y) cout << "match(\"" << x << "\",\"" << y "\") " << ((passed = (match(x, y))) ? " 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")
+
+/* 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")
+/* 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")
+
+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");
+	WCTEST("foobar.test", "fo?bar.*t");
+	WCTEST("foobar", "foobar");
+	WCTEST("foobar", "foo***bar");
+
+	WCTESTNOT("foobar", "bazqux");
+	WCTESTNOT("foobar", "*qux");
+	WCTESTNOT("foobar", "foo*x");
+	WCTESTNOT("foobar", "baz*");
+	WCTESTNOT("foobar", "foo???r");
+	WCTESTNOT("foobar", "");
+	WCTESTNOT("", "foobar");
+	WCTESTNOT("OperServ", "O");
+	WCTESTNOT("O", "OperServ");
+	WCTESTNOT("foobar.tst", "fo?bar.*g");
+
+	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", "@");
+	CIDRTESTNOT("brain@1.2.3.4", "");
+
+	return true;
+}
+
 bool TestSuite::DoThreadTests()
 {
+	std::string anything;
+	ThreadEngine* te = NULL;
+
+	cout << "Creating new ThreadEngine class...\n";
+	try
+	{
+		ThreadEngineFactory* tef = new ThreadEngineFactory();
+		te = tef->Create(ServerInstance);
+		delete tef;
+	}
+	catch (...)
+	{
+		cout << "Creation failed, test failure.\n";
+		return false;
+	}
+	cout << "Creation success, type " << te->GetName() << "\n";
+
+	cout << "Allocate: new TestSuiteThread...\n";
+	TestSuiteThread* tst = new TestSuiteThread();
+
+	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 << "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... " << flush;
+	delete tst;
+	cout << "Done!\n";
+
+	cout << "Delete ThreadEngine... ";
+	delete te;
+	cout << "Done!\n";
+
 	return true;
 }