Upgrade to Debian Jessie and JDK 7.

[frank.git] / test / net / jaekl / frank / octranspo / ServerTest.java

diff --git a/test/net/jaekl/frank/octranspo/ServerTest.java b/test/net/jaekl/frank/octranspo/ServerTest.java
index ef90944896bdb5c4198f1674e556164909956c12..1062567660e05ebb2ce4f48cb0e8aadc2c59adf2 100644 (file)
--- a/test/net/jaekl/frank/octranspo/ServerTest.java
+++ b/test/net/jaekl/frank/octranspo/ServerTest.java
@@ -7,7 +7,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import net.jaekl.frank.FrankException;
 import net.jaekl.qd.QDException;
 import net.jaekl.qd.http.RequestBrokerMock;
@@ -17,6 +17,7 @@ import org.apache.http.message.BasicNameValuePair;
 import org.junit.Test;
 
 public class ServerTest {
+       private static final double TINY_DELTA = 0.00000000001;
        private static final String ROUTE_SUMMARY_FOR_STOP = 
                        "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
                                        + "<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" 
@@ -221,24 +222,24 @@ public class ServerTest {
                expectedDate = hourMinFormat.parse("11:10");
                Assert.assertEquals(expectedDate, trip.getStart());
                Assert.assertEquals(20, trip.getAdjTime());
-               Assert.assertEquals(0.18, trip.getAdjAge());
+               Assert.assertEquals(0.18, trip.getAdjAge(), TINY_DELTA);
                Assert.assertEquals(false, trip.isLastTrip());
                Assert.assertEquals("4LA - DEH", trip.getBusType());
-               Assert.assertEquals(50.0, trip.getSpeed());
-               Assert.assertEquals(45.352026, trip.getLatitude());
-               Assert.assertEquals(-75.649993, trip.getLongitude());
+               Assert.assertEquals(50.0, trip.getSpeed(), TINY_DELTA);
+               Assert.assertEquals(45.352026, trip.getLatitude(), TINY_DELTA);
+               Assert.assertEquals(-75.649993, trip.getLongitude(), TINY_DELTA);
                
                trip = route.getTrip(2);
                Assert.assertEquals("Ottawa Rockcliffe", trip.getDest());
                expectedDate = hourMinFormat.parse("12:00");
                Assert.assertEquals(expectedDate, trip.getStart());
                Assert.assertEquals(71, trip.getAdjTime());
-               Assert.assertEquals(-1.0, trip.getAdjAge());
+               Assert.assertEquals(-1.0, trip.getAdjAge(), TINY_DELTA);
                Assert.assertEquals(false, trip.isLastTrip());
                Assert.assertEquals("4E - DEH", trip.getBusType());
-               Assert.assertEquals(0.0, trip.getSpeed());
-               Assert.assertEquals(0.0, trip.getLatitude());
-               Assert.assertEquals(0.0, trip.getLongitude());
+               Assert.assertEquals(0.0, trip.getSpeed(), TINY_DELTA);
+               Assert.assertEquals(0.0, trip.getLatitude(), TINY_DELTA);
+               Assert.assertEquals(0.0, trip.getLongitude(), TINY_DELTA);
        }
 
        @Test
@@ -275,24 +276,24 @@ public class ServerTest {
                expectedDate = hourMinFormat.parse("11:40");
                Assert.assertEquals(expectedDate, trip.getStart());
                Assert.assertEquals(2, trip.getAdjTime());
-               Assert.assertEquals(0.55, trip.getAdjAge());
+               Assert.assertEquals(0.55, trip.getAdjAge(), TINY_DELTA);
                Assert.assertEquals(false, trip.isLastTrip());
                Assert.assertEquals("4E - DEH", trip.getBusType());
-               Assert.assertEquals(35.7, trip.getSpeed());
-               Assert.assertEquals(45.392965, trip.getLatitude());
-               Assert.assertEquals(-75.682561, trip.getLongitude());
+               Assert.assertEquals(35.7, trip.getSpeed(), TINY_DELTA);
+               Assert.assertEquals(45.392965, trip.getLatitude(), TINY_DELTA);
+               Assert.assertEquals(-75.682561, trip.getLongitude(), TINY_DELTA);
                
                trip = route.getTrip(2);
                Assert.assertEquals("Ottawa Rockcliffe", trip.getDest());
                expectedDate = hourMinFormat.parse("12:20");
                Assert.assertEquals(expectedDate, trip.getStart());
                Assert.assertEquals(37, trip.getAdjTime());
-               Assert.assertEquals(-1.0, trip.getAdjAge());
+               Assert.assertEquals(-1.0, trip.getAdjAge(), TINY_DELTA);
                Assert.assertEquals(false, trip.isLastTrip());
                Assert.assertEquals("4E - DEH", trip.getBusType());
-               Assert.assertEquals(0.0, trip.getSpeed());
-               Assert.assertEquals(0.0, trip.getLatitude());
-               Assert.assertEquals(0.0, trip.getLongitude());
+               Assert.assertEquals(0.0, trip.getSpeed(), TINY_DELTA);
+               Assert.assertEquals(0.0, trip.getLatitude(), TINY_DELTA);
+               Assert.assertEquals(0.0, trip.getLongitude(), TINY_DELTA);
        }
 
 }