3 files changed, 1 insertions, 47 deletions
diff --git a/include/modules.h b/include/modules.h
index b8c860fbc..86b620d07 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -896,13 +896,6 @@ class CoreExport Module : public classbase, public usecountbase
 	 */
 	virtual ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass);
 
-#ifdef INSPIRCD_ENABLE_TESTSUITE
-	/** Add test suite hooks here. These are used for testing functionality of a module
-	 * via the --testsuite debugging parameter.
-	 */
-	virtual void OnRunTestSuite();
-#endif
-
 	/** Called for every item in a NAMES list, so that modules may reformat portions of it as they see fit.
 	 * For example NAMESX, channel mode +u and +I, and UHNAMES.
 	 * @param issuer The user who is going to receive the NAMES list being built
diff --git a/include/testsuite.h b/include/testsuite.h
deleted file mode 100644
index c760513f8..000000000
--- a/include/testsuite.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * InspIRCd -- Internet Relay Chat Daemon
- *
- *
- * This file is part of InspIRCd.  InspIRCd is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation, version 2.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#pragma once
-
-#ifdef INSPIRCD_ENABLE_TESTSUITE
-
-class TestSuite
-{
- public:
-	TestSuite();
-	~TestSuite();
-
-	bool DoThreadTests();
-	bool DoWildTests();
-	bool DoCommaSepStreamTests();
-	bool DoSpaceSepStreamTests();
-	bool DoGenerateUIDTests();
-};
-
-#endif
diff --git a/include/uid.h b/include/uid.h
index 772c8a716..d24a63e94 100644
--- a/include/uid.h
+++ b/include/uid.h
@@ -18,12 +18,9 @@
 
 #pragma once
 
-class TestSuite;
-
 class CoreExport UIDGenerator
 {
-	friend class TestSuite;
-
+ private:
 	/** Holds the current UID. Used to generate the next one.
 	 */
 	std::string current_uid;