From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Thu, 2 Jan 2025 11:46:25 +0000 (+0100)
Subject: ♻️ Move set-flag-and-verify method to helper class
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=9054145e666ccba23a2be2e37454599256baba2f;p=jFCPlib.git

♻️ Move set-flag-and-verify method to helper class
---

diff --git a/src/test/java/net/pterodactylus/fcp/GetConfigTest.java b/src/test/java/net/pterodactylus/fcp/GetConfigTest.java
index 0ece93a..4e3b14a 100644
--- a/src/test/java/net/pterodactylus/fcp/GetConfigTest.java
+++ b/src/test/java/net/pterodactylus/fcp/GetConfigTest.java
@@ -2,11 +2,7 @@ package net.pterodactylus.fcp;
 
 import org.junit.Test;
 
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
+import static net.pterodactylus.fcp.test.MessageTests.verifyFieldValueAfterSettingFlag;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
@@ -42,12 +38,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithCurrentToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithCurrent, "WithCurrent", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithCurrent, "WithCurrent", true);
 	}
 
 	@Test
 	public void settingWithCurrentToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithCurrent, "WithCurrent", false);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithCurrent, "WithCurrent", false);
 	}
 
 	@Test
@@ -57,12 +53,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithDefaultsToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithDefaults, "WithDefaults", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithDefaults, "WithDefaults", true);
 	}
 
 	@Test
 	public void settingWithDefaultsToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithDefaults, "WithDefaults", false);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithDefaults, "WithDefaults", false);
 	}
 
 	@Test
@@ -72,12 +68,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithSortOrderToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithSortOrder, "WithSortOrder", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithSortOrder, "WithSortOrder", true);
 	}
 
 	@Test
 	public void settingWithSortOrderToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithSortOrder, "WithSortOrder", false);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithSortOrder, "WithSortOrder", false);
 	}
 
 	@Test
@@ -87,12 +83,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithExpertFlagToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithExpertFlag, "WithExpertFlag", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithExpertFlag, "WithExpertFlag", true);
 	}
 
 	@Test
 	public void settingWithExpertFlagToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithExpertFlag, "WithExpertFlag", false);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithExpertFlag, "WithExpertFlag", false);
 	}
 
 	@Test
@@ -102,12 +98,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithForceWriteFlagToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithForceWriteFlag, "WithForceWriteFlag", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithForceWriteFlag, "WithForceWriteFlag", true);
 	}
 
 	@Test
 	public void settingWithForceWriteFlagToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithForceWriteFlag, "WithForceWriteFlag", false);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithForceWriteFlag, "WithForceWriteFlag", false);
 	}
 
 	@Test
@@ -117,12 +113,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithShortDescriptionToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithShortDescription, "WithShortDescription", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithShortDescription, "WithShortDescription", true);
 	}
 
 	@Test
 	public void settingWithShortDescriptionToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithShortDescription, "WithShortDescription", false);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithShortDescription, "WithShortDescription", false);
 	}
 
 	@Test
@@ -132,12 +128,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithLongDescriptionToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithLongDescription, "WithLongDescription", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithLongDescription, "WithLongDescription", true);
 	}
 
 	@Test
 	public void settingWithLongDescriptionToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithLongDescription, "WithLongDescription", false);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithLongDescription, "WithLongDescription", false);
 	}
 
 	@Test
@@ -147,17 +143,12 @@ public class GetConfigTest {
 
 	@Test
 	public void settingWithDataTypesToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithDataTypes, "WithDataTypes", true);
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithDataTypes, "WithDataTypes", true);
 	}
 
 	@Test
 	public void settingWithDataTypesToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(GetConfig::setWithDataTypes, "WithDataTypes", false);
-	}
-
-	private void verifyFieldValueAfterSettingFlag(BiConsumer<GetConfig, Boolean> setter, String fieldName, boolean flag) {
-		setter.accept(getConfig, flag);
-		assertThat(getConfig.getField(fieldName), equalTo(String.valueOf(flag)));
+		verifyFieldValueAfterSettingFlag(getConfig, GetConfig::setWithDataTypes, "WithDataTypes", false);
 	}
 
 	private final GetConfig getConfig = new GetConfig();
