TextureImageが拡張子jpg,tifには対応していてもjpeg,tiffには対応していない問題を修正。そのテストを記述。 (Synesthesias#188)

Author: linoal

data/日本語パステスト/test_images/test_image.bmp

@@ -7,9 +7,10 @@
 #include <plateau/texture/jpeg_texture_image.h>
 #include <plateau/texture/png_texture_image.h>
 #include <plateau/texture/tiff_texture_image.h>
+#include <libplateau_api.h>
 
 namespace plateau::texture {
-    class TextureImage {
+    class LIBPLATEAU_EXPORT TextureImage {
     public:
         enum class TextureType {
             None, Jpeg, Png, Tiff
@@ -64,11 +65,5 @@ namespace plateau::texture {
         size_t image_height_{};
         unsigned char image_color_{};
         std::string image_file_path_;
-
-        const std::string png_extension_ = ".png";
-        const std::string jpeg_extension_ = ".jpg";
-        const std::string tiff_extension_ = ".tif";
-
-        static bool checkFileExtension(const std::string& file_name, const std::string& file_extension);
     };
 }

data/日本語パステスト/test_images/test_image.jpeg

@@ -2,26 +2,29 @@
 #include <plateau/texture/texture_image.h>
 
 #include <string>
+#include <filesystem>
 
 namespace plateau::texture {
+    namespace fs = std::filesystem;
     TextureImage::TextureImage(const std::string& file_name, const size_t height_limit) {
         reset();
 
         image_file_path_ = file_name;
+        auto extension = fs::u8path(file_name).extension().u8string();
 
-        if (checkFileExtension(file_name, jpeg_extension_)) {
+        if (extension == ".jpg" || extension == ".jpeg") {
             texture_type_ = TextureType::Jpeg;
             jpeg_image_.init(file_name, height_limit);
 
             image_width_ = jpeg_image_.getWidth();
             image_height_ = jpeg_image_.getHeight();
-        } else if (checkFileExtension(file_name, tiff_extension_)) {
+        } else if (extension == ".tif" || extension == ".tiff") {
             texture_type_ = TextureType::Tiff;
             tiff_image_.init(file_name);
 
             image_width_ = tiff_image_.getWidth();
             image_height_ = tiff_image_.getHeight();
-        } else if (checkFileExtension(file_name, png_extension_)) {
+        } else if (extension == ".png") {
             texture_type_ = TextureType::Png;
             png_image_.init(file_name);
 
@@ -50,16 +53,6 @@ namespace plateau::texture {
         texture_type_ = TextureType::None;
     }
 
-    bool TextureImage::checkFileExtension(const std::string& file_name, const std::string& file_extension) {
-        auto is_valid = false;
-
-        const size_t last_pos = file_name.find(file_extension);
-        if (file_name.length() == (last_pos + file_extension.length())) {
-            is_valid = true;
-        }
-        return is_valid;
-    }
-
     // 指定されたファイル名で、jpegファイルを保存
     void TextureImage::save(const std::string& file_name) {
         jpeg_image_.save(file_name);

data/日本語パステスト/test_images/test_image.jpg

@@ -43,6 +43,7 @@ add_executable(plateau_test
     "test_server_dataset_accessor.cpp"
     "test_fbx_writer.cpp"
     "test_lod_searcher.cpp"
+    "test_texture_image.cpp"
         )
 
 target_link_libraries(plateau_test gtest gtest_main plateau citygml)

data/日本語パステスト/test_images/test_image.png

@@ -0,0 +1,29 @@
+#include <gtest/gtest.h>
+#include <plateau/texture/texture_image.h>
+
+using namespace plateau::texture;
+namespace fs = std::filesystem;
+class TextureImageTest : public ::testing::Test {
+
+protected:
+    void SetUp() override {
+    }
+public:
+    static constexpr std::string_view test_data_dir = "../data/日本語パステスト/test_images/";
+};
+
+namespace {
+    TextureImage::TextureType getTextureTypeOf(const std::string& file_name) {
+        auto dir = fs::absolute(fs::u8path(TextureImageTest::test_data_dir));
+        auto texture = TextureImage((fs::path(dir) / file_name).u8string(), 256);
+        return texture.getTextureType();
+    }
+}
+
+TEST_F(TextureImageTest, getTextureType_Returns_Its_Extension) { // NOLINT
+    ASSERT_EQ(getTextureTypeOf("test_image.tif"), TextureImage::TextureType::Tiff);
+    ASSERT_EQ(getTextureTypeOf("test_image.tiff"), TextureImage::TextureType::Tiff);
+    ASSERT_EQ(getTextureTypeOf("test_image.jpg"), TextureImage::TextureType::Jpeg);
+    ASSERT_EQ(getTextureTypeOf("test_image.jpeg"), TextureImage::TextureType::Jpeg);
+    ASSERT_EQ(getTextureTypeOf("test_image.png"), TextureImage::TextureType::Png);
+}