Merge pull request #524 from siemens/fix_cp1250_cp1252

Update Windows1250Encoding.ccp and Windows1252Encoding.ccp including Uni...
pocoproject · Aug 22, 2014 · ae13aeb · ae13aeb
2 parents d96de8d + 4002466
commit ae13aeb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Foundation/src/Windows1250Encoding.cpp b/Foundation/src/Windows1250Encoding.cpp
@@ -23,7 +23,9 @@ namespace Poco {
 
 const char* Windows1250Encoding::_names[] =
 {
+	"windows-1250",
 	"Windows-1250",
+	"cp1250",
 	"CP1250",
 	NULL
 };

diff --git a/Foundation/src/Windows1252Encoding.cpp b/Foundation/src/Windows1252Encoding.cpp
@@ -24,7 +24,9 @@ namespace Poco {
 
 const char* Windows1252Encoding::_names[] =
 {
+	"windows-1252",
 	"Windows-1252",
+	"cp1252",
 	"CP1252",
 	NULL
 };

diff --git a/Foundation/testsuite/src/TextEncodingTest.cpp b/Foundation/testsuite/src/TextEncodingTest.cpp
@@ -51,13 +51,13 @@ void TextEncodingTest::testTextEncoding()
 	assert (std::string("ISO-8859-15") == latin9.canonicalName());
 
 	TextEncoding& cp1250 = TextEncoding::byName("CP1250");
-	assert (std::string("Windows-1250") == cp1250.canonicalName());
+	assert (std::string("windows-1250") == cp1250.canonicalName());
 
 	TextEncoding& cp1251 = TextEncoding::byName("CP1251");
-	assert (std::string("Windows-1251") == cp1251.canonicalName());
+	assert (std::string("windows-1251") == cp1251.canonicalName());
 
 	TextEncoding& cp1252 = TextEncoding::byName("CP1252");
-	assert (std::string("Windows-1252") == cp1252.canonicalName());
+	assert (std::string("windows-1252") == cp1252.canonicalName());
 
 
 	TextEncoding& glob = TextEncoding::global();
@@ -77,15 +77,15 @@ void TextEncodingTest::testTextEncoding()
 
 	TextEncoding::global(new Windows1250Encoding);
 	TextEncoding& glob5 = TextEncoding::global();
-	assert (std::string("Windows-1250") == glob5.canonicalName());
+	assert (std::string("windows-1250") == glob5.canonicalName());
 
 	TextEncoding::global(new Windows1251Encoding);
 	TextEncoding& glob6 = TextEncoding::global();
-	assert (std::string("Windows-1251") == glob6.canonicalName());
+	assert (std::string("windows-1251") == glob6.canonicalName());
 
 	TextEncoding::global(new Windows1252Encoding);
 	TextEncoding& glob7 = TextEncoding::global();
-	assert (std::string("Windows-1252") == glob7.canonicalName());
+	assert (std::string("windows-1252") == glob7.canonicalName());
 
 	TextEncoding::global(new UTF8Encoding);
 	TextEncoding& glob8 = TextEncoding::global();