From 08bf2d78286f770d8a8493237d2ce7859c79b6de Mon Sep 17 00:00:00 2001 From: Tom Troyer Date: Mon, 6 Sep 2021 20:39:45 -0400 Subject: [PATCH] Converting Clock tests to use AssertJ --- .../clock/src/test/java/ClockAddTest.java | 50 +++++++++++------- .../src/test/java/ClockCreationTest.java | 42 +++++++-------- .../clock/src/test/java/ClockEqualTest.java | 51 ++++++++++++------- 3 files changed, 87 insertions(+), 56 deletions(-) diff --git a/exercises/practice/clock/src/test/java/ClockAddTest.java b/exercises/practice/clock/src/test/java/ClockAddTest.java index 7295f82bd..00f108750 100644 --- a/exercises/practice/clock/src/test/java/ClockAddTest.java +++ b/exercises/practice/clock/src/test/java/ClockAddTest.java @@ -1,7 +1,7 @@ import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; public class ClockAddTest { @@ -10,7 +10,8 @@ public class ClockAddTest { public void addMinutes() { Clock clock = new Clock(10, 0); clock.add(3); - assertEquals("10:03", clock.toString()); + + assertThat(clock.toString()).isEqualTo("10:03"); } @Ignore("Remove to run test") @@ -18,7 +19,8 @@ public void addMinutes() { public void addNoMinutes() { Clock clock = new Clock(6, 41); clock.add(0); - assertEquals("06:41", clock.toString()); + + assertThat(clock.toString()).isEqualTo("06:41"); } @Ignore("Remove to run test") @@ -26,7 +28,8 @@ public void addNoMinutes() { public void addToNextHour() { Clock clock = new Clock(0, 45); clock.add(40); - assertEquals("01:25", clock.toString()); + + assertThat(clock.toString()).isEqualTo("01:25"); } @Ignore("Remove to run test") @@ -34,7 +37,8 @@ public void addToNextHour() { public void addMoreThanOneHour() { Clock clock = new Clock(10, 0); clock.add(61); - assertEquals("11:01", clock.toString()); + + assertThat(clock.toString()).isEqualTo("11:01"); } @Ignore("Remove to run test") @@ -42,7 +46,8 @@ public void addMoreThanOneHour() { public void addMoreThanTwoHoursWithCarry() { Clock clock = new Clock(0, 45); clock.add(160); - assertEquals("03:25", clock.toString()); + + assertThat(clock.toString()).isEqualTo("03:25"); } @Ignore("Remove to run test") @@ -50,7 +55,8 @@ public void addMoreThanTwoHoursWithCarry() { public void addAcrossMidnight() { Clock clock = new Clock(23, 59); clock.add(2); - assertEquals("00:01", clock.toString()); + + assertThat(clock.toString()).isEqualTo("00:01"); } @Ignore("Remove to run test") @@ -58,7 +64,8 @@ public void addAcrossMidnight() { public void addMoreThanOneDay() { Clock clock = new Clock(5, 32); clock.add(1500); - assertEquals("06:32", clock.toString()); + + assertThat(clock.toString()).isEqualTo("06:32"); } @Ignore("Remove to run test") @@ -66,7 +73,8 @@ public void addMoreThanOneDay() { public void addMoreThanTwoDays() { Clock clock = new Clock(1, 1); clock.add(3500); - assertEquals("11:21", clock.toString()); + + assertThat(clock.toString()).isEqualTo("11:21"); } @Ignore("Remove to run test") @@ -74,7 +82,8 @@ public void addMoreThanTwoDays() { public void subtractMinutes() { Clock clock = new Clock(10, 3); clock.add(-3); - assertEquals("10:00", clock.toString()); + + assertThat(clock.toString()).isEqualTo("10:00"); } @Ignore("Remove to run test") @@ -82,7 +91,8 @@ public void subtractMinutes() { public void subtractToPreviousHour() { Clock clock = new Clock(10, 3); clock.add(-30); - assertEquals("09:33", clock.toString()); + + assertThat(clock.toString()).isEqualTo("09:33"); } @Ignore("Remove to run test") @@ -90,7 +100,8 @@ public void subtractToPreviousHour() { public void subtractMoreThanAnHour() { Clock clock = new Clock(10, 3); clock.add(-70); - assertEquals("08:53", clock.toString()); + + assertThat(clock.toString()).isEqualTo("08:53"); } @Ignore("Remove to run test") @@ -98,7 +109,8 @@ public void subtractMoreThanAnHour() { public void subtractAcrossMidnight() { Clock clock = new Clock(0, 3); clock.add(-4); - assertEquals("23:59", clock.toString()); + + assertThat(clock.toString()).isEqualTo("23:59"); } @Ignore("Remove to run test") @@ -106,7 +118,8 @@ public void subtractAcrossMidnight() { public void subtractMoreThanTwoHours() { Clock clock = new Clock(0, 0); clock.add(-160); - assertEquals("21:20", clock.toString()); + + assertThat(clock.toString()).isEqualTo("21:20"); } @Ignore("Remove to run test") @@ -114,7 +127,8 @@ public void subtractMoreThanTwoHours() { public void subtractMoreThanTwoHoursWithBorrow() { Clock clock = new Clock(6, 15); clock.add(-160); - assertEquals("03:35", clock.toString()); + + assertThat(clock.toString()).isEqualTo("03:35"); } @Ignore("Remove to run test") @@ -122,7 +136,8 @@ public void subtractMoreThanTwoHoursWithBorrow() { public void subtractMoreThanOneDay() { Clock clock = new Clock(5, 32); clock.add(-1500); - assertEquals("04:32", clock.toString()); + + assertThat(clock.toString()).isEqualTo("04:32"); } @Ignore("Remove to run test") @@ -130,6 +145,7 @@ public void subtractMoreThanOneDay() { public void subtractMoreThanTwoDays() { Clock clock = new Clock(2, 20); clock.add(-3000); - assertEquals("00:20", clock.toString()); + + assertThat(clock.toString()).isEqualTo("00:20"); } } diff --git a/exercises/practice/clock/src/test/java/ClockCreationTest.java b/exercises/practice/clock/src/test/java/ClockCreationTest.java index 9529ae048..6d78a9e2a 100644 --- a/exercises/practice/clock/src/test/java/ClockCreationTest.java +++ b/exercises/practice/clock/src/test/java/ClockCreationTest.java @@ -1,126 +1,126 @@ import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; public class ClockCreationTest { @Test public void canPrintTimeOnTheHour() { - assertEquals("08:00", new Clock(8, 0).toString()); + assertThat(new Clock(8, 0).toString()).isEqualTo("08:00"); } @Ignore("Remove to run test") @Test public void canPrintTimeWithMinutes() { - assertEquals("11:09", new Clock(11, 9).toString()); + assertThat(new Clock(11, 9).toString()).isEqualTo("11:09"); } @Ignore("Remove to run test") @Test public void midnightPrintsAsZero() { - assertEquals("00:00", new Clock(24, 0).toString()); + assertThat(new Clock(24, 0).toString()).isEqualTo("00:00"); } @Ignore("Remove to run test") @Test public void hourRollsOver() { - assertEquals("01:00", new Clock(25, 0).toString()); + assertThat(new Clock(25, 0).toString()).isEqualTo("01:00"); } @Ignore("Remove to run test") @Test public void hourRollsOverContinuously() { - assertEquals("04:00", new Clock(100, 0).toString()); + assertThat(new Clock(100, 0).toString()).isEqualTo("04:00"); } @Ignore("Remove to run test") @Test public void sixtyMinutesIsNextHour() { - assertEquals("02:00", new Clock(1, 60).toString()); + assertThat(new Clock(1, 60).toString()).isEqualTo("02:00"); } @Ignore("Remove to run test") @Test public void minutesRollOver() { - assertEquals("02:40", new Clock(0, 160).toString()); + assertThat(new Clock(0, 160).toString()).isEqualTo("02:40"); } @Ignore("Remove to run test") @Test public void minutesRollOverContinuously() { - assertEquals("04:43", new Clock(0, 1723).toString()); + assertThat(new Clock(0, 1723).toString()).isEqualTo("04:43"); } @Ignore("Remove to run test") @Test public void hourAndMinutesRollOver() { - assertEquals("03:40", new Clock(25, 160).toString()); + assertThat(new Clock(25, 160).toString()).isEqualTo("03:40"); } @Ignore("Remove to run test") @Test public void hourAndMinutesRollOverContinuously() { - assertEquals("11:01", new Clock(201, 3001).toString()); + assertThat(new Clock(201, 3001).toString()).isEqualTo("11:01"); } @Ignore("Remove to run test") @Test public void hourAndMinutesRollOverToExactlyMidnight() { - assertEquals("00:00", new Clock(72, 8640).toString()); + assertThat(new Clock(72, 8640).toString()).isEqualTo("00:00"); } @Ignore("Remove to run test") @Test public void negativeHour() { - assertEquals("23:15", new Clock(-1, 15).toString()); + assertThat(new Clock(-1, 15).toString()).isEqualTo("23:15"); } @Ignore("Remove to run test") @Test public void negativeHourRollsOver() { - assertEquals("23:00", new Clock(-25, 0).toString()); + assertThat(new Clock(-25, 0).toString()).isEqualTo("23:00"); } @Ignore("Remove to run test") @Test public void negativeHourRollsOverContinuously() { - assertEquals("05:00", new Clock(-91, 0).toString()); + assertThat(new Clock(-91, 0).toString()).isEqualTo("05:00"); } @Ignore("Remove to run test") @Test public void negativeMinutes() { - assertEquals("00:20", new Clock(1, -40).toString()); + assertThat(new Clock(1, -40).toString()).isEqualTo("00:20"); } @Ignore("Remove to run test") @Test public void negativeMinutesRollOver() { - assertEquals("22:20", new Clock(1, -160).toString()); + assertThat(new Clock(1, -160).toString()).isEqualTo("22:20"); } @Ignore("Remove to run test") @Test public void negativeMinutesRollOverContinuously() { - assertEquals("16:40", new Clock(1, -4820).toString()); + assertThat(new Clock(1, -4820).toString()).isEqualTo("16:40"); } @Ignore("Remove to run test") @Test public void negativeSixtyMinutesIsPreviousHour() { - assertEquals("01:00", new Clock(2, -60).toString()); + assertThat(new Clock(2, -60).toString()).isEqualTo("01:00"); } @Ignore("Remove to run test") @Test public void negativeHourAndMinutesBothRollOver() { - assertEquals("20:20", new Clock(-25, -160).toString()); + assertThat(new Clock(-25, -160).toString()).isEqualTo("20:20"); } @Ignore("Remove to run test") @Test public void negativeHourAndMinutesBothRollOverContinuously() { - assertEquals("22:10", new Clock(-121, -5810).toString()); + assertThat(new Clock(-121, -5810).toString()).isEqualTo("22:10"); } } diff --git a/exercises/practice/clock/src/test/java/ClockEqualTest.java b/exercises/practice/clock/src/test/java/ClockEqualTest.java index cf99a40ae..08e9d6191 100644 --- a/exercises/practice/clock/src/test/java/ClockEqualTest.java +++ b/exercises/practice/clock/src/test/java/ClockEqualTest.java @@ -1,105 +1,120 @@ import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; public class ClockEqualTest { @Ignore("Remove to run test") @Test public void clocksWithSameTimeAreEqual() { - assertEquals(new Clock(15, 37), new Clock(15, 37)); + assertThat(new Clock(15, 37)) + .isEqualTo(new Clock(15, 37)); } @Ignore("Remove to run test") @Test public void clocksAMinuteApartAreNotEqual() { - assertNotEquals(new Clock(15, 36), new Clock(15, 37)); + assertThat(new Clock(15, 36)) + .isNotEqualTo(new Clock(15, 37)); } @Ignore("Remove to run test") @Test public void clocksAnHourApartAreNotEqual() { - assertNotEquals(new Clock(14, 37), new Clock(15, 37)); + assertThat(new Clock(14, 37)) + .isNotEqualTo(new Clock(15, 37)); } @Ignore("Remove to run test") @Test public void clocksWithHourOverflow() { - assertEquals(new Clock(10, 37), new Clock(34, 37)); + assertThat(new Clock(34, 37)) + .isEqualTo(new Clock(10, 37)); } @Ignore("Remove to run test") @Test public void clocksWithHourOverflowBySeveralDays() { - assertEquals(new Clock(3, 11), new Clock(99, 11)); + assertThat(new Clock(99, 11)) + .isEqualTo(new Clock(3, 11)); } @Ignore("Remove to run test") @Test public void clocksWithNegateHour() { - assertEquals(new Clock(22, 40), new Clock(-2, 40)); + assertThat(new Clock(-2, 40)) + .isEqualTo(new Clock(22, 40)); } @Ignore("Remove to run test") @Test public void clocksWithNegativeHourThatWraps() { - assertEquals(new Clock(17, 3), new Clock(-31, 3)); + assertThat(new Clock(-31, 3)) + .isEqualTo(new Clock(17, 3)); } @Ignore("Remove to run test") @Test public void clocksWithNegativeHourThatWrapsMultipleTimes() { - assertEquals(new Clock(13, 49), new Clock(-83, 49)); + assertThat(new Clock(-83, 49)) + .isEqualTo(new Clock(13, 49)); } @Ignore("Remove to run test") @Test public void clocksWithMinuteOverflow() { - assertEquals(new Clock(0, 1), new Clock(0, 1441)); + assertThat(new Clock(0, 1441)) + .isEqualTo(new Clock(0, 1)); } @Ignore("Remove to run test") @Test public void clocksWithMinuteOverflowBySeveralDays() { - assertEquals(new Clock(2, 2), new Clock(2, 4322)); + assertThat(new Clock(2, 4322)) + .isEqualTo(new Clock(2, 2)); } @Ignore("Remove to run test") @Test public void clocksWithNegativeMinutes() { - assertEquals(new Clock(2, 40), new Clock(3, -20)); + assertThat(new Clock(3, -20)) + .isEqualTo(new Clock(2, 40)); } @Ignore("Remove to run test") @Test public void clocksWithNegativeMinutesThatWraps() { - assertEquals(new Clock(4, 10), new Clock(5, -1490)); + assertThat(new Clock(5, -1490)) + .isEqualTo(new Clock(4, 10)); } @Ignore("Remove to run test") @Test public void clocksWithNegativeMinutesThatWrapsMultipleTimes() { - assertEquals(new Clock(6, 15), new Clock(6, -4305)); + assertThat(new Clock(6, -4305)) + .isEqualTo(new Clock(6, 15)); } @Ignore("Remove to run test") @Test public void clocksWithNegativeHoursAndMinutes() { - assertEquals(new Clock(7, 32), new Clock(-12, -268)); + assertThat(new Clock(-12, -268)) + .isEqualTo(new Clock(7, 32)); } @Ignore("Remove to run test") @Test public void clocksWithNegativeHoursAndMinutesThatWrap() { - assertEquals(new Clock(18, 7), new Clock(-54, -11513)); + assertThat(new Clock(-54, -11513)) + .isEqualTo(new Clock(18, 7)); } @Ignore("Remove to run test") @Test public void clocksWithFullClockAndZeroedClockAreEqual() { - assertEquals(new Clock(24, 0), new Clock(0, 0)); + assertThat(new Clock(24, 0)) + .isEqualTo(new Clock(0, 0)); } }