2 files changed, 20 insertions, 0 deletions
diff --git a/Swiften/Base/String.h b/Swiften/Base/String.h
index 0a5530c..7a6a9cc 100644
--- a/Swiften/Base/String.h
+++ b/Swiften/Base/String.h
@@ -91,12 +91,16 @@ namespace Swift {
 
 			String& operator=(const String& o) {
 				data_ = o.data_;
 				return *this;
 			}
 
+			bool contains(const String& o) {
+				return data_.find(o.data_) != std::string::npos;
+			}
+
 			char operator[](size_t i) const {
 				return data_[i];
 			}
 
 			friend bool operator>(const String& a, const String& b) {
 				return a.data_ > b.data_;
diff --git a/Swiften/Base/UnitTest/StringTest.cpp b/Swiften/Base/UnitTest/StringTest.cpp
index 6ad12fd..87e1a99 100644
--- a/Swiften/Base/UnitTest/StringTest.cpp
+++ b/Swiften/Base/UnitTest/StringTest.cpp
@@ -22,12 +22,15 @@ class StringTest : public CppUnit::TestFixture
 		CPPUNIT_TEST(testReplaceAll);
 		CPPUNIT_TEST(testReplaceAll_LastChar);
 		CPPUNIT_TEST(testReplaceAll_ConsecutiveChars);
 		CPPUNIT_TEST(testReplaceAll_MatchingReplace);
 		CPPUNIT_TEST(testGetLowerCase);
 		CPPUNIT_TEST(testSplit);
+ 		CPPUNIT_TEST(testContains);
+		CPPUNIT_TEST(testContainsFalse);
+		CPPUNIT_TEST(testContainsExact);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		StringTest() {}
 
 		void testGetLength() {
@@ -155,9 +158,22 @@ class StringTest : public CppUnit::TestFixture
 
 			CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(result.size()));
 			CPPUNIT_ASSERT_EQUAL(String("abc"), result[0]);
 			CPPUNIT_ASSERT_EQUAL(String("def"), result[1]);
 			CPPUNIT_ASSERT_EQUAL(String("ghi"), result[2]);
 		}
+
+		void testContains() {
+			CPPUNIT_ASSERT(String("abcde").contains(String("bcd")));
+		}
+
+		void testContainsFalse() {
+			CPPUNIT_ASSERT(!String("abcde").contains(String("abcdef")));
+		}
+
+		void testContainsExact() {
+			CPPUNIT_ASSERT(String("abcde").contains(String("abcde")));
+		}
+
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(StringTest);