Skip to content
Snippets Groups Projects
Commit b05a0f3a authored by Tim Molter's avatar Tim Molter
Browse files

updated test to use FEST

parent 12cfdead
No related branches found
No related tags found
No related merge requests found
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
*/ */
package com.xeiam.xchart; package com.xeiam.xchart;
import static org.hamcrest.CoreMatchers.equalTo; import static org.fest.assertions.api.Assertions.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
...@@ -51,7 +50,7 @@ public class DateFormatterTest { ...@@ -51,7 +50,7 @@ public class DateFormatterTest {
long gridStepHint = (long) (span / 1000 * 74); long gridStepHint = (long) (span / 1000 * 74);
long timeUnit = dateFormatter.getTimeUnit(gridStepHint); long timeUnit = dateFormatter.getTimeUnit(gridStepHint);
String stringValue = dateFormatter.formatDate(value, timeUnit); String stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("05.531")); assertThat(stringValue).isEqualTo("05.531");
// sec // sec
value = 1358108105000L; value = 1358108105000L;
...@@ -61,7 +60,7 @@ public class DateFormatterTest { ...@@ -61,7 +60,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74); gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint); timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit); stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("05.000")); assertThat(stringValue).isEqualTo("05.000");
// min // min
value = 1358111750000L; value = 1358111750000L;
...@@ -71,7 +70,7 @@ public class DateFormatterTest { ...@@ -71,7 +70,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74); gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint); timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit); stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("15:50")); assertThat(stringValue).isEqualTo("15:50");
// hour // hour
value = 1358111870000L; value = 1358111870000L;
...@@ -81,7 +80,7 @@ public class DateFormatterTest { ...@@ -81,7 +80,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74); gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint); timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit); stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("21:17")); assertThat(stringValue).isEqualTo("21:17");
// day // day
value = 1358112317000L; value = 1358112317000L;
...@@ -91,7 +90,7 @@ public class DateFormatterTest { ...@@ -91,7 +90,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74); gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint); timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit); stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("21:25")); assertThat(stringValue).isEqualTo("21:25");
// week // week
value = 1358112317000L; value = 1358112317000L;
...@@ -101,7 +100,7 @@ public class DateFormatterTest { ...@@ -101,7 +100,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74); gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint); timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit); stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("01-13")); assertThat(stringValue).isEqualTo("01-13");
// month // month
value = 1358112838000L; value = 1358112838000L;
...@@ -111,7 +110,7 @@ public class DateFormatterTest { ...@@ -111,7 +110,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74); gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint); timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit); stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("01-13")); assertThat(stringValue).isEqualTo("01-13");
// year // year
value = 1358113402000L; value = 1358113402000L;
...@@ -121,7 +120,7 @@ public class DateFormatterTest { ...@@ -121,7 +120,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74); gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint); timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit); stringValue = dateFormatter.formatDate(value, timeUnit);
assertThat(stringValue, equalTo("2013-01")); assertThat(stringValue).isEqualTo("2013-01");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment