From dddc9bab7fdad60bab1deb532fafb9f28a2d5a36 Mon Sep 17 00:00:00 2001 From: wraitii Date: Mon, 30 Dec 2013 18:55:37 +0000 Subject: [PATCH] Fix tests. This was SVN commit r14452. --- source/simulation2/tests/test_CmpTemplateManager.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/simulation2/tests/test_CmpTemplateManager.h b/source/simulation2/tests/test_CmpTemplateManager.h index 822eb26d43..3efc66a16f 100644 --- a/source/simulation2/tests/test_CmpTemplateManager.h +++ b/source/simulation2/tests/test_CmpTemplateManager.h @@ -80,7 +80,7 @@ public: TS_ASSERT(actor != NULL); TS_ASSERT_WSTR_EQUALS(actor->ToXML(), L"1.0actor.pngactor_mask.png" - L"example1falsefalsefalse"); + L"example1falsefalsefalse"); const CParamNode* preview = tempMan->LoadTemplate(ent2, "preview|unit", -1); TS_ASSERT(preview != NULL); @@ -108,7 +108,7 @@ public: 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"); + L"example2falsefalsefalse"); } void test_LoadTemplate_scriptcache() @@ -142,11 +142,11 @@ public: const CParamNode* actor = tempMan->LoadTemplate(ent2, "actor|example1", -1); val = CScriptValRooted(cx, ScriptInterface::ToJSVal(cx, &actor->GetChild("VisualActor"))); - TS_ASSERT_WSTR_EQUALS(man.GetScriptInterface().ToString(val.get()), L"({Actor:\"example1\", SilhouetteDisplay:\"false\", SilhouetteOccluder:\"false\", VisibleInAtlasOnly:\"false\"})"); + TS_ASSERT_WSTR_EQUALS(man.GetScriptInterface().ToString(val.get()), L"({Actor:\"example1\", ActorOnly:(void 0), SilhouetteDisplay:\"false\", SilhouetteOccluder:\"false\", VisibleInAtlasOnly:\"false\"})"); const CParamNode* foundation = tempMan->LoadTemplate(ent2, "foundation|actor|example1", -1); val = CScriptValRooted(cx, ScriptInterface::ToJSVal(cx, &foundation->GetChild("VisualActor"))); - TS_ASSERT_WSTR_EQUALS(man.GetScriptInterface().ToString(val.get()), L"({Actor:\"example1\", Foundation:(void 0), SilhouetteDisplay:\"false\", SilhouetteOccluder:\"false\", VisibleInAtlasOnly:\"false\"})"); + TS_ASSERT_WSTR_EQUALS(man.GetScriptInterface().ToString(val.get()), L"({Actor:\"example1\", ActorOnly:(void 0), Foundation:(void 0), SilhouetteDisplay:\"false\", SilhouetteOccluder:\"false\", VisibleInAtlasOnly:\"false\"})"); } void test_LoadTemplate_errors()