# HG changeset patch # User IBBoard # Date 1303997776 0 # Node ID 2ae80631ec9c923f26adb881a8c74f4d85dd2027 # Parent 3e4864e206eac39c2067b6dbd39bb958224ac7fb * Remove duplicate equality test code now that Mike Krueger fixed MonoDevelop bug 677228 (https://bugzilla.novell.com/show_bug.cgi?id=677228#c5) no-open-ticket diff -r 3e4864e206ea -r 2ae80631ec9c API/Objects/GameSystemTest.cs --- a/API/Objects/GameSystemTest.cs Tue Apr 26 19:47:36 2011 +0000 +++ b/API/Objects/GameSystemTest.cs Thu Apr 28 13:36:16 2011 +0000 @@ -10,51 +10,6 @@ [TestFixture()] public class GameSystemTest : AbstractEqualityTest { - //FIXME We shouldn't duplicate these tests, but it is broken at the moment - [Test] - public void TestEquality() - { - Assert.AreEqual(GetObject(), GetSameObject()); - Assert.AreEqual(GetSameObject(), GetObject()); - } - - [Test] - public void TestInequality() - { - Assert.AreNotEqual(GetObject(), GetDifferentObject()); - Assert.AreNotEqual(GetSameObject(), GetDifferentObject()); - Assert.AreNotEqual(GetDifferentObject(), GetObject()); - Assert.AreNotEqual(GetDifferentObject(), GetSameObject()); - } - - [Test] - public void TestReflexiveEquality() - { - Assert.AreEqual(GetObject(), GetObject()); - Assert.AreEqual(GetSameObject(), GetSameObject()); - Assert.AreEqual(GetDifferentObject(), GetDifferentObject()); - } - - [Test] - public void TestOtherInequality() - { - MethodInfo[] methodInfo = GetType().GetMethods(); - GameSystem obj = GetObject(); - - foreach (MethodInfo method in methodInfo) - { - if (method.Name.StartsWith("GetOtherDifferent")) - { - GameSystem otherObj = (GameSystem)method.Invoke(this, new object[0]); - Assert.AreNotEqual(obj, otherObj, "Objects equal for "+method.Name); - Assert.AreNotEqual(otherObj, obj, "Objects equal for "+method.Name); - } - } - } - - - - [Test()] public void TestPointsSingularAbbreviation () { diff -r 3e4864e206ea -r 2ae80631ec9c API/Objects/RaceTests.cs --- a/API/Objects/RaceTests.cs Tue Apr 26 19:47:36 2011 +0000 +++ b/API/Objects/RaceTests.cs Thu Apr 28 13:36:16 2011 +0000 @@ -16,51 +16,6 @@ [TestFixture()] public class RaceTests : AbstractEqualityTest { - //FIXME We shouldn't duplicate these tests, but it is broken at the moment - [Test] - public void TestEquality() - { - Assert.AreEqual(GetObject(), GetSameObject()); - Assert.AreEqual(GetSameObject(), GetObject()); - } - - [Test] - public void TestInequality() - { - Assert.AreNotEqual(GetObject(), GetDifferentObject()); - Assert.AreNotEqual(GetSameObject(), GetDifferentObject()); - Assert.AreNotEqual(GetDifferentObject(), GetObject()); - Assert.AreNotEqual(GetDifferentObject(), GetSameObject()); - } - - [Test] - public void TestReflexiveEquality() - { - Assert.AreEqual(GetObject(), GetObject()); - Assert.AreEqual(GetSameObject(), GetSameObject()); - Assert.AreEqual(GetDifferentObject(), GetDifferentObject()); - } - - [Test] - public void TestOtherInequality() - { - MethodInfo[] methodInfo = GetType().GetMethods(); - Race obj = GetObject(); - - foreach (MethodInfo method in methodInfo) - { - if (method.Name.StartsWith("GetOtherDifferent")) - { - Race otherObj = (Race)method.Invoke(this, new object[0]); - Assert.AreNotEqual(obj, otherObj, "Objects equal for "+method.Name); - Assert.AreNotEqual(otherObj, obj, "Objects equal for "+method.Name); - } - } - } - - - - [Test()] public void TestRaceWithNoUnitTypesHasNoRequirements() { diff -r 3e4864e206ea -r 2ae80631ec9c API/Objects/Requirement/RequiresAtLeastNUnitsRequirementTest.cs --- a/API/Objects/Requirement/RequiresAtLeastNUnitsRequirementTest.cs Tue Apr 26 19:47:36 2011 +0000 +++ b/API/Objects/Requirement/RequiresAtLeastNUnitsRequirementTest.cs Thu Apr 28 13:36:16 2011 +0000 @@ -14,51 +14,6 @@ [TestFixture()] public class RequiresAtLeastNUnitsRequirementTest : AbstractEqualityTest { - //FIXME We shouldn't duplicate these tests, but it is broken at the moment - [Test] - public void TestEquality() - { - Assert.AreEqual(GetObject(), GetSameObject()); - Assert.AreEqual(GetSameObject(), GetObject()); - } - - [Test] - public void TestInequality() - { - Assert.AreNotEqual(GetObject(), GetDifferentObject()); - Assert.AreNotEqual(GetSameObject(), GetDifferentObject()); - Assert.AreNotEqual(GetDifferentObject(), GetObject()); - Assert.AreNotEqual(GetDifferentObject(), GetSameObject()); - } - - [Test] - public void TestReflexiveEquality() - { - Assert.AreEqual(GetObject(), GetObject()); - Assert.AreEqual(GetSameObject(), GetSameObject()); - Assert.AreEqual(GetDifferentObject(), GetDifferentObject()); - } - - [Test] - public void TestOtherInequality() - { - MethodInfo[] methodInfo = GetType().GetMethods(); - RequiresAtLeastNUnitsRequirement obj = GetObject(); - - foreach (MethodInfo method in methodInfo) - { - if (method.Name.StartsWith("GetOtherDifferent")) - { - RequiresAtLeastNUnitsRequirement otherObj = (RequiresAtLeastNUnitsRequirement)method.Invoke(this, new object[0]); - Assert.AreNotEqual(obj, otherObj, "Objects equal for "+method.Name); - Assert.AreNotEqual(otherObj, obj, "Objects equal for "+method.Name); - } - } - } - - - - private MockRace mockRace; private UnitType unitType1; private UnitType unitType2; diff -r 3e4864e206ea -r 2ae80631ec9c API/Objects/Requirement/RequiresNoMoreThanNOfUnitTypeRequirementTest.cs --- a/API/Objects/Requirement/RequiresNoMoreThanNOfUnitTypeRequirementTest.cs Tue Apr 26 19:47:36 2011 +0000 +++ b/API/Objects/Requirement/RequiresNoMoreThanNOfUnitTypeRequirementTest.cs Thu Apr 28 13:36:16 2011 +0000 @@ -14,51 +14,6 @@ [TestFixture()] public class RequiresNoMoreThanNOfUnitTypeRequirementTest : AbstractEqualityTest { - //FIXME We shouldn't duplicate these tests, but it is broken at the moment - [Test] - public void TestEquality() - { - Assert.AreEqual(GetObject(), GetSameObject()); - Assert.AreEqual(GetSameObject(), GetObject()); - } - - [Test] - public void TestInequality() - { - Assert.AreNotEqual(GetObject(), GetDifferentObject()); - Assert.AreNotEqual(GetSameObject(), GetDifferentObject()); - Assert.AreNotEqual(GetDifferentObject(), GetObject()); - Assert.AreNotEqual(GetDifferentObject(), GetSameObject()); - } - - [Test] - public void TestReflexiveEquality() - { - Assert.AreEqual(GetObject(), GetObject()); - Assert.AreEqual(GetSameObject(), GetSameObject()); - Assert.AreEqual(GetDifferentObject(), GetDifferentObject()); - } - - [Test] - public void TestOtherInequality() - { - MethodInfo[] methodInfo = GetType().GetMethods(); - RequiresNoMoreThanNOfUnitTypeRequirement obj = GetObject(); - - foreach (MethodInfo method in methodInfo) - { - if (method.Name.StartsWith("GetOtherDifferent")) - { - RequiresAtLeastNUnitsRequirement otherObj = (RequiresAtLeastNUnitsRequirement)method.Invoke(this, new object[0]); - Assert.AreNotEqual(obj, otherObj, "Objects equal for "+method.Name); - Assert.AreNotEqual(otherObj, obj, "Objects equal for "+method.Name); - } - } - } - - - - private MockRace mockRace; private UnitType unitType1; private UnitType unitType2; diff -r 3e4864e206ea -r 2ae80631ec9c API/Objects/Requirement/UnitCountRequirementDataTest.cs --- a/API/Objects/Requirement/UnitCountRequirementDataTest.cs Tue Apr 26 19:47:36 2011 +0000 +++ b/API/Objects/Requirement/UnitCountRequirementDataTest.cs Thu Apr 28 13:36:16 2011 +0000 @@ -12,51 +12,7 @@ { [TestFixture()] public class UnitCountRequirementDataTest : AbstractEqualityTest - { - //FIXME We shouldn't duplicate these tests, but it is broken at the moment - [Test] - public void TestEquality() - { - Assert.AreEqual(GetObject(), GetSameObject()); - Assert.AreEqual(GetSameObject(), GetObject()); - } - - [Test] - public void TestInequality() - { - Assert.AreNotEqual(GetObject(), GetDifferentObject()); - Assert.AreNotEqual(GetSameObject(), GetDifferentObject()); - Assert.AreNotEqual(GetDifferentObject(), GetObject()); - Assert.AreNotEqual(GetDifferentObject(), GetSameObject()); - } - - [Test] - public void TestReflexiveEquality() - { - Assert.AreEqual(GetObject(), GetObject()); - Assert.AreEqual(GetSameObject(), GetSameObject()); - Assert.AreEqual(GetDifferentObject(), GetDifferentObject()); - } - - [Test] - public void TestOtherInequality() - { - MethodInfo[] methodInfo = GetType().GetMethods(); - UnitCountRequirementData obj = GetObject(); - - foreach (MethodInfo method in methodInfo) - { - if (method.Name.StartsWith("GetOtherDifferent")) - { - UnitCountRequirementData otherObj = (UnitCountRequirementData)method.Invoke(this, new object[0]); - Assert.AreNotEqual(obj, otherObj, "Objects equal for "+method.Name); - Assert.AreNotEqual(otherObj, obj, "Objects equal for "+method.Name); - } - } - } - - - + { public override UnitCountRequirementData GetObject () { return new UnitCountRequirementData(new MockUnitType(), 1); diff -r 3e4864e206ea -r 2ae80631ec9c API/Objects/UnitTypeTest.cs --- a/API/Objects/UnitTypeTest.cs Tue Apr 26 19:47:36 2011 +0000 +++ b/API/Objects/UnitTypeTest.cs Thu Apr 28 13:36:16 2011 +0000 @@ -15,51 +15,6 @@ [TestFixture()] public class UnitTypeTest : AbstractEqualityTest { - //FIXME We shouldn't duplicate these tests, but it is broken at the moment - [Test] - public void TestEquality() - { - Assert.AreEqual(GetObject(), GetSameObject()); - Assert.AreEqual(GetSameObject(), GetObject()); - } - - [Test] - public void TestInequality() - { - Assert.AreNotEqual(GetObject(), GetDifferentObject()); - Assert.AreNotEqual(GetSameObject(), GetDifferentObject()); - Assert.AreNotEqual(GetDifferentObject(), GetObject()); - Assert.AreNotEqual(GetDifferentObject(), GetSameObject()); - } - - [Test] - public void TestReflexiveEquality() - { - Assert.AreEqual(GetObject(), GetObject()); - Assert.AreEqual(GetSameObject(), GetSameObject()); - Assert.AreEqual(GetDifferentObject(), GetDifferentObject()); - } - - [Test] - public void TestOtherInequality() - { - MethodInfo[] methodInfo = GetType().GetMethods(); - UnitType obj = GetObject(); - - foreach (MethodInfo method in methodInfo) - { - if (method.Name.StartsWith("GetOtherDifferent")) - { - UnitType otherObj = (UnitType)method.Invoke(this, new object[0]); - Assert.AreNotEqual(obj, otherObj, "Objects equal for "+method.Name); - Assert.AreNotEqual(otherObj, obj, "Objects equal for "+method.Name); - } - } - } - - - - [Test()] public void TestSettingMainCategorySetsCategoriesCollection() {