diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index 29d67f40..c5772f58 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.2.8.0903")] -[assembly: AssemblyFileVersion("3.2.8.0903")] +[assembly: AssemblyVersion("3.2.8.0902")] +[assembly: AssemblyFileVersion("3.2.8.0902")] diff --git a/UnitTests/RegionManagerTest.cs b/UnitTests/RegionManagerTest.cs index 0c2fd8cf..f473530a 100644 --- a/UnitTests/RegionManagerTest.cs +++ b/UnitTests/RegionManagerTest.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using System.Text; using System.Collections.Generic; using System.Linq; @@ -7,7 +8,7 @@ using System.Data; using TShockAPI; using Community.CsharpSqlite.SQLiteClient; using TShockAPI.DB; -using Microsoft.Xna.Framework; +using Region = TShockAPI.DB.Region; namespace UnitTests { @@ -39,12 +40,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.getRegion("test")); + Assert.IsNotNull(manager.GetRegionByName("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.getRegion("test2")); + Assert.IsNotNull(manager.GetRegionByName("test2")); } [TestMethod] @@ -73,16 +74,16 @@ namespace UnitTests [TestMethod] public void SetRegionState() { - Assert.IsTrue(manager.getRegion("test").DisableBuild); + Assert.IsTrue(manager.GetRegionByName("test").DisableBuild); manager.SetRegionStateTest("test", "test", false); - Assert.IsTrue(!manager.getRegion("test").DisableBuild); + Assert.IsTrue(!manager.GetRegionByName("test").DisableBuild); manager.SetRegionStateTest("test", "test", true); - Assert.IsTrue(manager.getRegion("test").DisableBuild); - Assert.IsTrue(manager.getRegion("test2").DisableBuild); + Assert.IsTrue(manager.GetRegionByName("test").DisableBuild); + Assert.IsTrue(manager.GetRegionByName("test2").DisableBuild); manager.SetRegionStateTest("test2", "test", false); - Assert.IsTrue(!manager.getRegion("test2").DisableBuild); + Assert.IsTrue(!manager.GetRegionByName("test2").DisableBuild); manager.SetRegionStateTest("test2", "test", true); - Assert.IsTrue(manager.getRegion("test2").DisableBuild); + Assert.IsTrue(manager.GetRegionByName("test2").DisableBuild); } [TestMethod] diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj index 6ece350a..30af5656 100644 --- a/UnitTests/UnitTests.csproj +++ b/UnitTests/UnitTests.csproj @@ -14,6 +14,7 @@ v4.0 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + false publish\ true Disk @@ -26,7 +27,6 @@ true 0 1.0.0.%2a - false false true @@ -55,10 +55,6 @@ ..\SqlBins\Community.CsharpSqlite.SQLiteClient.dll - - False - ..\..\..\..\..\Windows\Microsoft.NET\assembly\GAC_32\Microsoft.Xna.Framework\v4.0_4.0.0.0__842cf8be1de50553\Microsoft.Xna.Framework.dll - ..\SqlBins\MySql.Data.dll @@ -71,14 +67,11 @@ + False ..\TerrariaServerBins\TerrariaServerAPI.dll - - False - ..\TerrariaServerBins\XNAHelpers.dll -