From 703bcb937230a91764795cf6c8a65ff8ec1ce6f7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Mon, 6 Jan 2025 11:56:38 +0100 Subject: [PATCH] =?utf8?q?=F0=9F=97=91=EF=B8=8F=20Deprecate=20WatchFeeds?= =?utf8?q?=20constructor=20with=20boolean=20argument?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../java/net/pterodactylus/fcp/WatchFeeds.java | 13 +++++++++ .../java/net/pterodactylus/fcp/WatchFeedsTest.java | 31 +++++++++++++++++----- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/pterodactylus/fcp/WatchFeeds.java b/src/main/java/net/pterodactylus/fcp/WatchFeeds.java index e71df53..7ad0086 100644 --- a/src/main/java/net/pterodactylus/fcp/WatchFeeds.java +++ b/src/main/java/net/pterodactylus/fcp/WatchFeeds.java @@ -7,9 +7,22 @@ package net.pterodactylus.fcp; */ public class WatchFeeds extends FcpMessage { + public WatchFeeds() { + super("WatchFeeds"); + } + + /** + * @deprecated Use {@link #WatchFeeds()} + * and {@link #setEnabled(boolean)} instead + */ + @Deprecated public WatchFeeds(boolean enabled) { super("WatchFeeds"); setField("Enabled", String.valueOf(enabled)); } + public void setEnabled(boolean enabled) { + setField("Enabled", String.valueOf(enabled)); + } + } diff --git a/src/test/java/net/pterodactylus/fcp/WatchFeedsTest.java b/src/test/java/net/pterodactylus/fcp/WatchFeedsTest.java index 5482d73..1a5a91f 100644 --- a/src/test/java/net/pterodactylus/fcp/WatchFeedsTest.java +++ b/src/test/java/net/pterodactylus/fcp/WatchFeedsTest.java @@ -2,8 +2,9 @@ package net.pterodactylus.fcp; import org.junit.Test; -import static net.pterodactylus.fcp.test.Matchers.isMessage; +import static net.pterodactylus.fcp.test.MessageTests.verifyFieldValueAfterSettingFlag; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anEmptyMap; import static org.hamcrest.Matchers.equalTo; /** @@ -18,15 +19,33 @@ public class WatchFeedsTest { assertThat(watchFeeds.getName(), equalTo("WatchFeeds")); } - public void enablingWatchFeedsSendsCorrectOutput() throws Exception { - WatchFeeds watchFeeds = new WatchFeeds(true); - assertThat(watchFeeds, isMessage("WatchFeeds", "Enabled=true")); + @Test + public void watchFeedsMessageWithoutArgumentsHasNoFieldsSet() { + assertThat(watchFeeds.getFields(), anEmptyMap()); } @Test - public void disablingWatchFeedsSendsCorrectOutput() throws Exception { + public void settingEnabledToFalseSetsEnabledFieldToFalse() { + verifyFieldValueAfterSettingFlag(watchFeeds, WatchFeeds::setEnabled, "Enabled", false); + } + + @Test + public void settingEnabledToTrueSetsEnabledFieldToTrue() { + verifyFieldValueAfterSettingFlag(watchFeeds, WatchFeeds::setEnabled, "Enabled", true); + } + + @Test + public void watchFeedsMessageWithEnabledFalseSetsEnabledFieldToFalse() { WatchFeeds watchFeeds = new WatchFeeds(false); - assertThat(watchFeeds, isMessage("WatchFeeds", "Enabled=false")); + assertThat(watchFeeds.getField("Enabled"), equalTo("false")); + } + + @Test + public void watchFeedsMessageWithEnabledTrueSetsEnabledFieldToTrue() { + WatchFeeds watchFeeds = new WatchFeeds(true); + assertThat(watchFeeds.getField("Enabled"), equalTo("true")); } + private final WatchFeeds watchFeeds = new WatchFeeds(); + } -- 2.7.4