From 29545c5c4b96a02a1ad4079346f83c4653cabaa5 Mon Sep 17 00:00:00 2001 From: Jacob McCullough <34502339+razorwired1124@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:04:12 +0000 Subject: [PATCH 1/2] Completed enums and parameterized test challenge --- src/main/java/DateChecker.java | 12 +++++++++++- src/test/java/DateCheckerTest.java | 19 ++++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main/java/DateChecker.java b/src/main/java/DateChecker.java index 59c0e06..80eeae6 100644 --- a/src/main/java/DateChecker.java +++ b/src/main/java/DateChecker.java @@ -17,8 +17,18 @@ enum Month { DECEMBER } + private Month[] m31Days = {Month.JANUARY, Month.MARCH, Month.MAY, Month.JULY, Month.AUGUST, Month.OCTOBER, Month.DECEMBER}; + + public Month[] get31Days() { + return m31Days; + } + public boolean has31Days(Month month) { - return false; + if(Arrays.asList(m31Days).contains(month)) { + return true; + } else { + return false; + } } diff --git a/src/test/java/DateCheckerTest.java b/src/test/java/DateCheckerTest.java index f4f5652..199a6c2 100644 --- a/src/test/java/DateCheckerTest.java +++ b/src/test/java/DateCheckerTest.java @@ -1,17 +1,26 @@ -import org.junit.jupiter.api.Test; + import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; import static org.junit.jupiter.api.Assertions.*; +import java.time.Month; + class DateCheckerTest { + DateChecker dateChecker = new DateChecker(); - @Test - public void testHas31Days() { + @ParameterizedTest + @EnumSource(value = DateChecker.Month.class, names = {"JANUARY", "MARCH", "MAY", "JULY", "AUGUST", "OCTOBER", "DECEMBER"}) + public void testHas31Days(DateChecker.Month month) { + assertTrue(dateChecker.has31Days(month)); } - @Test - public void testDoesNotHave31Days() { + @ParameterizedTest + @EnumSource(value = DateChecker.Month.class, names = {"FEBRUARY", "APRIL", "JUNE", "SEPTEMBER", "NOVEMBER"}) + public void testDoesNotHave31Days(DateChecker.Month month) { + assertFalse(dateChecker.has31Days(month)); } From bad1c32a123d809bfb32bbce27cc63927d90ad98 Mon Sep 17 00:00:00 2001 From: Jacob McCullough <34502339+razorwired1124@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:05:48 +0000 Subject: [PATCH 2/2] :) --- .vscode/settings.json | 1 - src/test/java/DateCheckerTest.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index fbb6b85..5b8bd0b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,7 +17,6 @@ "files.autoSave": "afterDelay", "screencastMode.onlyKeyboardShortcuts": true, "terminal.integrated.fontSize": 18, - "workbench.activityBar.visible": true, "workbench.colorTheme": "Visual Studio Dark", "workbench.fontAliasing": "antialiased", "workbench.statusBar.visible": true, diff --git a/src/test/java/DateCheckerTest.java b/src/test/java/DateCheckerTest.java index 199a6c2..15864fc 100644 --- a/src/test/java/DateCheckerTest.java +++ b/src/test/java/DateCheckerTest.java @@ -1,4 +1,4 @@ - import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; @@ -11,14 +11,15 @@ class DateCheckerTest { DateChecker dateChecker = new DateChecker(); @ParameterizedTest - @EnumSource(value = DateChecker.Month.class, names = {"JANUARY", "MARCH", "MAY", "JULY", "AUGUST", "OCTOBER", "DECEMBER"}) + @EnumSource(value = DateChecker.Month.class, names = { "JANUARY", "MARCH", "MAY", "JULY", "AUGUST", "OCTOBER", + "DECEMBER" }) public void testHas31Days(DateChecker.Month month) { assertTrue(dateChecker.has31Days(month)); } @ParameterizedTest - @EnumSource(value = DateChecker.Month.class, names = {"FEBRUARY", "APRIL", "JUNE", "SEPTEMBER", "NOVEMBER"}) + @EnumSource(value = DateChecker.Month.class, names = { "FEBRUARY", "APRIL", "JUNE", "SEPTEMBER", "NOVEMBER" }) public void testDoesNotHave31Days(DateChecker.Month month) { assertFalse(dateChecker.has31Days(month));