#5977: Add empty implementation, define a few unit tests

radiantcore/CMakeLists.txt

@@ -23,6 +23,7 @@ add_library(radiantcore MODULE
             clipper/ClipPoint.cpp
             clipper/SplitAlgorithm.cpp
             commandsystem/CommandSystem.cpp
+            decl/DeclarationManager.cpp
             decl/FavouritesManager.cpp
             eclass/EntityClass.cpp
             eclass/EClassColourManager.cpp

radiantcore/decl/DeclarationManager.cpp

@@ -0,0 +1,48 @@
+#include "ideclmanager.h"
+
+#include "module/StaticModule.h"
+
+namespace decl
+{
+
+class DeclarationManager :
+    public IDeclarationManager
+{
+public:
+    void registerDeclType(const std::string& typeName, const IDeclarationParser::Ptr& parser) override
+    {
+
+    }
+
+    void unregisterDeclType(const std::string& typeName) override
+    {
+
+    }
+
+    void registerDeclFolder(Type defaultType, const std::string& vfsFolder, const std::string& extension) override
+    {
+
+    }
+
+    const std::string& getName() const override
+    {
+        static std::string _name(MODULE_DECLMANAGER);
+        return _name;
+    }
+
+    const StringSet& getDependencies() const override
+    {
+        static StringSet _dependencies{};
+
+        return _dependencies;
+    }
+
+    void initialiseModule(const IApplicationContext& ctx) override
+    {
+        rMessage() << getName() << "::initialiseModule called." << std::endl;
+    }
+};
+
+module::StaticModuleRegistration<DeclarationManager> _declManagerModule;
+
+}

test/CMakeLists.txt

@@ -7,6 +7,7 @@ add_executable(drtest
                ColourSchemes.cpp
                ContinuousBuffer.cpp
                CSG.cpp
+               DeclManager.cpp
                Entity.cpp
                Favourites.cpp
                FileTypes.cpp

test/DeclManager.cpp

@@ -0,0 +1,68 @@
+#include "RadiantTest.h"
+
+#include "ideclmanager.h"
+
+namespace test
+{
+
+using DeclManagerTest = RadiantTest;
+
+class TestDeclaration :
+    public decl::IDeclaration
+{
+public:
+    const std::string& getName() const override
+    {
+        static std::string _testName("TestName");
+        return _testName;
+    }
+
+    decl::Type getType() const override
+    {
+        return decl::Type::Material;
+    }
+};
+
+class TestDeclarationParser :
+    public decl::IDeclarationParser
+{
+public:
+    // Returns the declaration type this parser can handle
+    decl::Type getDeclType() const override
+    {
+        return decl::Type::Material;
+    }
+
+    // Create a new declaration instance from the given block
+    decl::IDeclaration::Ptr parseFromBlock(const decl::DeclarationBlockSyntax& block) override
+    {
+        return std::make_shared<TestDeclaration>();
+    }
+};
+
+TEST_F(DeclManagerTest, DeclTypeRegistration)
+{
+    auto parser = std::make_shared<TestDeclarationParser>();
+    EXPECT_NO_THROW(GlobalDeclarationManager().registerDeclType("sometype", parser));
+
+    // Registering the same type name twice should result in an exception
+    EXPECT_THROW(GlobalDeclarationManager().registerDeclType("sometype", parser), std::logic_error);
+
+    // Passing a new parser instance doesn't help either
+    auto parser2 = std::make_shared<TestDeclarationParser>();
+    EXPECT_THROW(GlobalDeclarationManager().registerDeclType("sometype", parser2), std::logic_error);
+}
+
+TEST_F(DeclManagerTest, DeclTypeUnregistration)
+{
+    auto parser = std::make_shared<TestDeclarationParser>();
+    GlobalDeclarationManager().registerDeclType("sometype", parser);
+
+    // Unregistering the parser should succeed
+    EXPECT_NO_THROW(GlobalDeclarationManager().unregisterDeclType("sometype"));
+
+    // Trying to unregister it twice should result in an exception
+    EXPECT_THROW(GlobalDeclarationManager().unregisterDeclType("sometype"), std::logic_error);
+}
+
+}

tools/msvc/DarkRadiantCore.vcxproj

@@ -38,6 +38,7 @@
     <ClCompile Include="..\..\radiantcore\clipper\Clipper.cpp" />
     <ClCompile Include="..\..\radiantcore\clipper\ClipPoint.cpp" />
     <ClCompile Include="..\..\radiantcore\clipper\SplitAlgorithm.cpp" />
+    <ClCompile Include="..\..\radiantcore\decl\DeclarationManager.cpp" />
     <ClCompile Include="..\..\radiantcore\decl\FavouritesManager.cpp" />
     <ClCompile Include="..\..\radiantcore\eclass\EClassColourManager.cpp" />
     <ClCompile Include="..\..\radiantcore\eclass\EClassManager.cpp" />

tools/msvc/DarkRadiantCore.vcxproj.filters

@@ -1150,6 +1150,9 @@
     <ClCompile Include="..\..\radiantcore\rendersystem\backend\glprogram\RegularStageProgram.cpp">
       <Filter>src\rendersystem\backend\glprogram</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiantcore\decl\DeclarationManager.cpp">
+      <Filter>src\decl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiantcore\modulesystem\ModuleLoader.h">

tools/msvc/Tests/Tests.vcxproj

@@ -87,6 +87,7 @@
     <ClCompile Include="..\..\..\test\ColourSchemes.cpp" />
     <ClCompile Include="..\..\..\test\ContinuousBuffer.cpp" />
     <ClCompile Include="..\..\..\test\CSG.cpp" />
+    <ClCompile Include="..\..\..\test\DeclManager.cpp" />
     <ClCompile Include="..\..\..\test\Entity.cpp" />
     <ClCompile Include="..\..\..\test\EntityInspector.cpp" />
     <ClCompile Include="..\..\..\test\Favourites.cpp" />

tools/msvc/Tests/Tests.vcxproj.filters

@@ -59,6 +59,7 @@
     <ClCompile Include="..\..\..\test\GeometryStore.cpp" />
     <ClCompile Include="..\..\..\test\Settings.cpp" />
     <ClCompile Include="..\..\..\test\Patch.cpp" />
+    <ClCompile Include="..\..\..\test\DeclManager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\test\HeadlessOpenGLContext.h" />