Index: src/libchcore/Tests/TestsTString.cpp
===================================================================
diff -u -N -rbe86ea000c8ee746379fd5018c9f43a9b1cddfa1 -r14d99757fbeaa3e55d43b45b043033d8ba81980b
--- src/libchcore/Tests/TestsTString.cpp	(.../TestsTString.cpp)	(revision be86ea000c8ee746379fd5018c9f43a9b1cddfa1)
+++ src/libchcore/Tests/TestsTString.cpp	(.../TestsTString.cpp)	(revision 14d99757fbeaa3e55d43b45b043033d8ba81980b)
@@ -59,6 +59,20 @@
 	EXPECT_EQ(strValue, _T("Some "));
 }
 
+TEST(TStringTests, Construct_FromWchar_SpecificLen)
+{
+	const wchar_t* pszText = L"Some test string\0XXXXXXXXXXXX";
+	TString strValue(pszText, 5);
+	EXPECT_EQ(strValue, _T("Some "));
+}
+
+TEST(TStringTests, Construct_FromWchar_LenTooLong)
+{
+	const wchar_t* pszText = L"Some test string\0XXXXXXXXXXXX";
+	TString strValue(pszText, 5000);
+	EXPECT_EQ(strValue, _T("Some test string"));
+}
+
 TEST(TStringTests, AssignmentOperator_WithNormalValue)
 {
 	TString strValue;
@@ -516,6 +530,12 @@
 	EXPECT_EQ(strValue.Find(NULL, 0), TString::npos);
 }
 
+TEST(TStringTests, Find_SearchStringLongerThanThis)
+{
+	TString strValue(_T("Some string"));
+	EXPECT_EQ(strValue.Find(_T("Some longer string"), 0), TString::npos);
+}
+
 TEST(TStringTests, Replace_WithPtrToString)
 {
 	TString strValue(_T("Some string"));