From b1598ccb0fe6fe5211bbd9c09e042e31e148511e Mon Sep 17 00:00:00 2001 From: Michael Rausch Date: Wed, 9 Aug 2017 22:36:34 +1200 Subject: [PATCH] Changed testUpdateYachtWithCollision to use MARK_COLLISION_DISTANCE Changed testUpdateYachtWithCollision to use MARK_COLLISION_DISTANCE constant. #story[1117] --- src/main/java/seng302/model/Yacht.java | 4 ++-- src/test/java/seng302/model/UpdateYachtTest.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng302/model/Yacht.java b/src/main/java/seng302/model/Yacht.java index cc114189..10a1dbfa 100644 --- a/src/main/java/seng302/model/Yacht.java +++ b/src/main/java/seng302/model/Yacht.java @@ -33,7 +33,7 @@ public class Yacht { } private static final Double ROUNDING_DISTANCE = 15d; // TODO: 3/08/17 wmu16 - Look into this value further - private static final Double COLLISION_DISTANCE = ROUNDING_DISTANCE - 8d; + public static final Double MARK_COLLISION_DISTANCE = ROUNDING_DISTANCE - 8d; private static final Double BOUNCE_FACTOR = 0.0001; private static final Integer COLLISION_UPDATE_INTERVAL = 100; @@ -100,7 +100,7 @@ public class Yacht { Set marksInRace = GameState.getMarks(); for (Mark mark : marksInRace){ - if (GeoUtility.getDistance(getLocation(), new GeoPoint(mark.getLat(), mark.getLng())) <= COLLISION_DISTANCE){ + if (GeoUtility.getDistance(getLocation(), new GeoPoint(mark.getLat(), mark.getLng())) <= MARK_COLLISION_DISTANCE){ return mark; } } diff --git a/src/test/java/seng302/model/UpdateYachtTest.java b/src/test/java/seng302/model/UpdateYachtTest.java index f45be0e9..9af9d30f 100644 --- a/src/test/java/seng302/model/UpdateYachtTest.java +++ b/src/test/java/seng302/model/UpdateYachtTest.java @@ -49,7 +49,9 @@ public class UpdateYachtTest { // Making sure no collision Double distance = GeoUtility.getDistance(yacht1.getLocation(), geoPoint2); - Assert.assertTrue(distance > 10.0); + + // Using mark collision distance as it will be smaller than boat collision distance + Assert.assertTrue(distance > Yacht.MARK_COLLISION_DISTANCE); } }