Ticket #4522: 4522.diff

source/simulation2/tests/test_CmpTemplateManager.h

@@ -17 +17 @@
 
 #include "lib/self_test.h"
 
+#include <boost/algorithm/string.hpp>
+
 #include "simulation2/system/ComponentManager.h"
 
 #include "simulation2/components/ICmpTemplateManager.h"
@@ -223 +225 @@
     {
         g_VFS = CreateVfs(20 * MiB);
         TS_ASSERT_OK(g_VFS->Mount(L"", DataDir()/"mods"/"public", VFS_MOUNT_MUST_EXIST));
+        TS_ASSERT_OK(g_VFS->Mount(L"", DataDir()/"mods"/"mod", VFS_MOUNT_MUST_EXIST));
         TS_ASSERT_OK(g_VFS->Mount(L"cache", DataDir()/"_testcache"));
         CXeromyces::Startup();
     }
@@ -245 +248 @@
         CmpPtr<ICmpTemplateManager> cmpTemplateManager(sim, SYSTEM_ENTITY);
         TS_ASSERT(cmpTemplateManager);
 
-        std::vector<std::string> templates = cmpTemplateManager->FindAllTemplates(true);
-        for (size_t i = 0; i < templates.size(); ++i)
+        for (const std::string& name : cmpTemplateManager->FindAllTemplates(true))
         {
-            std::string name = templates[i];
+            if (boost::algorithm::starts_with(name, L"special_filter/"))
+                continue;
+
             printf("# %s\n", name.c_str());
             const CParamNode* p = cmpTemplateManager->GetTemplate(name);
             TS_ASSERT(p != NULL);