Issue 17: Include AM/PM indicator in times

src/main/java/org/exparity/hamcrest/date/core/format/DateFormatter.java

@@ -16,7 +16,7 @@
  */
 public class DateFormatter implements TemporalFormatter<Date> {
 
-	private static final String DATE_TIME_FORMAT = "EEE, dd MMM yyyy hh:mm:ss.SSS";
+	private static final String DATE_TIME_FORMAT = "EEE, dd MMM yyyy hh:mm:ss.SSS a";
 	private static final String  DATE_FORMAT = "EEE, dd MMM yyyy";
 
 	@Override

src/main/java/org/exparity/hamcrest/date/core/format/LocalDateTimeFormatter.java

@@ -16,7 +16,7 @@
  */
 public class LocalDateTimeFormatter implements TemporalFormatter<LocalDateTime> {
 
-	private static DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy hh:mm:ss.SSS");
+	private static DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy hh:mm:ss.SSS a");
 	private static DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy");
 
 	@Override

src/main/java/org/exparity/hamcrest/date/core/format/LocalTimeFormatter.java

@@ -16,7 +16,7 @@
  */
 public class LocalTimeFormatter implements TemporalFormatter<LocalTime> {
 
-	private static DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("hh:mm:ss");
+	private static DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("hh:mm:ss a");
 
 	@Override
 	public String describe(final LocalTime temporal) {

src/main/java/org/exparity/hamcrest/date/core/format/ZonedDateTimeFormatter.java

@@ -16,7 +16,7 @@
  */
 public class ZonedDateTimeFormatter implements TemporalFormatter<ZonedDateTime> {
 
-	private static DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy hh:mm:ss.SSS Z");
+	private static DateTimeFormatter DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy hh:mm:ss.SSS a Z");
 	private static DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("EEE, dd MMM yyyy");
 
 	@Override

src/test/java/org/exparity/hamcrest/date/core/format/DateFormatterTest.java

@@ -0,0 +1,28 @@
+package org.exparity.hamcrest.date.core.format;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.exparity.hamcrest.date.testutils.Dates;
+import org.hamcrest.Matchers;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test for the {@link DateFormatter} class
+ *
+ * @author Stewart Bissett
+ */
+public class DateFormatterTest {
+
+    @Test
+    public void canDescribe() {
+        String description = new DateFormatter().describe(Dates.AUG_04_2015_1159_AS_DATE);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015 11:59:00.000 AM"));
+    }
+
+    @Test
+    public void canDescribeDate() {
+        String description = new DateFormatter().describeDate(Dates.AUG_04_2015_1159_AS_DATE);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015"));
+    }
+
+}

src/test/java/org/exparity/hamcrest/date/core/format/LocalDateFormatterTest.java

@@ -0,0 +1,28 @@
+package org.exparity.hamcrest.date.core.format;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.exparity.hamcrest.date.testutils.Dates;
+import org.hamcrest.Matchers;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test for the {@link LocalDateFormatter} class
+ *
+ * @author Stewart Bissett
+ */
+public class LocalDateFormatterTest {
+
+    @Test
+    public void canDescribe() {
+        String description = new LocalDateFormatter().describe(Dates.AUG_04_2015);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015"));
+    }
+
+    @Test
+    public void canDescribeDate() {
+        String description = new LocalDateFormatter().describeDate(Dates.AUG_04_2015);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015"));
+    }
+
+}

src/test/java/org/exparity/hamcrest/date/core/format/LocalDateTimeFormatterTest.java

@@ -0,0 +1,28 @@
+package org.exparity.hamcrest.date.core.format;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.exparity.hamcrest.date.testutils.Dates;
+import org.hamcrest.Matchers;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test for the {@link LocalDateTimeFormatter} class
+ *
+ * @author Stewart Bissett
+ */
+public class LocalDateTimeFormatterTest {
+
+    @Test
+    public void canDescribe() {
+        String description = new LocalDateTimeFormatter().describe(Dates.AUG_04_2015_1159);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015 11:59:00.000 AM"));
+    }
+
+    @Test
+    public void canDescribeDate() {
+        String description = new LocalDateTimeFormatter().describeDate(Dates.AUG_04_2015_1159);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015"));
+    }
+
+}

src/test/java/org/exparity/hamcrest/date/core/format/LocalTimeFormatterTest.java

@@ -0,0 +1,29 @@
+package org.exparity.hamcrest.date.core.format;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
+
+import org.hamcrest.Matchers;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test for the {@link LocalTimeFormatter} class
+ *
+ * @author Stewart Bissett
+ */
+public class LocalTimeFormatterTest {
+
+    @Test
+    public void canDescribe() {
+        String description = new LocalTimeFormatter().describe(LocalTime.NOON.minus(1, ChronoUnit.SECONDS));
+        assertThat(description, Matchers.equalTo("11:59:59 AM"));
+    }
+
+    @Test(expectedExceptions = UnsupportedOperationException.class)
+    public void canDescribeDate() {
+        new LocalTimeFormatter().describeDate(LocalTime.NOON.minus(1, ChronoUnit.SECONDS));
+    }
+
+}

src/test/java/org/exparity/hamcrest/date/core/format/ZonedDateTimeFormatterTest.java

@@ -0,0 +1,28 @@
+package org.exparity.hamcrest.date.core.format;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.exparity.hamcrest.date.testutils.Dates;
+import org.hamcrest.Matchers;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test for the {@link ZonedDateTimeFormatter} class
+ *
+ * @author Stewart Bissett
+ */
+public class ZonedDateTimeFormatterTest {
+
+    @Test
+    public void canDescribe() {
+        String description = new ZonedDateTimeFormatter().describe(Dates.AUG_04_2015_11AM_UTC);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015 11:59:00.000 AM +0000"));
+    }
+
+    @Test
+    public void canDescribeDate() {
+        String description = new ZonedDateTimeFormatter().describeDate(Dates.AUG_04_2015_11AM_UTC);
+        assertThat(description, Matchers.equalTo("Tue, 04 Aug 2015"));
+    }
+
+}