X-Git-Url: http://jaekl.net/gitweb/?p=frank.git;a=blobdiff_plain;f=test%2Fnet%2Fjaekl%2Ffrank%2FScheduleTest.java;h=020e27464a5dc8360e16ee7e2878974a869db763;hp=2fc9ac2a5f84f09bf189840648f0b3fb7df50ede;hb=HEAD;hpb=24f097b0fe78fa44f99b9f6f2e51a8e689d86a4a
diff --git a/test/net/jaekl/frank/ScheduleTest.java b/test/net/jaekl/frank/ScheduleTest.java
index 2fc9ac2..020e274 100644
--- a/test/net/jaekl/frank/ScheduleTest.java
+++ b/test/net/jaekl/frank/ScheduleTest.java
@@ -6,7 +6,7 @@ import java.io.PrintWriter;
import java.util.Date;
import java.util.Locale;
-import junit.framework.Assert;
+import org.junit.Assert;
import net.jaekl.frank.octranspo.RouteMock;
import net.jaekl.frank.octranspo.RouteSummaryMock;
@@ -17,15 +17,10 @@ import org.junit.Before;
import org.junit.Test;
public class ScheduleTest {
- static final String EXPECTED_STYLE = "\n";
- static final String TITLE_PREFIX = "\n\n";
- static final String TITLE_SUFFIX = "\n" + EXPECTED_STYLE + "\n";
+ static final String TITLE_PREFIX = "\n\n"
+ + " \n"
+ + " ";
+ static final String TITLE_SUFFIX = "\n" + Style.CSS + "\n\n";
ByteArrayOutputStream m_baos;
@@ -44,25 +39,6 @@ public class ScheduleTest {
}
}
- // Confirm that writeStyle's output does not vary with the locale
- @Test
- public void test_writeStyle() {
- String actual;
-
- Locale[] locales = { Locale.CANADA, Locale.CANADA_FRENCH, Locale.JAPAN };
-
- for (Locale locale : locales) {
- m_baos.reset();
-
- Schedule schedule = new Schedule(locale);
- schedule.writeStyle(m_pw);
- m_pw.flush();
-
- actual = m_baos.toString();
- Assert.assertEquals(EXPECTED_STYLE, actual);
- }
- }
-
@Test
public void test_writeHeader() {
Locale[] locales = { Locale.CANADA, Locale.CANADA_FRENCH, Locale.JAPAN };
@@ -102,7 +78,7 @@ public class ScheduleTest {
String actual = m_baos.toString();
- Assert.assertTrue(actual.contains(EXPECTED_STYLE));
+ Assert.assertTrue(actual.contains(Style.CSS));
String expectedTitle = TITLE_PREFIX + "Frank: " + stopName + " (" + stopNo + ")" + TITLE_SUFFIX;
Assert.assertTrue(actual.contains(expectedTitle));
@@ -162,6 +138,7 @@ public class ScheduleTest {
trip = new TripMock(queryDate);
trip.mock_setDest(HURDMAN);
trip.mock_setAdjTime(37);
+ trip.mock_setAdjAge(-2);
route.mock_addTrip(trip);
rsm.mock_addRoute(route);
@@ -178,7 +155,7 @@ public class ScheduleTest {
// Some rudimentary validation of the result.
// Should really go through more permutations, and examine them more closely, here.
- Assert.assertTrue(actual.contains(EXPECTED_STYLE));
+ Assert.assertTrue(actual.contains(Style.CSS));
String expectedTitle = TITLE_PREFIX + "Frank: " + stopName + " (" + stopNo + ")" + TITLE_SUFFIX;
Assert.assertTrue(actual.contains(expectedTitle));
@@ -202,8 +179,10 @@ public class ScheduleTest {
Assert.assertTrue(actual.contains("| " + HURDMAN + " | "));
Assert.assertTrue(actual.contains("17m | "));
+ Assert.assertTrue(actual.contains(""));
Assert.assertTrue(actual.contains("| 4 | "));
Assert.assertTrue(actual.contains("" + HURDMAN + " | "));
Assert.assertTrue(actual.contains("37m | "));
+ Assert.assertTrue(actual.contains("GPS off | "));
}
}