X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftestsuite.cpp;h=a7a9ec99b925cc55ae44b0462308c69016e12b07;hb=b9006ce3cba742ca2a22d601ba1a63a47b0402c9;hp=c107217b74d6ab68315187bffefdd2de3912c3bc;hpb=48f7fa6b11a0a6b1526c54914e60ddbe51ede8c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/testsuite.cpp b/src/testsuite.cpp
index c107217b7..a7a9ec99b 100644
--- a/src/testsuite.cpp
+++ b/src/testsuite.cpp
@@ -19,11 +19,10 @@
  */
 
 
-/* $Core */
+#ifdef INSPIRCD_ENABLE_TESTSUITE
 
 #include "inspircd.h"
 #include "testsuite.h"
-#include "threadengine.h"
 #include <iostream>
 
 class TestSuiteThread : public Thread
@@ -76,8 +75,12 @@ TestSuite::TestSuite()
 		switch (choice)
 		{
 			case '1':
-				FOREACH_MOD(I_OnRunTestSuite, OnRunTestSuite());
+			{
+				const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules();
+				for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
+					i->second->OnRunTestSuite();
 				break;
+			}
 			case '2':
 				std::cout << "Enter module filename to load: ";
 				std::cin >> modname;
@@ -331,23 +334,25 @@ bool TestSuite::DoThreadTests()
 
 bool TestSuite::DoGenerateUIDTests()
 {
+	const unsigned int UUID_LENGTH = UIDGenerator::UUID_LENGTH;
 	UIDGenerator uidgen;
 	uidgen.init(ServerInstance->Config->GetSID());
 	std::string first_uid = uidgen.GetUID();
-	if (first_uid.length() != UUID_LENGTH-1)
+
+	if (first_uid.length() != UUID_LENGTH)
 	{
 		std::cout << "GENERATEUID: Generated UID is " << first_uid.length() << " characters long instead of " << UUID_LENGTH-1 << std::endl;
 		return false;
 	}
 
-	if (uidgen.current_uid[UUID_LENGTH-1] != '\0')
+	if (uidgen.current_uid.c_str()[UUID_LENGTH] != '\0')
 	{
 		std::cout << "GENERATEUID: The null terminator is missing from the end of current_uid" << std::endl;
 		return false;
 	}
 
 	// The correct UID when generating one for the first time is ...AAAAAA
-	std::string correct_uid = ServerInstance->Config->sid + std::string(UUID_LENGTH - 4, 'A');
+	std::string correct_uid = ServerInstance->Config->sid + std::string(UUID_LENGTH - 3, 'A');
 	if (first_uid != correct_uid)
 	{
 		std::cout << "GENERATEUID: Generated an invalid first UID: " << first_uid << " instead of " << correct_uid << std::endl;
@@ -356,7 +361,7 @@ bool TestSuite::DoGenerateUIDTests()
 
 	// Set current_uid to be ...Z99999
 	uidgen.current_uid[3] = 'Z';
-	for (unsigned int i = 4; i < UUID_LENGTH-1; i++)
+	for (unsigned int i = 4; i < UUID_LENGTH; i++)
 		uidgen.current_uid[i] = '9';
 
 	// Store the UID we'll be incrementing so we can display what's wrong later if necessary
@@ -364,7 +369,7 @@ bool TestSuite::DoGenerateUIDTests()
 	std::string generated_uid = uidgen.GetUID();
 
 	// Correct UID after incrementing ...Z99999 is ...0AAAAA
-	correct_uid = ServerInstance->Config->sid + "0" + std::string(UUID_LENGTH - 5, 'A');
+	correct_uid = ServerInstance->Config->sid + "0" + std::string(UUID_LENGTH - 4, 'A');
 
 	if (generated_uid != correct_uid)
 	{
@@ -373,7 +378,7 @@ bool TestSuite::DoGenerateUIDTests()
 	}
 
 	// Set current_uid to be ...999999 to see if it rolls over correctly
-	for (unsigned int i = 3; i < UUID_LENGTH-1; i++)
+	for (unsigned int i = 3; i < UUID_LENGTH; i++)
 		uidgen.current_uid[i] = '9';
 
 	before_increment.assign(uidgen.current_uid);
@@ -394,3 +399,4 @@ TestSuite::~TestSuite()
 	std::cout << "\n\n*** END OF TEST SUITE ***\n";
 }
 
+#endif