# HG changeset patch # User IBBoard # Date 1321130951 0 # Node ID 00ea622313bebba81762b6bc2ebf0ba5462b4c62 # Parent bd38c32fb1a9b83d75f543433161adf906eaed67 Re #366: Rewrite equipment handling and limits * Add test for numeric amounts to make sure that they're not affected either diff -r bd38c32fb1a9 -r 00ea622313be API/Objects/UnitEquipmentNumericSelectionTests.cs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/API/Objects/UnitEquipmentNumericSelectionTests.cs Sat Nov 12 20:49:11 2011 +0000 @@ -0,0 +1,51 @@ +// This file (UnitEquipmentRatioSelectionTests.cs) is a part of the IBBoard.WarFoundry.API.Tests project and is copyright 2011 IBBoard +// +// The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license. +using System; +using NUnit.Framework; +using IBBoard.WarFoundry.API.Util; +using IBBoard.WarFoundry.API.Factories; +using IBBoard.Limits; +using NUnit.Framework.SyntaxHelpers; + +namespace IBBoard.WarFoundry.API.Objects +{ + [TestFixture()] + public class UnitEquipmentNumericSelectionTests + { + [Test()] + public void Bug366TestAmountIsNotLimitedByRatioAmount() + { + DummyWarFoundryFactory factory = new DummyWarFoundryFactory(); + Race race = new Race("race", "Race", new GameSystem("gs", "System", factory), factory); + Category cat = new Category("cat1", "Category"); + race.AddCategory(cat); + EquipmentItem equip1 = new EquipmentItem("equip1", "Equipment 1", race); + race.AddEquipmentItem(equip1); + EquipmentItem equip2 = new EquipmentItem("equip2", "Equipment 2", race); + race.AddEquipmentItem(equip2); + UnitType unitType = new UnitType("type1", "UnitType", race); + unitType.AddEquipmentSlot("slot", new SimpleRoundedPercentageLimit(33, true)); + UnitEquipmentItem unitEquip1 = new UnitEquipmentItem(equip1, unitType); + unitEquip1.SlotName = "slot"; + unitEquip1.RoundNumberUp = true; + unitEquip1.MinLimit = new SimpleRoundedPercentageLimit(0); + unitEquip1.MaxLimit = new SimpleRoundedPercentageLimit(33, true); + UnitEquipmentItem unitEquip2 = new UnitEquipmentItem(equip2, unitType); + unitEquip2.SlotName = "slot"; + unitEquip2.RoundNumberUp = true; + unitEquip2.MinLimit = new SimpleRoundedPercentageLimit(0); + unitEquip2.MaxLimit = new SimpleRoundedPercentageLimit(33, true); + race.AddUnitType(unitType); + Army army = new Army(race, "army", 1000); + Unit unit = new Unit(unitType, army.GetCategory(cat)); + unit.Size = 3; + unit.SetEquipmentAmount(unitEquip2, 1); + unit.SetEquipmentRatio(unitEquip1, 33); + Assert.That(UnitEquipmentUtil.GetEquipmentAmount(unit, unitEquip2), Is.EqualTo(1)); + Assert.That(UnitEquipmentUtil.GetEquipmentAmountTaken(unit, unitEquip2), Is.EqualTo(1)); + Assert.That(unit.GetEquipmentAmountInSlot("slot"), Is.EqualTo(2)); + } + } +} + diff -r bd38c32fb1a9 -r 00ea622313be IBBoard.WarFoundry.API.Tests.csproj --- a/IBBoard.WarFoundry.API.Tests.csproj Sat Nov 12 20:36:58 2011 +0000 +++ b/IBBoard.WarFoundry.API.Tests.csproj Sat Nov 12 20:49:11 2011 +0000 @@ -111,6 +111,7 @@ +