From 21a7d70d20ac45fbf2a8d000ba8e9f93be5dd195 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 10 Jan 2017 13:30:57 +0500
Subject: - Rename calendarData to data - Cleanup Calendar model - Fix
 TripsTest

---
 test/org/traccar/calendar/CalendarTest.java | 2 +-
 test/org/traccar/reports/TripsTest.java     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'test/org')

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 {
 
-- 
cgit v1.2.3