diff options
author | Abyss777 <abyss@fox5.ru> | 2016-06-14 18:05:05 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-06-14 18:05:05 +0500 |
commit | b588b3c723cad4629dcecbce8983933f7ff2a255 (patch) | |
tree | ee1ed23c7c02ded8ca92c904e6f4f21aacfda8d8 /test/org/traccar | |
parent | 185c0830e17b6969977026d4be27e34878bb3db9 (diff) | |
download | traccar-server-b588b3c723cad4629dcecbce8983933f7ff2a255.tar.gz traccar-server-b588b3c723cad4629dcecbce8983933f7ff2a255.tar.bz2 traccar-server-b588b3c723cad4629dcecbce8983933f7ff2a255.zip |
- Overlapping geofences
- Simplified user-device link
Diffstat (limited to 'test/org/traccar')
-rw-r--r-- | test/org/traccar/geofence/GeofenceCircleTest.java | 6 | ||||
-rw-r--r-- | test/org/traccar/geofence/GeofencePolygonTest.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/org/traccar/geofence/GeofenceCircleTest.java b/test/org/traccar/geofence/GeofenceCircleTest.java index 820f34e34..52c214b53 100644 --- a/test/org/traccar/geofence/GeofenceCircleTest.java +++ b/test/org/traccar/geofence/GeofenceCircleTest.java @@ -12,11 +12,11 @@ public class GeofenceCircleTest { String test = "CIRCLE (55.75414 37.6204, 100)"; GeofenceGeometry geofenceGeometry = new GeofenceCircle(); try { - geofenceGeometry.fromWKT(test); + geofenceGeometry.fromWkt(test); } catch (ParseException e){ Assert.assertTrue("ParseExceprion: " + e.getMessage(), true); } - Assert.assertEquals(geofenceGeometry.toWKT(), test); + Assert.assertEquals(geofenceGeometry.toWkt(), test); } @Test @@ -24,7 +24,7 @@ public class GeofenceCircleTest { String test = "CIRCLE (55.75414 37.6204, 100)"; GeofenceGeometry geofenceGeometry = new GeofenceCircle(); try { - geofenceGeometry.fromWKT(test); + geofenceGeometry.fromWkt(test); } catch (ParseException e){ Assert.assertTrue("ParseExceprion: " + e.getMessage(), true); } diff --git a/test/org/traccar/geofence/GeofencePolygonTest.java b/test/org/traccar/geofence/GeofencePolygonTest.java index cc0ed77ad..8711a3696 100644 --- a/test/org/traccar/geofence/GeofencePolygonTest.java +++ b/test/org/traccar/geofence/GeofencePolygonTest.java @@ -12,11 +12,11 @@ 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(); try { - geofenceGeometry.fromWKT(test); + geofenceGeometry.fromWkt(test); } catch (ParseException e){ Assert.assertTrue("ParseExceprion: " + e.getMessage(), true); } - Assert.assertEquals(geofenceGeometry.toWKT(), test); + Assert.assertEquals(geofenceGeometry.toWkt(), test); } @Test @@ -24,7 +24,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(); try { - geofenceGeometry.fromWKT(test); + geofenceGeometry.fromWkt(test); } catch (ParseException e){ Assert.assertTrue("ParseExceprion: " + e.getMessage(), true); } |