aboutsummaryrefslogtreecommitdiff
path: root/test/org
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-11-27 10:18:13 +0700
committerAbyss777 <abyss@fox5.ru>2016-11-27 10:18:13 +0700
commit5ea4572553a84126b7e9f06c822e1a183413a558 (patch)
tree9eecd9f9fbdc3cbc806f6e2d6e680ee96b681074 /test/org
parentc814f3f3556422d9e7e49d6b958621058293c1ac (diff)
downloadtraccar-server-5ea4572553a84126b7e9f06c822e1a183413a558.tar.gz
traccar-server-5ea4572553a84126b7e9f06c822e1a183413a558.tar.bz2
traccar-server-5ea4572553a84126b7e9f06c822e1a183413a558.zip
- Rename function
- Fix formatting
Diffstat (limited to 'test/org')
-rw-r--r--test/org/traccar/geofence/GeofencePolylineTest.java25
-rw-r--r--test/org/traccar/helper/DistanceCalculatorTest.java6
2 files changed, 12 insertions, 19 deletions
diff --git a/test/org/traccar/geofence/GeofencePolylineTest.java b/test/org/traccar/geofence/GeofencePolylineTest.java
index df939d8ba..e281c3dd6 100644
--- a/test/org/traccar/geofence/GeofencePolylineTest.java
+++ b/test/org/traccar/geofence/GeofencePolylineTest.java
@@ -12,7 +12,7 @@ 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();
try {
- geofenceGeometry.fromWkt(test);
+ geofenceGeometry.fromWkt(test);
} catch (ParseException e){
Assert.assertTrue("ParseExceprion: " + e.getMessage(), true);
}
@@ -22,33 +22,26 @@ public class GeofencePolylineTest {
@Test
public void testContainsPolyline1Interval() {
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));
-
+ 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);
}
}
-
@Test
public void testContainsPolyline3Intervals() {
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));
-
+ 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);
}
}
-
}
diff --git a/test/org/traccar/helper/DistanceCalculatorTest.java b/test/org/traccar/helper/DistanceCalculatorTest.java
index 2ce54c583..22e41c9a3 100644
--- a/test/org/traccar/helper/DistanceCalculatorTest.java
+++ b/test/org/traccar/helper/DistanceCalculatorTest.java
@@ -12,11 +12,11 @@ public class DistanceCalculatorTest {
}
@Test
- public void testDistanceToInterval() {
- Assert.assertEquals(DistanceCalculator.distanceToInterval(
+ public void testDistanceToLine() {
+ Assert.assertEquals(DistanceCalculator.distanceToLine(
56.83801, 60.59748, 56.83777, 60.59833, 56.83766, 60.5968), 33.0, 5.0);
- Assert.assertEquals(DistanceCalculator.distanceToInterval(
+ Assert.assertEquals(DistanceCalculator.distanceToLine(
56.83753, 60.59508, 56.83777, 60.59833, 56.83766, 60.5968), 105.0, 5.0);
}