Index: src/libchcore/Tests/TestsTTaskConfigVerifier.cpp
===================================================================
diff -u -N -rd18db617f4727a237c94b59af9b4328f829eda16 -r3526dc60304e69e55a129472a71594d4dacda5b2
--- src/libchcore/Tests/TestsTTaskConfigVerifier.cpp	(.../TestsTTaskConfigVerifier.cpp)	(revision d18db617f4727a237c94b59af9b4328f829eda16)
+++ src/libchcore/Tests/TestsTTaskConfigVerifier.cpp	(.../TestsTTaskConfigVerifier.cpp)	(revision 3526dc60304e69e55a129472a71594d4dacda5b2)
@@ -11,42 +11,56 @@
 {
 	TConfig config;
 
-	SetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config, L"First copy of %name");
+	SetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config, L"First copy of %name%ext");
 
 	TTaskConfigVerifier::VerifyAndUpdate(config, nullptr);
 
 	TString strValue = GetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config);
 
-	EXPECT_STREQ(L"First copy of %name", strValue.c_str());
+	EXPECT_STREQ(L"First copy of %name%ext", strValue.c_str());
 
 }
 
 TEST(TestsTTaskConfigVerifier, VerifyAndUpdate_FirstAlternateFilenameFormat_Invalid)
 {
 	TConfig config;
 
-	SetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config, L"First copy of %nme");
+	SetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config, L"First copy of %nme%ext");
 
 	TTaskConfigVerifier::VerifyAndUpdate(config, nullptr);
 
 	TString strValue = GetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config);
 
-	EXPECT_STREQ(L"%name - copy", strValue.c_str());
+	EXPECT_STREQ(L"%name - copy%ext", strValue.c_str());
 
 }
 
+TEST(TestsTTaskConfigVerifier, VerifyAndUpdate_FirstAlternateFilenameFormat_InvalidExt)
+{
+	TConfig config;
+
+	SetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config, L"First copy of %name%et");
+
+	TTaskConfigVerifier::VerifyAndUpdate(config, nullptr);
+
+	TString strValue = GetTaskPropValue<eTO_AlternateFilenameFormatString_First>(config);
+
+	EXPECT_STREQ(L"%name - copy%ext", strValue.c_str());
+
+}
+
 TEST(TestsTTaskConfigVerifier, VerifyAndUpdate_NextAlternateFilenameFormat_Valid)
 {
 	log_file log;
 	TConfig config;
 
-	SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config, L"Subsequent copy of %name (%count)");
+	SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config, L"Subsequent copy of %name (%count)%ext");
 
 	TTaskConfigVerifier::VerifyAndUpdate(config, nullptr);
 
 	TString strValue = GetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config);
 
-	EXPECT_STREQ(L"Subsequent copy of %name (%count)", strValue.c_str());
+	EXPECT_STREQ(L"Subsequent copy of %name (%count)%ext", strValue.c_str());
 
 }
 
@@ -55,26 +69,41 @@
 	log_file log;
 	TConfig config;
 
-	SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config, L"Subsequent copy of %name (%cout)");
+	SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config, L"Subsequent copy of %name (%cout)%ext");
 
 	TTaskConfigVerifier::VerifyAndUpdate(config, nullptr);
 
 	TString strValue = GetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config);
 
-	EXPECT_STREQ(L"%name - copy (%count)", strValue.c_str());
+	EXPECT_STREQ(L"%name - copy (%count)%ext", strValue.c_str());
 
 }
 
+TEST(TestsTTaskConfigVerifier, VerifyAndUpdate_NextAlternateFilenameFormat_InvalidExt)
+{
+	log_file log;
+	TConfig config;
+
+	SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config, L"Subsequent copy of %name (%count)%et");
+
+	TTaskConfigVerifier::VerifyAndUpdate(config, nullptr);
+
+	TString strValue = GetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config);
+
+	EXPECT_STREQ(L"%name - copy (%count)%ext", strValue.c_str());
+
+}
+
 TEST(TestsTTaskConfigVerifier, VerifyAndUpdate_NextAlternateFilenameFormat_InvalidName)
 {
 	log_file log;
 	TConfig config;
 
-	SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config, L"Subsequent copy of %ame (%count)");
+	SetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config, L"Subsequent copy of %ame (%count)%ext");
 
 	TTaskConfigVerifier::VerifyAndUpdate(config, nullptr);
 
 	TString strValue = GetTaskPropValue<eTO_AlternateFilenameFormatString_AfterFirst>(config);
 
-	EXPECT_STREQ(L"%name - copy (%count)", strValue.c_str());
+	EXPECT_STREQ(L"%name - copy (%count)%ext", strValue.c_str());
 }