From fd93e4ae74aeaed02e91f1dfb397c767cb4a82b6 Mon Sep 17 00:00:00 2001 From: Itms Date: Tue, 9 Dec 2014 23:20:31 +0000 Subject: [PATCH] Remove testing of some special templates. We need to find a good way to generate template subsets, refs #2951. This fixes the tests fail introduced in b05879e151. This was SVN commit r16033. --- .../tests/test_CmpTemplateManager.h | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/source/simulation2/tests/test_CmpTemplateManager.h b/source/simulation2/tests/test_CmpTemplateManager.h index 4db94f5d18..2cef055c4c 100644 --- a/source/simulation2/tests/test_CmpTemplateManager.h +++ b/source/simulation2/tests/test_CmpTemplateManager.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 Wildfire Games. +/* Copyright (C) 2014 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -81,34 +81,6 @@ public: TS_ASSERT_WSTR_EQUALS(actor->ToXML(), L"1.0actor.pngactor_mask.png" L"example1falsefalsefalse"); - - const CParamNode* preview = tempMan->LoadTemplate(ent2, "preview|unit", -1); - TS_ASSERT(preview != NULL); - TS_ASSERT_WSTR_EQUALS(preview->ToXML(), - L"0uprightfalse6.0" - L"true0false" - L"examplefalsefalsefalse"); - - const CParamNode* previewobstruct = tempMan->LoadTemplate(ent2, "preview|unitobstruct", -1); - TS_ASSERT(previewobstruct != NULL); - TS_ASSERT_WSTR_EQUALS(previewobstruct->ToXML(), - L"1.0" - L"" - L"falsetruefalse" - L"truefalse" - L"falsefalse" - L"" - L"" - L"0uprightfalse6.0" - L"true0false" - L"examplefalsefalsefalse"); - - const CParamNode* previewactor = tempMan->LoadTemplate(ent2, "preview|actor|example2", -1); - TS_ASSERT(previewactor != NULL); - TS_ASSERT_WSTR_EQUALS(previewactor->ToXML(), - // the actor's element is not part of the preview element subset, hence not included - L"1.0true0false" - L"example2falsefalsefalse"); } void test_LoadTemplate_scriptcache()