Updated for instance where boundary which had only one dimension coul…

…d not be unioned and was counted as empty.
Dtronix · Jan 6, 2023 · 6ec2e27 · 6ec2e27
1 parent af2fa4f
commit 6ec2e27
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/src/.config/dotnet-tools.json b/src/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-t4": {
-      "version": "2.2.1",
+      "version": "2.3.1",
       "commands": [
         "t4"
       ]

diff --git a/src/DtronixCommon.Tests/BoundaryTests.cs b/src/DtronixCommon.Tests/BoundaryTests.cs
@@ -0,0 +1,22 @@
+using System.Diagnostics;
+using System.Threading.Tasks;
+using DtronixCommon.Threading;
+using NUnit.Framework;
+
+namespace DtronixCommon.Tests;
+
+public class BoundaryTests
+{
+    [Test]
+    public void OneDimensionalBoundaryIsNotEmpty()
+    {
+        Assert.IsFalse(new Boundary(0, -1, 0, 1).IsEmpty);
+        Assert.IsFalse(new Boundary(-1, 0, 1, 0).IsEmpty);
+    }
+
+    [Test]
+    public void CanUnionBoundariesWithOneDimension()
+    {
+        Assert.AreEqual(new Boundary(-1, -1, 1, 1), new Boundary(0, -1, 0, 1).Union(new Boundary(-1, 0, 1, 0)));
+    }
+}
diff --git a/src/DtronixCommon.Tests/DtronixCommon.Tests.csproj b/src/DtronixCommon.Tests/DtronixCommon.Tests.csproj
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\DtronixCommon\DtronixCommon.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Mono.TextTemplating" Version="2.2.1" />
+    <PackageReference Include="Mono.TextTemplating" Version="2.3.1" />
     <TextTemplate Include="**\*.tt" />
     <Generated Include="**\*.g.cs" />
   </ItemGroup>

diff --git a/src/DtronixCommon/Boundary.cs b/src/DtronixCommon/Boundary.cs
@@ -77,7 +77,7 @@ public readonly struct Boundary
     /// <summary>
     /// Returns true if the boundary has no volume.
     /// </summary>
-    public bool IsEmpty => MinY >= MaxY || MinX >= MaxX;
+    public bool IsEmpty => MinY >= MaxY && MinX >= MaxX;
 
     /// <summary>
     /// Creates a boundary with the specified left, bottom, right, top distances from origin.

diff --git a/src/DtronixCommon/DtronixCommon.csproj b/src/DtronixCommon/DtronixCommon.csproj
@@ -2,12 +2,12 @@
 	<PropertyGroup>
 		<TargetFrameworks>net5.0;net6.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<Version>0.6.8.0</Version>
+		<Version>0.6.9.0</Version>
 		<Nullable>enable</Nullable>
 		<LangVersion>10</LangVersion>
 		<Company>Dtronix</Company>
 		<Product>Dtronix Common</Product>
-		<Copyright>Copyright © Dtronix 2022</Copyright>
+		<Copyright>Copyright © Dtronix 2023</Copyright>
 		<Authors>DJGosnell</Authors>
 		<PackageProjectUrl>https://github.com/Dtronix/DtronixCommon</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Dtronix/DtronixCommon</RepositoryUrl>
@@ -27,7 +27,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-		<PackageReference Include="Mono.TextTemplating" Version="2.2.1" />
+		<PackageReference Include="Mono.TextTemplating" Version="2.3.1" />
 		<TextTemplate Include="**\*.tt" />
 		<Generated Include="**\*.g.cs" />
 	</ItemGroup>