瀏覽代碼

Tweak tests

AlexVinS 9 年之前
父節點
當前提交
15a4a11560
共有 1 個文件被更改,包括 9 次插入2 次删除
  1. 9 2
      test/MapComparer.cpp

+ 9 - 2
test/MapComparer.cpp

@@ -59,6 +59,12 @@ void checkEqual(const std::set<Element> & actual, const std::set<Element> & expe
 	}
 }
 
+void checkEqual(const SHeroName & actual, const SHeroName & expected)
+{
+	VCMI_CHECK_FIELD_EQUAL(heroId);
+	VCMI_CHECK_FIELD_EQUAL(heroName);
+}
+
 void checkEqual(const PlayerInfo & actual, const PlayerInfo & expected)
 {
 	VCMI_CHECK_FIELD_EQUAL(canHumanPlay);
@@ -73,14 +79,13 @@ void checkEqual(const PlayerInfo & actual, const PlayerInfo & expected)
 
 	VCMI_CHECK_FIELD_EQUAL(mainCustomHeroId);
 
-	//todo:heroesNames
+	checkEqual(actual.heroesNames, expected.heroesNames);
 
 	VCMI_CHECK_FIELD_EQUAL(hasMainTown);
 	VCMI_CHECK_FIELD_EQUAL(generateHeroAtMainTown);
 	VCMI_CHECK_FIELD_EQUAL(posOfMainTown);
 	VCMI_CHECK_FIELD_EQUAL(team);
 	VCMI_CHECK_FIELD_EQUAL(hasRandomHero);
-
 }
 
 void checkEqual(const EventExpression & actual,  const EventExpression & expected)
@@ -142,6 +147,8 @@ void MapComparer::compareHeader()
 	VCMI_CHECK_FIELD_EQUAL_P(victoryIconIndex);
 	VCMI_CHECK_FIELD_EQUAL_P(defeatIconIndex);
 
+	VCMI_CHECK_FIELD_EQUAL_P(howManyTeams);
+
 	checkEqual(actual->players, expected->players);
 
 	checkEqual(actual->allowedHeroes, expected->allowedHeroes);