- Remove try-catch frome tests

- Fixed longitude normalizing for geofences near 180 longitude
- Added more tests
- Other fixes

1 files changed, 22 insertions, 24 deletions

diff --git a/test/org/traccar/geofence/GeofencePolylineTest.java b/test/org/traccar/geofence/GeofencePolylineTest.java
index e281c3dd6..71aeb4081 100644
--- a/test/org/traccar/geofence/GeofencePolylineTest.java
+++ b/test/org/traccar/geofence/GeofencePolylineTest.java
@@ -8,40 +8,38 @@ import org.junit.Test;
 public class GeofencePolylineTest {
 
     @Test
-    public void testPolylineWKT() {
+    public void testPolylineWkt() throws ParseException {
         String test = "LINESTRING (55.75474 37.61823, 55.75513 37.61888, 55.7535 37.6222, 55.75315 37.62165)";
         GeofenceGeometry geofenceGeometry = new GeofencePolyline();
-        try {
-            geofenceGeometry.fromWkt(test);
-        } catch (ParseException e){
-            Assert.assertTrue("ParseExceprion: " + e.getMessage(), true);
-        }
+        geofenceGeometry.fromWkt(test);
         Assert.assertEquals(geofenceGeometry.toWkt(), test);
     }
     
     @Test
-    public void testContainsPolyline1Interval() {
+    public void testContainsPolyline1Interval() throws ParseException {
         String test = "LINESTRING (56.83777 60.59833, 56.83766 60.5968)";
-        try {
-            GeofenceGeometry geofenceGeometry = new GeofencePolyline(test, 35);
-            Assert.assertTrue(geofenceGeometry.containsPoint(56.83801, 60.59748));
-            ((GeofencePolyline) geofenceGeometry).setDistance(15);
-            Assert.assertTrue(!geofenceGeometry.containsPoint(56.83801, 60.59748));
-        } catch (ParseException e){
-            Assert.assertTrue("ParseExceprion: " + e.getMessage(), true);
-        }
+        GeofenceGeometry geofenceGeometry = new GeofencePolyline(test, 35);
+        Assert.assertTrue(geofenceGeometry.containsPoint(56.83801, 60.59748));
+        ((GeofencePolyline) geofenceGeometry).setDistance(15);
+        Assert.assertTrue(!geofenceGeometry.containsPoint(56.83801, 60.59748));
     }
 
     @Test
-    public void testContainsPolyline3Intervals() {
+    public void testContainsPolyline3Intervals() throws ParseException {
         String test = "LINESTRING (56.836 60.6126, 56.8393 60.6114, 56.83887 60.60811, 56.83782 60.5988)";
-        try {
-            GeofenceGeometry geofenceGeometry = new GeofencePolyline(test, 15);
-            Assert.assertTrue(geofenceGeometry.containsPoint(56.83847, 60.60458));
-            Assert.assertTrue(!geofenceGeometry.containsPoint(56.83764, 60.59725));
-            Assert.assertTrue(!geofenceGeometry.containsPoint(56.83861, 60.60822));
-        } catch (ParseException e){
-            Assert.assertTrue("ParseExceprion: " + e.getMessage(), true);
-        }
+        GeofenceGeometry geofenceGeometry = new GeofencePolyline(test, 15);
+        Assert.assertTrue(geofenceGeometry.containsPoint(56.83847, 60.60458));
+        Assert.assertTrue(!geofenceGeometry.containsPoint(56.83764, 60.59725));
+        Assert.assertTrue(!geofenceGeometry.containsPoint(56.83861, 60.60822));
+
+    }
+    
+    @Test
+    public void testContainsPolylineNear180() throws ParseException {
+        String test = "LINESTRING (66.9494 179.838, 66.9508 -179.8496)";
+        GeofenceGeometry geofenceGeometry = new GeofencePolyline(test, 25);
+        Assert.assertTrue(geofenceGeometry.containsPoint(66.95, 180.0));
+        Assert.assertTrue(!geofenceGeometry.containsPoint(66.96, 180.0));
+        Assert.assertTrue(!geofenceGeometry.containsPoint(66.9509, -179.83));
     }
 }