#6162: Add basic unit tests

codereader · Nov 14, 2022 · 45a2e21 · 45a2e21
1 parent 0944ba7
commit 45a2e21
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/include/modelskin.h b/include/modelskin.h
@@ -34,7 +34,7 @@ class ISkin :
     virtual std::string getRemap(const std::string& name) = 0;
 
     // Returns the list of models this skin applies to
-    virtual std::set<std::string> getModels() = 0;
+    virtual const std::set<std::string>& getModels() = 0;
 
     // The list of all remappings defined in this skin
     virtual const std::vector<Remapping>& getAllRemappings() = 0;

diff --git a/radiantcore/skins/Doom3ModelSkin.cpp b/radiantcore/skins/Doom3ModelSkin.cpp
@@ -17,7 +17,7 @@ std::string Skin::getSkinFileName() const
 	return getDeclFilePath();
 }
 
-std::set<std::string> Skin::getModels()
+const std::set<std::string>& Skin::getModels()
 {
     ensureParsed();
 

diff --git a/radiantcore/skins/Doom3ModelSkin.h b/radiantcore/skins/Doom3ModelSkin.h
@@ -30,7 +30,7 @@ class Skin :
 
     std::string getSkinFileName() const;
 
-    std::set<std::string> getModels() override;
+    const std::set<std::string>& getModels() override;
     const std::vector<Remapping>& getAllRemappings() override;
 
 	// Get this skin's remap for the provided material name (if any).

diff --git a/test/Skin.cpp b/test/Skin.cpp
@@ -46,6 +46,45 @@ TEST_F(ModelSkinTest, FindSkinsIsCaseInsensitive)
     EXPECT_EQ(tileSkin->getRemap("textures/atest/a"), "textures/numbers/10");
 }
 
+inline bool containsRemap(const std::vector<decl::ISkin::Remapping>& remaps, 
+    const std::string& original, const std::string& replacement)
+{
+    for (const auto& remap : remaps)
+    {
+        if (remap.Original == original && remap.Replacement == replacement)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+TEST_F(ModelSkinTest, GetAllRemaps)
+{
+    auto skin = GlobalModelSkinCache().findSkin("skin_with_wildcard");
+
+    const auto& remaps = skin->getAllRemappings();
+
+    EXPECT_EQ(remaps.size(), 2);
+    EXPECT_TRUE(containsRemap(remaps, "textures/common/caulk", "textures/common/shadowcaulk"));
+    EXPECT_TRUE(containsRemap(remaps, "*", "textures/common/nodraw"));
+}
+
+TEST_F(ModelSkinTest, GetModels)
+{
+    // Skin without any models listed
+    auto skin = GlobalModelSkinCache().findSkin("skin_with_wildcard");
+    EXPECT_EQ(skin->getModels().size(), 0);
+
+    // Skin with 2 models
+    skin = GlobalModelSkinCache().findSkin("separated_tile_skin");
+    const auto& models = skin->getModels();
+    EXPECT_EQ(models.size(), 2);
+    EXPECT_TRUE(models.count("models/ase/separated_tiles.ase"), 1);
+    EXPECT_TRUE(models.count("models/ase/separated_tiles22.ase"), 1);
+}
+
 TEST_F(ModelSkinTest, GetRemap)
 {
     auto tileSkin = GlobalModelSkinCache().findSkin("tile_skin2");

diff --git a/test/resources/tdm/skins/test_skins.skin b/test/resources/tdm/skins/test_skins.skin
@@ -19,6 +19,7 @@ tile_skin2
 separated_tile_skin
 {
 	model "models/ase/separated_tiles.ase"
+	model "models/ase/separated_tiles22.ase"
 
 	material textures/numbers/11
 	textures/numbers/1 textures/numbers/11