aboutsummaryrefslogtreecommitdiff
path: root/test/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-01-11 12:09:52 +1100
committerGitHub <noreply@github.com>2017-01-11 12:09:52 +1100
commit6d75b43716c252f69c19afd2c6e7a9457a32a638 (patch)
tree9808dcc2fc176e0a9ace9214836aa296312a939a /test/org
parentfec3ab90ffd6819dbad5c592f6cca8b6c16a8edc (diff)
parent21a7d70d20ac45fbf2a8d000ba8e9f93be5dd195 (diff)
downloadtrackermap-server-6d75b43716c252f69c19afd2c6e7a9457a32a638.tar.gz
trackermap-server-6d75b43716c252f69c19afd2c6e7a9457a32a638.tar.bz2
trackermap-server-6d75b43716c252f69c19afd2c6e7a9457a32a638.zip
Merge pull request #2770 from Abyss777/cleanup_calendars
Cleanup calendar model
Diffstat (limited to 'test/org')
-rw-r--r--test/org/traccar/calendar/CalendarTest.java2
-rw-r--r--test/org/traccar/reports/TripsTest.java5
2 files changed, 3 insertions, 4 deletions
diff --git a/test/org/traccar/calendar/CalendarTest.java b/test/org/traccar/calendar/CalendarTest.java
index 7f5bd7d29..0c8e1830b 100644
--- a/test/org/traccar/calendar/CalendarTest.java
+++ b/test/org/traccar/calendar/CalendarTest.java
@@ -42,7 +42,7 @@ public class CalendarTest {
"END:VEVENT\n" +
"END:VCALENDAR";
Calendar calendar = new Calendar();
- calendar.setCalendarData(calendarString.getBytes());
+ calendar.setData(calendarString.getBytes());
DateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ssX");
Date date = format.parse("2016-12-13 22:59:59+05");
diff --git a/test/org/traccar/reports/TripsTest.java b/test/org/traccar/reports/TripsTest.java
index 8adb1ceb0..dea101cf2 100644
--- a/test/org/traccar/reports/TripsTest.java
+++ b/test/org/traccar/reports/TripsTest.java
@@ -1,7 +1,7 @@
package org.traccar.reports;
-import org.junit.Ignore;
import org.junit.Test;
+import org.traccar.BaseTest;
import org.traccar.model.Position;
import org.traccar.reports.model.TripReport;
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-public class TripsTest {
+public class TripsTest extends BaseTest {
private Date date(String time) throws ParseException {
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
@@ -39,7 +39,6 @@ public class TripsTest {
return position;
}
- @Ignore
@Test
public void testDetectTripsSimple() throws ParseException {