generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-05 20:57:38 +01:00
Code Issues Projects Releases Wiki Activity

Update Windows1250Encoding.ccp and Windows1252Encoding.ccp including Unit tests

Browse Source 
* Add encoding names. According to the document below, the default encoding name should be "windows-1250" and "windows-1252".
   http://www.iana.org/assignments/character-sets/character-sets.xhtml
* Unit tests update to reflect the change.
This commit is contained in:
Pascal Bach
2014-08-22 13:20:28 +02:00
parent d96de8dfe0
commit 40024660ae
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Foundation/src/Windows1250Encoding.cpp
View File

@@ -23,7 +23,9 @@ namespace Poco {
const char* Windows1250Encoding::_names[] = const char* Windows1250Encoding::_names[] =
{ {
"windows-1250",
"Windows-1250", "Windows-1250",
"cp1250",
"CP1250", "CP1250",
NULL NULL
}; };

2
Foundation/src/Windows1252Encoding.cpp
View File

@@ -24,7 +24,9 @@ namespace Poco {
const char* Windows1252Encoding::_names[] = const char* Windows1252Encoding::_names[] =
{ {
"windows-1252",
"Windows-1252", "Windows-1252",
"cp1252",
"CP1252", "CP1252",
NULL NULL
}; };

12
Foundation/testsuite/src/TextEncodingTest.cpp
View File

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