5 files changed, 97 insertions, 0 deletions
diff --git a/Swiften/Base/SConscript b/Swiften/Base/SConscript
index 8752ea8..1f07483 100644
--- a/Swiften/Base/SConscript
+++ b/Swiften/Base/SConscript
@@ -9,6 +9,7 @@ objects = swiften_env.SwiftenObject([
 			"Paths.cpp",
 			"String.cpp",
 			"IDGenerator.cpp",
+			"SimpleIDGenerator.cpp",
 			"sleep.cpp",
 		])
 swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Base/SimpleIDGenerator.cpp b/Swiften/Base/SimpleIDGenerator.cpp
new file mode 100644
index 0000000..06cccea
--- /dev/null
+++ b/Swiften/Base/SimpleIDGenerator.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Swiften/Base/SimpleIDGenerator.h"
+
+namespace Swift {
+
+SimpleIDGenerator::SimpleIDGenerator() {
+}
+
+std::string SimpleIDGenerator::generateID() {
+	bool carry = true;
+	size_t i = 0;
+	while (carry && i < currentID.size()) {
+		char c = currentID[i];
+		if (c >= 'z') {
+			currentID[i] = 'a';
+		}
+		else {
+			currentID[i] = c+1;
+			carry = false;
+		}
+		++i;
+	}
+	if (carry) {
+		currentID += 'a';
+	}
+	return currentID;
+}
+
+}
diff --git a/Swiften/Base/SimpleIDGenerator.h b/Swiften/Base/SimpleIDGenerator.h
new file mode 100644
index 0000000..677c8d1
--- /dev/null
+++ b/Swiften/Base/SimpleIDGenerator.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace Swift {
+	class SimpleIDGenerator {
+		public:
+			SimpleIDGenerator();
+
+			std::string generateID();
+
+		private:
+			std::string currentID;
+	};
+}
diff --git a/Swiften/Base/UnitTest/SimpleIDGeneratorTest.cpp b/Swiften/Base/UnitTest/SimpleIDGeneratorTest.cpp
new file mode 100644
index 0000000..80aff02
--- /dev/null
+++ b/Swiften/Base/UnitTest/SimpleIDGeneratorTest.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <set>
+
+#include "Swiften/Base/SimpleIDGenerator.h"
+
+using namespace Swift;
+
+class SimpleIDGeneratorTest : public CppUnit::TestFixture
+{
+		CPPUNIT_TEST_SUITE(SimpleIDGeneratorTest);
+		CPPUNIT_TEST(testGenerate);
+		CPPUNIT_TEST_SUITE_END();
+
+	public:
+		SimpleIDGeneratorTest() {}
+
+		void setUp() {
+			generatedIDs_.clear();
+		}
+
+		void testGenerate() {
+			SimpleIDGenerator testling;
+			for (unsigned int i = 0; i < 26*4; ++i) {
+				std::string id = testling.generateID();
+				CPPUNIT_ASSERT(generatedIDs_.insert(id).second);
+			}
+		}
+	
+	private:
+		std::set<std::string> generatedIDs_;
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SimpleIDGeneratorTest);
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 6d85d84..379576d 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -249,6 +249,7 @@ if env["SCONS_STAGE"] == "build" :
 			File("Avatars/UnitTest/VCardAvatarManagerTest.cpp"),
 			File("Avatars/UnitTest/CombinedAvatarProviderTest.cpp"),
 			File("Base/UnitTest/IDGeneratorTest.cpp"),
+			File("Base/UnitTest/SimpleIDGeneratorTest.cpp"),
 			File("Base/UnitTest/StringTest.cpp"),
 			File("Base/UnitTest/DateTimeTest.cpp"),
 			File("Base/UnitTest/ByteArrayTest.cpp"),