From b05a0f3afbd9d0ce5a39a297b5f763ffb3d67380 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Wed, 4 Mar 2015 10:42:28 +0100
Subject: [PATCH] updated test to use FEST
---
.../com/xeiam/xchart/DateFormatterTest.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java b/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
index db70248c..5e9e63e2 100644
--- a/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
@@ -15,8 +15,7 @@
*/
package com.xeiam.xchart;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.fest.assertions.api.Assertions.assertThat;
import java.util.Locale;
import java.util.TimeZone;
@@ -51,7 +50,7 @@ public class DateFormatterTest {
long gridStepHint = (long) (span / 1000 * 74);
long timeUnit = dateFormatter.getTimeUnit(gridStepHint);
String stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("05.531"));
+ assertThat(stringValue).isEqualTo("05.531");
// sec
value = 1358108105000L;
@@ -61,7 +60,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("05.000"));
+ assertThat(stringValue).isEqualTo("05.000");
// min
value = 1358111750000L;
@@ -71,7 +70,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("15:50"));
+ assertThat(stringValue).isEqualTo("15:50");
// hour
value = 1358111870000L;
@@ -81,7 +80,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("21:17"));
+ assertThat(stringValue).isEqualTo("21:17");
// day
value = 1358112317000L;
@@ -91,7 +90,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("21:25"));
+ assertThat(stringValue).isEqualTo("21:25");
// week
value = 1358112317000L;
@@ -101,7 +100,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("01-13"));
+ assertThat(stringValue).isEqualTo("01-13");
// month
value = 1358112838000L;
@@ -111,7 +110,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("01-13"));
+ assertThat(stringValue).isEqualTo("01-13");
// year
value = 1358113402000L;
@@ -121,7 +120,7 @@ public class DateFormatterTest {
gridStepHint = (long) (span / 1000 * 74);
timeUnit = dateFormatter.getTimeUnit(gridStepHint);
stringValue = dateFormatter.formatDate(value, timeUnit);
- assertThat(stringValue, equalTo("2013-01"));
+ assertThat(stringValue).isEqualTo("2013-01");
}
--
GitLab