X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftestsuite.cpp;h=9ab30ff2d2b1a2c7805f74392593e8326ee421a9;hb=cc3503abc4e465c6d5c57a6e60716dafe0703aa5;hp=71ace375e295a7ebe60513051a9b5202695322a3;hpb=b87565e3441f25be17d35dac86f68661a7ec3bbd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index 71ace375e..9ab30ff2d 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDtestsuite */
+/* $Core */
 
 #include "inspircd.h"
 #include "testsuite.h"
@@ -56,11 +56,10 @@ 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) irc::string -> std::string dynamic cast\n";
 
 		cout << endl << "(X) Exit test suite\n";
 
-		cout << "\nChoice: ";
+		cout << "\nChoices (Enter one or more options as a list then press enter, e.g. 15X): ";
 		cin >> choice;
 
 		if (!choice)
@@ -87,14 +86,6 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
 			case '5':
 				cout << (DoWildTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
 			break;
-			case '6':
-				{
-					std::string* a = new std::string("test");
-					irc::string* b = (irc::string)a;
-					cout << "std::string value: '" << *a << "' irc::string value: '" << *b << "'" << endl;
-					delete a;
-				}
-			break;
 			case 'X':
 				return;
 			break;
@@ -125,6 +116,9 @@ bool TestSuite::DoWildTests()
 	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");
@@ -132,6 +126,10 @@ bool TestSuite::DoWildTests()
 	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");