3 files changed, 30 insertions, 24 deletions
diff --git a/test/org/traccar/geofence/GeofenceCircleTest.java b/test/org/traccar/geofence/GeofenceCircleTest.java
index 133ca1db8..259a8fb77 100644
--- a/test/org/traccar/geofence/GeofenceCircleTest.java
+++ b/test/org/traccar/geofence/GeofenceCircleTest.java
@@ -2,9 +2,11 @@ package org.traccar.geofence;
 
 import java.text.ParseException;
 
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class GeofenceCircleTest {
 
     @Test
@@ -12,7 +14,7 @@ public class GeofenceCircleTest {
         String test = "CIRCLE (55.75414 37.6204, 100)";
         GeofenceGeometry geofenceGeometry = new GeofenceCircle();
         geofenceGeometry.fromWkt(test);
-        Assert.assertEquals(geofenceGeometry.toWkt(), test);
+        assertEquals(geofenceGeometry.toWkt(), test);
     }
 
     @Test
@@ -20,7 +22,7 @@ public class GeofenceCircleTest {
         String test = "CIRCLE (55.75414 37.6204, 100)";
         GeofenceGeometry geofenceGeometry = new GeofenceCircle();
         geofenceGeometry.fromWkt(test);
-        Assert.assertTrue(geofenceGeometry.containsPoint(55.75477, 37.62025));
-        Assert.assertTrue(!geofenceGeometry.containsPoint(55.75545, 37.61921));
+        assertTrue(geofenceGeometry.containsPoint(55.75477, 37.62025));
+        assertTrue(!geofenceGeometry.containsPoint(55.75545, 37.61921));
     }
 }
