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

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index f02b3aed3..02d806480 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -15,15 +15,40 @@
 
 #include "inspircd.h"
 #include "testsuite.h"
+#include "threadengine.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;
+	std::string choice;
+
+	ServerInstance->SE->Blocking(fileno(stdin));
 
 	while (1)
 	{
@@ -31,8 +56,13 @@ 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 << endl << "(X) Exit test suite\n";
+
+		cout << "\nChoice: ";
+		cin >> choice;
+
+		switch (*choice.begin())
 		{
 			case '1':
 				FOREACH_MOD(I_OnRunTestSuite, OnRunTestSuite());
@@ -50,6 +80,12 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
 			case '4':
 				cout << (DoThreadTests() ? "\nSUCCESS!\n" : "\nFAILURE\n");
 			break;
+			case 'X':
+				return;
+			break;
+			default:
+				cout << "Invalid option\n";
+			break;
 		}
 		cout << endl;
 	}
@@ -57,6 +93,55 @@ TestSuite::TestSuite(InspIRCd* Instance) : ServerInstance(Instance)
 
 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;
 }