#5361: Migrate the rest of the unit tests to gtest.

include/ishaders.h

@@ -2,6 +2,7 @@
 
 #include "iimage.h"
 #include "imodule.h"
+#include "ifilesystem.h"
 #include <sigc++/signal.h>
 
 #include "math/Vector3.h"
@@ -194,6 +195,9 @@ class Material
   // get shader file name (ie the file where this one is defined)
   virtual const char* getShaderFileName() const = 0;
 
+    // Returns the VFS info structure of the file this shader is defined in
+    virtual const vfs::FileInfo& getShaderFileInfo() const = 0;
+
     /**
      * \brief
      * Return the requested sort position of this material.

radiantcore/shaders/CShader.cpp

@@ -21,11 +21,11 @@ namespace shaders
 /* Constructor. Sets the name and the ShaderDefinition to use.
  */
 CShader::CShader(const std::string& name, const ShaderDefinition& definition) :
-	_template(definition.shaderTemplate),
-	_fileName(definition.file.name),
-	_name(name),
-	m_bInUse(false),
-	_visible(true)
+    _template(definition.shaderTemplate),
+    _fileInfo(definition.file),
+    _name(name),
+    m_bInUse(false),
+    _visible(true)
 {
 	// Realise the shader
 	realise();
@@ -131,8 +131,9 @@ int CShader::getMaterialFlags() const
 }
 
 // test if it's a true shader, or a default shader created to wrap around a texture
-bool CShader::IsDefault() const {
-	return _fileName.empty();
+bool CShader::IsDefault() const
+{
+	return _fileInfo.name.empty();
 }
 
 // get the cull type
@@ -177,8 +178,14 @@ Material::Coverage CShader::getCoverage() const
 }
 
 // get shader file name (ie the file where this one is defined)
-const char* CShader::getShaderFileName() const {
-	return _fileName.c_str();
+const char* CShader::getShaderFileName() const
+{
+	return _fileInfo.name.c_str();
+}
+
+const vfs::FileInfo& CShader::getShaderFileInfo() const
+{
+    return _fileInfo;
 }
 
 std::string CShader::getDefinition()

radiantcore/shaders/CShader.h

@@ -16,7 +16,7 @@ class CShader
 	ShaderTemplatePtr _template;
 
 	// The shader file name (i.e. the file where this one is defined)
-	std::string _fileName;
+	vfs::FileInfo _fileInfo;
 
 	// Name of shader
 	std::string _name;
@@ -98,6 +98,8 @@ class CShader
 	// get shader file name (ie the file where this one is defined)
 	const char* getShaderFileName() const;
 
+    const vfs::FileInfo& getShaderFileInfo() const override;
+
 	// Returns the description string of this material
 	std::string getDescription() const;
 

test/Makefile.am

@@ -29,6 +29,7 @@ drtest_SOURCES = Camera.cpp \
                 HeadlessOpenGLContext.cpp \
                 Math.cpp \
                 FacePlane.cpp \
+                Materials.cpp \
                 ModelScale.cpp \
                 SelectionAlgorithm.cpp \
                 VFS.cpp

test/Materials.cpp

@@ -0,0 +1,40 @@
+#include "RadiantTest.h"
+
+#include "ishaders.h"
+
+namespace test
+{
+
+using MaterialsTest = RadiantTest;
+
+TEST_F(MaterialsTest, MaterialFileInfo)
+{
+    auto& materialManager = GlobalMaterialManager();
+
+    // Expect our example material definitions in the ShaderLibrary
+    EXPECT_TRUE(materialManager.materialExists("textures/orbweaver/drain_grille"));
+    EXPECT_TRUE(materialManager.materialExists("models/md5/chars/nobles/noblewoman/noblebottom"));
+    EXPECT_TRUE(materialManager.materialExists("tdm_spider_black"));
+
+    // ShaderDefinitions should contain their source file infos
+    const auto& drainGrille = materialManager.getMaterialForName("textures/orbweaver/drain_grille");
+    EXPECT_EQ(drainGrille->getShaderFileInfo().name, "example.mtr");
+    EXPECT_EQ(drainGrille->getShaderFileInfo().visibility, vfs::Visibility::NORMAL);
+
+    const auto& nobleTop = materialManager.getMaterialForName("models/md5/chars/nobles/noblewoman/nobletop");
+    EXPECT_EQ(nobleTop->getShaderFileInfo().name, "tdm_ai_nobles.mtr");
+    EXPECT_EQ(nobleTop->getShaderFileInfo().visibility, vfs::Visibility::NORMAL);
+
+    // Visibility should be parsed from assets.lst
+    const auto& hiddenTex = materialManager.getMaterialForName("textures/orbweaver/drain_grille_h");
+    EXPECT_EQ(hiddenTex->getShaderFileInfo().name, "hidden.mtr");
+    EXPECT_EQ(hiddenTex->getShaderFileInfo().visibility, vfs::Visibility::HIDDEN);
+
+    // assets.lst visibility applies to the MTR file, and should propagate to
+    // all shaders within it
+    const auto& hiddenTex2 = materialManager.getMaterialForName("textures/darkmod/another_white");
+    EXPECT_EQ(hiddenTex2->getShaderFileInfo().name, "hidden.mtr");
+    EXPECT_EQ(hiddenTex2->getShaderFileInfo().visibility, vfs::Visibility::HIDDEN);
+}
+
+}

tools/msvc/Tests/Tests.vcxproj

@@ -65,6 +65,7 @@
     <ClCompile Include="..\..\..\test\CSG.cpp" />
     <ClCompile Include="..\..\..\test\FacePlane.cpp" />
     <ClCompile Include="..\..\..\test\HeadlessOpenGLContext.cpp" />
+    <ClCompile Include="..\..\..\test\Materials.cpp" />
     <ClCompile Include="..\..\..\test\Math.cpp" />
     <ClCompile Include="..\..\..\test\ModelScale.cpp" />
     <ClCompile Include="..\..\..\test\SelectionAlgorithm.cpp" />

tools/msvc/Tests/Tests.vcxproj.filters

@@ -9,6 +9,7 @@
     <ClCompile Include="..\..\..\test\Math.cpp" />
     <ClCompile Include="..\..\..\test\FacePlane.cpp" />
     <ClCompile Include="..\..\..\test\VFS.cpp" />
+    <ClCompile Include="..\..\..\test\Materials.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\test\HeadlessOpenGLContext.h" />