diff --git a/test/org/traccar/geofence/GeofencePolygonTest.java b/test/org/traccar/geofence/GeofencePolygonTest.java
index 361e7b70f..94b73af3a 100644
--- a/test/org/traccar/geofence/GeofencePolygonTest.java
+++ b/test/org/traccar/geofence/GeofencePolygonTest.java
@@ -2,9 +2,11 @@ package org.traccar.geofence;
 
 import java.text.ParseException;
 
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class GeofencePolygonTest {
 
     @Test
@@ -12,7 +14,7 @@ public class GeofencePolygonTest {
         String test = "POLYGON ((55.75474 37.61823, 55.75513 37.61888, 55.7535 37.6222, 55.75315 37.62165))";
         GeofenceGeometry geofenceGeometry = new GeofencePolygon();
         geofenceGeometry.fromWkt(test);
-        Assert.assertEquals(geofenceGeometry.toWkt(), test);
+        assertEquals(geofenceGeometry.toWkt(), test);
     }
 
     @Test
@@ -20,8 +22,8 @@ public class GeofencePolygonTest {
         String test = "POLYGON ((55.75474 37.61823, 55.75513 37.61888, 55.7535 37.6222, 55.75315 37.62165))";
         GeofenceGeometry geofenceGeometry = new GeofencePolygon();
         geofenceGeometry.fromWkt(test);
-        Assert.assertTrue(geofenceGeometry.containsPoint(55.75476, 37.61915));
-        Assert.assertTrue(!geofenceGeometry.containsPoint(55.75545, 37.61921));
+        assertTrue(geofenceGeometry.containsPoint(55.75476, 37.61915));
+        assertTrue(!geofenceGeometry.containsPoint(55.75545, 37.61921));
 
     }
     
@@ -30,9 +32,9 @@ public class GeofencePolygonTest {
         String test = "POLYGON ((66.9494 179.838, 66.9508 -179.8496, 66.8406 -180.0014))";
         GeofenceGeometry geofenceGeometry = new GeofencePolygon();
         geofenceGeometry.fromWkt(test);
-        Assert.assertTrue(geofenceGeometry.containsPoint(66.9015, -180.0096));
-        Assert.assertTrue(geofenceGeometry.containsPoint(66.9015, 179.991));
-        Assert.assertTrue(!geofenceGeometry.containsPoint(66.8368, -179.8792));
+        assertTrue(geofenceGeometry.containsPoint(66.9015, -180.0096));
+        assertTrue(geofenceGeometry.containsPoint(66.9015, 179.991));
+        assertTrue(!geofenceGeometry.containsPoint(66.8368, -179.8792));
 
     }
     
@@ -41,9 +43,9 @@ public class GeofencePolygonTest {
         String test = "POLYGON ((51.1966 -0.6207, 51.1897 0.4147, 50.9377 0.5136, 50.8675 -0.6082))";
         GeofenceGeometry geofenceGeometry = new GeofencePolygon();
         geofenceGeometry.fromWkt(test);
-        Assert.assertTrue(geofenceGeometry.containsPoint(51.0466, -0.0165));
-        Assert.assertTrue(geofenceGeometry.containsPoint(51.0466, 0.018));
-        Assert.assertTrue(!geofenceGeometry.containsPoint(50.9477, 0.5836));
+        assertTrue(geofenceGeometry.containsPoint(51.0466, -0.0165));
+        assertTrue(geofenceGeometry.containsPoint(51.0466, 0.018));
+        assertTrue(!geofenceGeometry.containsPoint(50.9477, 0.5836));
 
     }
 
diff --git a/test/org/traccar/geofence/GeofencePolylineTest.java b/test/org/traccar/geofence/GeofencePolylineTest.java
index 71aeb4081..1e9dcb7c3 100644
--- a/test/org/traccar/geofence/GeofencePolylineTest.java
+++ b/test/org/traccar/geofence/GeofencePolylineTest.java
@@ -2,9 +2,11 @@ package org.traccar.geofence;
 
 import java.text.ParseException;
 
-import org.junit.Assert;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class GeofencePolylineTest {
 
     @Test
@@ -12,25 +14,25 @@ public class GeofencePolylineTest {
         String test = "LINESTRING (55.75474 37.61823, 55.75513 37.61888, 55.7535 37.6222, 55.75315 37.62165)";
         GeofenceGeometry geofenceGeometry = new GeofencePolyline();
         geofenceGeometry.fromWkt(test);
-        Assert.assertEquals(geofenceGeometry.toWkt(), test);
+        assertEquals(geofenceGeometry.toWkt(), test);
     }
     
     @Test
     public void testContainsPolyline1Interval() throws ParseException {
         String test = "LINESTRING (56.83777 60.59833, 56.83766 60.5968)";
         GeofenceGeometry geofenceGeometry = new GeofencePolyline(test, 35);
-        Assert.assertTrue(geofenceGeometry.containsPoint(56.83801, 60.59748));
+        assertTrue(geofenceGeometry.containsPoint(56.83801, 60.59748));
         ((GeofencePolyline) geofenceGeometry).setDistance(15);
-        Assert.assertTrue(!geofenceGeometry.containsPoint(56.83801, 60.59748));
+        assertTrue(!geofenceGeometry.containsPoint(56.83801, 60.59748));
     }
 
     @Test
     public void testContainsPolyline3Intervals() throws ParseException {
         String test = "LINESTRING (56.836 60.6126, 56.8393 60.6114, 56.83887 60.60811, 56.83782 60.5988)";
         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));
+        assertTrue(geofenceGeometry.containsPoint(56.83847, 60.60458));
+        assertTrue(!geofenceGeometry.containsPoint(56.83764, 60.59725));
+        assertTrue(!geofenceGeometry.containsPoint(56.83861, 60.60822));
 
     }
     
@@ -38,8 +40,8 @@ public class GeofencePolylineTest {
     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));
+        assertTrue(geofenceGeometry.containsPoint(66.95, 180.0));
+        assertTrue(!geofenceGeometry.containsPoint(66.96, 180.0));
+        assertTrue(!geofenceGeometry.containsPoint(66.9509, -179.83));
     }
 }