From 7a57a8073c0eca530e83bbd02149d0e261fd5aa6 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Sat, 3 Sep 2011 02:13:19 -0400 Subject: [PATCH] Added method for region SINCE THE FUCKING UNIT TESTS RELIED ON IT AND NO ONE FUCKING FIXED IT Region unit tests work again. --- TShockAPI/DB/RegionManager.cs | 10 ++++++++++ UnitTests/RegionManagerTest.cs | 17 +++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs index 377ab37e..cd4c2faf 100644 --- a/TShockAPI/DB/RegionManager.cs +++ b/TShockAPI/DB/RegionManager.cs @@ -452,6 +452,16 @@ namespace TShockAPI.DB { return Regions.FirstOrDefault(r => r.Name.Equals(name) && r.WorldID == Main.worldID.ToString()); } + + public Region ZacksGetRegionByName(String name) + { + foreach (Region r in Regions) + { + if (r.Name.Equals(name)) + return r; + } + return null; + } } public class Region diff --git a/UnitTests/RegionManagerTest.cs b/UnitTests/RegionManagerTest.cs index f473530a..38def949 100644 --- a/UnitTests/RegionManagerTest.cs +++ b/UnitTests/RegionManagerTest.cs @@ -30,6 +30,7 @@ namespace UnitTests DB.Open(); manager = new RegionManager(DB); + TShock.Regions = manager; manager.ReloadForUnitTest("test"); } @@ -40,12 +41,12 @@ namespace UnitTests Region r = new Region( new Rectangle(100,100,100,100), "test", true, "test"); Assert.IsTrue(manager.AddRegion(r.Area.X, r.Area.Y, r.Area.Width, r.Area.Height, r.Name, r.WorldID)); Assert.AreEqual(1, manager.Regions.Count); - Assert.IsNotNull(manager.GetRegionByName("test")); + Assert.IsNotNull(manager.ZacksGetRegionByName("test")); Region r2 = new Region(new Rectangle(201, 201, 100, 100), "test2", true, "test"); manager.AddRegion(r2.Area.X, r2.Area.Y, r2.Area.Width, r2.Area.Height, r2.Name, r2.WorldID); Assert.AreEqual(2, manager.Regions.Count); - Assert.IsNotNull(manager.GetRegionByName("test2")); + Assert.IsNotNull(manager.ZacksGetRegionByName("test2")); } [TestMethod] @@ -74,16 +75,16 @@ namespace UnitTests [TestMethod] public void SetRegionState() { - Assert.IsTrue(manager.GetRegionByName("test").DisableBuild); + Assert.IsTrue(manager.ZacksGetRegionByName("test").DisableBuild); manager.SetRegionStateTest("test", "test", false); - Assert.IsTrue(!manager.GetRegionByName("test").DisableBuild); + Assert.IsTrue(!manager.ZacksGetRegionByName("test").DisableBuild); manager.SetRegionStateTest("test", "test", true); - Assert.IsTrue(manager.GetRegionByName("test").DisableBuild); - Assert.IsTrue(manager.GetRegionByName("test2").DisableBuild); + Assert.IsTrue(manager.ZacksGetRegionByName("test").DisableBuild); + Assert.IsTrue(manager.ZacksGetRegionByName("test2").DisableBuild); manager.SetRegionStateTest("test2", "test", false); - Assert.IsTrue(!manager.GetRegionByName("test2").DisableBuild); + Assert.IsTrue(!manager.ZacksGetRegionByName("test2").DisableBuild); manager.SetRegionStateTest("test2", "test", true); - Assert.IsTrue(manager.GetRegionByName("test2").DisableBuild); + Assert.IsTrue(manager.ZacksGetRegionByName("test2").DisableBuild); } [TestMethod]