test_valid_six unittests now working

ngageoint · Dec 9, 2021 · d1a7e6f · d1a7e6f
1 parent d6fb257
commit d1a7e6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/six/modules/c++/six.sicd/unittests/test_valid_six.cpp b/six/modules/c++/six.sicd/unittests/test_valid_six.cpp
@@ -172,6 +172,7 @@ TEST_CASE(valid_six_50x50)
     TEST_ASSERT_EQ(six::PixelType::RE32F_IM32F, pData->getPixelType());
     TEST_ASSERT_EQ(static_cast<size_t>(8), pData->getNumBytesPerPixel());
 
+    /*
     // UTF-8 characters in 50x50.nitf
     #ifdef _WIN32
     const std::string classificationText("NON CLASSIFI\xc9 / UNCLASSIFIED"); // ISO8859-1 "NON CLASSIFIÉ / UNCLASSIFIED"
@@ -181,6 +182,11 @@ TEST_CASE(valid_six_50x50)
     const auto& classification = pData->getClassification();
     const auto actual = classification.getLevel();
     //TEST_ASSERT_EQ(actual, classificationText);
+    */
+    const std::string classificationText("NON CLASSIFIE' / UNCLASSIFIED");
+    const auto& classification = pData->getClassification();
+    const auto actual = classification.getLevel();
+    TEST_ASSERT_EQ(actual, classificationText);
 
     test_nitf_image_info(*pComplexData, inputPathname, nitf::PixelValueType::Floating);
 }
@@ -352,8 +358,8 @@ TEST_CASE(test_create_sicd_from_mem_32f)
 }
 
 TEST_MAIN((void)argc; (void)argv;
-    //TEST_CHECK(valid_six_50x50);
-    //TEST_CHECK(test_readFromNITF_sicd_50x50);
+    TEST_CHECK(valid_six_50x50);
+    TEST_CHECK(test_readFromNITF_sicd_50x50);
     TEST_CHECK(test_read_sicd_50x50);
     TEST_CHECK(test_create_sicd_from_mem_32f);
     )

diff --git a/six/modules/c++/six/tests/nitf/sicd_50x50.nitf b/six/modules/c++/six/tests/nitf/sicd_50x50.nitf
diff --git a/six/modules/c++/six/tests/nitf/sicd_French_xml.nitf b/six/modules/c++/six/tests/nitf/sicd_French_xml.nitf