diff --git a/src/test/java/net/pterodactylus/fcp/GetPluginInfoTest.java b/src/test/java/net/pterodactylus/fcp/GetPluginInfoTest.java
index dab69de..d9e943c 100644
--- a/src/test/java/net/pterodactylus/fcp/GetPluginInfoTest.java
+++ b/src/test/java/net/pterodactylus/fcp/GetPluginInfoTest.java
@@ -2,10 +2,7 @@ package net.pterodactylus.fcp;
 
 import org.junit.Test;
 
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
+import static net.pterodactylus.fcp.test.MessageTests.verifyFieldValueAfterSettingFlag;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;
@@ -38,17 +35,12 @@ public class GetPluginInfoTest {
 
 	@Test
 	public void settingDetailedToTrueResultsInFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(getPluginInfo::setDetailed, m -> m.getField("Detailed"), true);
+		verifyFieldValueAfterSettingFlag(getPluginInfo, GetPluginInfo::setDetailed, "Detailed", true);
 	}
 
 	@Test
 	public void settingDetailedToFalseResultsInFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(getPluginInfo::setDetailed, m -> m.getField("Detailed"), false);
-	}
-
-	private void verifyFieldValueAfterSettingFlag(Consumer<Boolean> setter, Function<? super FcpMessage, String> getter, boolean flag) {
-		setter.accept(flag);
-		assertThat(getter.apply(getPluginInfo), equalTo(String.valueOf(flag)));
+		verifyFieldValueAfterSettingFlag(getPluginInfo, GetPluginInfo::setDetailed, "Detailed", false);
 	}
 
 	private final GetPluginInfo getPluginInfo = new GetPluginInfo("test.Plugin", "test-identifier");
diff --git a/src/test/java/net/pterodactylus/fcp/GetRequestStatusTest.java b/src/test/java/net/pterodactylus/fcp/GetRequestStatusTest.java
index 343a169..a2b31a6 100644
--- a/src/test/java/net/pterodactylus/fcp/GetRequestStatusTest.java
+++ b/src/test/java/net/pterodactylus/fcp/GetRequestStatusTest.java
@@ -21,12 +21,12 @@ public class GetRequestStatusTest {
 
 	@Test
 	public void getRequestStatusWithGlobalSetToTrueResultsInGlobalFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setGlobal, m -> m.getField("Global"), true);
+		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setGlobal, "Global", true);
 	}
 
 	@Test
 	public void getRequestStatusWithGlobalSetToFalseResultsInGlobalFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setGlobal, m -> m.getField("Global"), false);
+		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setGlobal, "Global", false);
 	}
 
 	@Test
@@ -36,12 +36,12 @@ public class GetRequestStatusTest {
 
 	@Test
 	public void getRequestStatusWithOnlyDataSetToTrueResultsInOnlyDataFieldBeingSetToTrue() {
-		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setOnlyData, m -> m.getField("OnlyData"), true);
+		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setOnlyData, "OnlyData", true);
 	}
 
 	@Test
 	public void getRequestStatusWithOnlyDataSetToFalseResultsInOnlyDataFieldBeingSetToFalse() {
-		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setOnlyData, m -> m.getField("OnlyData"), false);
+		verifyFieldValueAfterSettingFlag(getRequestStatus, GetRequestStatus::setOnlyData, "OnlyData", false);
 	}
 
 	private final GetRequestStatus getRequestStatus = new GetRequestStatus("test-identifier");
diff --git a/src/test/java/net/pterodactylus/fcp/test/MessageTests.java b/src/test/java/net/pterodactylus/fcp/test/MessageTests.java
index ed2dd60..6249a84 100644
--- a/src/test/java/net/pterodactylus/fcp/test/MessageTests.java
+++ b/src/test/java/net/pterodactylus/fcp/test/MessageTests.java
@@ -10,9 +10,13 @@ import static org.hamcrest.Matchers.equalTo;
 
 public class MessageTests {
 
-	public static <M extends FcpMessage> void verifyFieldValueAfterSettingFlag(M message, BiConsumer<? super M, Boolean> setter, Function<? super M, String> getter, boolean flag) {
+	public static <M extends FcpMessage> void verifyPropertyAfterSettingFlag(M message, BiConsumer<? super M, Boolean> setter, Function<? super M, String> getter, boolean flag) {
 		setter.accept(message, flag);
 		assertThat(getter.apply(message), equalTo(String.valueOf(flag)));
 	}
 
+	public static <M extends FcpMessage> void verifyFieldValueAfterSettingFlag(M message, BiConsumer<? super M, Boolean> setter, String fieldName, boolean flag) {
+		verifyPropertyAfterSettingFlag(message, setter, m -> m.getField(fieldName), false);
+	}
+
 }