Fixed getUnitsInRectangle, added a unit test. Also simplified canBuildHere.

Author: bytekeeper

pom.xml

@@ -74,6 +74,12 @@
             <version>2.23.4</version>
             <scope>test</scope>
         </dependency>
-    </dependencies>
 
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.11.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

src/main/java/bwapi/Game.java

@@ -454,10 +454,9 @@ public List<Unit> getUnitsInRectangle(final int left, final int top, final int r
     }
 
     public List<Unit> getUnitsInRectangle(final int left, final int top, final int right, final int bottom, final UnitFilter filter) {
-        return getAllUnits().stream().filter(u -> {
-            final Position p = u.getPosition();
-            return left <= p.x && top <= p.y && p.x < right && p.y < bottom && filter.operation(u);
-        }).collect(Collectors.toList());
+        return getAllUnits().stream().filter(u ->
+            left <= u.getRight() && top <= u.getBottom() && right >= u.getLeft() && bottom >= u.getTop() && filter.operation(u))
+            .collect(Collectors.toList());
     }
 
     public List<Unit> getUnitsInRectangle(final Position leftTop, final Position rightBottom) {
@@ -719,12 +718,10 @@ public boolean canBuildHere(final TilePosition position, final UnitType type, fi
         // Ground getUnit dimension check
         if (type != Special_Start_Location) {
             final Position targPos = lt.toPosition().add(type.tileSize().toPosition().divide(2));
-            final List<Unit> unitsInRect = getUnitsInRectangle(lt.toPosition(), rb.toPosition(),
-                    u -> !u.isFlying() && !u.isLoaded() && (builder != u || type == Zerg_Nydus_Canal)
-                            && u.getLeft() <= targPos.x + type.dimensionRight()
-                            && u.getTop() <= targPos.y + type.dimensionDown()
-                            && u.getRight() >= targPos.x - type.dimensionLeft()
-                            && u.getBottom() >= targPos.y - type.dimensionUp());
+            final List<Unit> unitsInRect = getUnitsInRectangle(
+                targPos.subtract(new Position(type.dimensionLeft(), type.dimensionUp())),
+                targPos.add(new Position(type.dimensionRight(), type.dimensionDown())),
+                    u -> !u.isFlying() && !u.isLoaded() && (builder != u || type == Zerg_Nydus_Canal));
 
             for (final Unit u : unitsInRect) {
                 // Addons can be placed over units that can move, pushing them out of the way

src/test/java/bwapi/GameTest.java

@@ -0,0 +1,85 @@
+package bwapi;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Before;
+import org.junit.experimental.theories.DataPoints;
+import org.junit.experimental.theories.FromDataPoints;
+import org.junit.experimental.theories.Theories;
+import org.junit.experimental.theories.Theory;
+import org.junit.runner.RunWith;
+
+@RunWith(Theories.class)
+public class GameTest {
+
+    private List<Unit> allUnits = new ArrayList<>();
+    private Game sut = new Game(mock(Client.class)) {
+        @Override
+        public List<Unit> getAllUnits() {
+            return allUnits;
+        }
+    };
+    private Unit dummy;
+
+    @DataPoints("overlapping")
+    public static final Pair[] overlapping = {
+        new Pair<>(new Position(15, 35), new Position(20, 40)),
+        new Pair<>(new Position(15, 32), new Position(25, 38)),
+        new Pair<>(new Position(15, 28), new Position(25, 42)),
+        new Pair<>(new Position(5, 35), new Position(15, 40)),
+        new Pair<>(new Position(0, 32), new Position(15, 38)),
+        new Pair<>(new Position(0, 28), new Position(15, 42)),
+        new Pair<>(new Position(12, 25), new Position(22, 35)),
+        new Pair<>(new Position(15, 38), new Position(28, 42)),
+        new Pair<>(new Position(5, 20), new Position(25, 45))
+    };
+
+    @DataPoints("non-overlapping")
+    public static final Pair[] nonOverlapping = {
+        new Pair<>(new Position(0, 0), new Position(200, 20)),
+        new Pair<>(new Position(50, 0), new Position(55, 200)),
+        new Pair<>(new Position(0, 0), new Position(5, 200)),
+        new Pair<>(new Position(0, 45), new Position(20, 50))
+    };
+
+    @Before
+    public void setup() {
+        dummy = mock(Unit.class);
+        given(dummy.getLeft()).willReturn(10);
+        given(dummy.getRight()).willReturn(20);
+        given(dummy.getTop()).willReturn(30);
+        given(dummy.getBottom()).willReturn(40);
+    }
+
+    @Theory
+    public void shouldFindOverlappingUnits(
+        @FromDataPoints("overlapping") Pair<Position, Position> rect) {
+        // GIVEN
+        allUnits.add(dummy);
+
+        // WHEN
+        List<Unit> unitsInRectangle = sut
+            .getUnitsInRectangle(rect.getLeft(), rect.getRight(), unused -> true);
+
+        // THEN
+        assertThat(unitsInRectangle).contains(dummy);
+    }
+
+    @Theory
+    public void shouldNotFindNonOverlappingUnits(
+        @FromDataPoints("non-overlapping") Pair<Position, Position> rect) {
+        // GIVEN
+        allUnits.add(dummy);
+
+        // WHEN
+        List<Unit> unitsInRectangle = sut
+            .getUnitsInRectangle(rect.getLeft(), rect.getRight(), unused -> true);
+
+        // THEN
+        assertThat(unitsInRectangle).doesNotContain(dummy);
+    }
+}

src/test/java/game/GameTest.java src/test/java/game/GameTestRunner.javasrc/test/java/game/GameTest.java renamed to src/test/java/game/GameTestRunner.java

@@ -4,12 +4,12 @@
 import bwapi.DefaultBWListener;
 import bwapi.Game;
 
-class GameTest extends DefaultBWListener {
+class GameTestRunner extends DefaultBWListener {
     final BWClient bwClient;
 
     Game game;
 
-    GameTest() {
+    GameTestRunner() {
         bwClient = new BWClient(this);
         bwClient.startGame();
     }
@@ -23,6 +23,6 @@ public void onStart() {
     }
 
     public static void main(String[] args) {
-        new GameTest();
+        new GameTestRunner();
     }
 }