account for str:: changes in coda-oss

Dan Smith · Dan Smith · commit 8797cd0b5161 · 2022-01-18T10:23:22.000-05:00
diff --git a/six/modules/c++/six.sicd/unittests/test_valid_six.cpp b/six/modules/c++/six.sicd/unittests/test_valid_six.cpp
@@ -191,8 +191,10 @@ TEST_CASE(valid_six_50x50)
     valid_six_50x50_(&schemaPaths); // validate against schema
 }
 
-const std::string classificationText_iso8859_1("NON CLASSIFI\xc9 / UNCLASSIFIED");  // ISO8859-1 "NON CLASSIFI� / UNCLASSIFIED"
-const std::string classificationText_utf_8("NON CLASSIFI\xc3\x89 / UNCLASSIFIED");  // UTF-8 "NON CLASSIFI� / UNCLASSIFIED"
+const std::string classificationText_iso8859_1_("NON CLASSIFI\xc9 / UNCLASSIFIED");  // ISO8859-1 "NON CLASSIFI� / UNCLASSIFIED"
+const auto classificationText_iso8859_1 = str::EncodedStringView::fromWindows1252(classificationText_iso8859_1_).details_w1252string();
+const std::string classificationText_utf_8_("NON CLASSIFI\xc3\x89 / UNCLASSIFIED");  // UTF-8 "NON CLASSIFI� / UNCLASSIFIED"
+const auto classificationText_utf_8 = str::EncodedStringView::fromUtf8(classificationText_utf_8_).u8string();
 
 TEST_CASE(sicd_French_xml)
 {
@@ -205,7 +207,7 @@ TEST_CASE(sicd_French_xml)
     const auto image = six::sicd::readFromNITF(inputPathname, pComplexData); // no validation
     const six::Data* pData = pComplexData.get();
 
-    const auto expectedCassificationText = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8 : classificationText_iso8859_1;
+    const auto expectedCassificationText = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8_ : classificationText_iso8859_1_;
     const auto& classification = pData->getClassification();
     const auto actual = classification.getLevel();
     TEST_ASSERT_EQ(actual, expectedCassificationText);
@@ -260,12 +262,12 @@ static void sicd_French_xml_raw_(bool storeEncoding)
     size_t expectedLength;
     if (storeEncoding)
     {
-        expectedCharData = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8 : classificationText_iso8859_1;
+        expectedCharData = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8_ : classificationText_iso8859_1_;
         expectedLength = expectedCharData.length();
     }
     else
     {
-        expectedCharData = sys::Platform == sys::PlatformType::Linux ? std::string() : classificationText_iso8859_1;
+        expectedCharData = sys::Platform == sys::PlatformType::Linux ? std::string() : classificationText_iso8859_1_;
         expectedLength = sys::Platform == sys::PlatformType::Linux ? 28 : classificationText_iso8859_1.length();
     }
     const auto characterData = classificationXML.getCharacterData();
@@ -282,11 +284,11 @@ static void sicd_French_xml_raw_(bool storeEncoding)
     std::u8string u8_expectedCharData8;
     if (storeEncoding)
     {
-        u8_expectedCharData8 = str::fromUtf8(classificationText_utf_8);
+        u8_expectedCharData8 = classificationText_utf_8;
     }
     else
     {
-        u8_expectedCharData8 = sys::Platform == sys::PlatformType::Linux ? std::u8string() : str::fromUtf8(classificationText_utf_8);
+        u8_expectedCharData8 = sys::Platform == sys::PlatformType::Linux ? std::u8string() : classificationText_utf_8;
     }
     expectedLength = u8_expectedCharData8.length();
 

Original file line number	Diff line number	Diff line change
`@@ -191,8 +191,10 @@ TEST_CASE(valid_six_50x50)`
`191`	`191`	`valid_six_50x50_(&schemaPaths); // validate against schema`
`192`	`192`	`}`
`193`	`193`
`194`		`-const std::string classificationText_iso8859_1("NON CLASSIFI\xc9 / UNCLASSIFIED"); // ISO8859-1 "NON CLASSIFIÉ / UNCLASSIFIED"`
`195`		`-const std::string classificationText_utf_8("NON CLASSIFI\xc3\x89 / UNCLASSIFIED"); // UTF-8 "NON CLASSIFIÉ / UNCLASSIFIED"`
	`194`	`+const std::string classificationText_iso8859_1_("NON CLASSIFI\xc9 / UNCLASSIFIED"); // ISO8859-1 "NON CLASSIFIÉ / UNCLASSIFIED"`
	`195`	`+const auto classificationText_iso8859_1 = str::EncodedStringView::fromWindows1252(classificationText_iso8859_1_).details_w1252string();`
	`196`	`+const std::string classificationText_utf_8_("NON CLASSIFI\xc3\x89 / UNCLASSIFIED"); // UTF-8 "NON CLASSIFIÉ / UNCLASSIFIED"`
	`197`	`+const auto classificationText_utf_8 = str::EncodedStringView::fromUtf8(classificationText_utf_8_).u8string();`
`196`	`198`
`197`	`199`	`TEST_CASE(sicd_French_xml)`
`198`	`200`	`{`
`@@ -205,7 +207,7 @@ TEST_CASE(sicd_French_xml)`
`205`	`207`	`const auto image = six::sicd::readFromNITF(inputPathname, pComplexData); // no validation`
`206`	`208`	`const six::Data* pData = pComplexData.get();`
`207`	`209`
`208`		`- const auto expectedCassificationText = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8 : classificationText_iso8859_1;`
	`210`	`+ const auto expectedCassificationText = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8_ : classificationText_iso8859_1_;`
`209`	`211`	`const auto& classification = pData->getClassification();`
`210`	`212`	`const auto actual = classification.getLevel();`
`211`	`213`	`TEST_ASSERT_EQ(actual, expectedCassificationText);`
`@@ -260,12 +262,12 @@ static void sicd_French_xml_raw_(bool storeEncoding)`
`260`	`262`	`size_t expectedLength;`
`261`	`263`	`if (storeEncoding)`
`262`	`264`	`{`
`263`		`- expectedCharData = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8 : classificationText_iso8859_1;`
	`265`	`+ expectedCharData = sys::Platform == sys::PlatformType::Linux ? classificationText_utf_8_ : classificationText_iso8859_1_;`
`264`	`266`	`expectedLength = expectedCharData.length();`
`265`	`267`	`}`
`266`	`268`	`else`
`267`	`269`	`{`
`268`		`- expectedCharData = sys::Platform == sys::PlatformType::Linux ? std::string() : classificationText_iso8859_1;`
	`270`	`+ expectedCharData = sys::Platform == sys::PlatformType::Linux ? std::string() : classificationText_iso8859_1_;`
`269`	`271`	`expectedLength = sys::Platform == sys::PlatformType::Linux ? 28 : classificationText_iso8859_1.length();`
`270`	`272`	`}`
`271`	`273`	`const auto characterData = classificationXML.getCharacterData();`
`@@ -282,11 +284,11 @@ static void sicd_French_xml_raw_(bool storeEncoding)`
`282`	`284`	`std::u8string u8_expectedCharData8;`
`283`	`285`	`if (storeEncoding)`
`284`	`286`	`{`
`285`		`- u8_expectedCharData8 = str::fromUtf8(classificationText_utf_8);`
	`287`	`+ u8_expectedCharData8 = classificationText_utf_8;`
`286`	`288`	`}`
`287`	`289`	`else`
`288`	`290`	`{`
`289`		`- u8_expectedCharData8 = sys::Platform == sys::PlatformType::Linux ? std::u8string() : str::fromUtf8(classificationText_utf_8);`
	`291`	`+ u8_expectedCharData8 = sys::Platform == sys::PlatformType::Linux ? std::u8string() : classificationText_utf_8;`
`290`	`292`	`}`
`291`	`293`	`expectedLength = u8_expectedCharData8.length();`
`292`	`294`