Remove duplicates

Author: mpkorstanje

java/src/test/java/io/cucumber/cucumberexpressions/Assertions.java

@@ -0,0 +1,25 @@
+package io.cucumber.cucumberexpressions;
+
+import org.assertj.core.api.AbstractObjectAssert;
+import org.assertj.core.api.InstanceOfAssertFactories;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+final class Assertions {
+    
+    private Assertions(){
+        // utility class
+    }
+
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    static AbstractObjectAssert<?, Object> asserThatSingleArgumentValue(Optional<List<Argument<?>>> match) {
+        return assertThat(match).get()
+                .asInstanceOf(InstanceOfAssertFactories.LIST)
+                .map(Argument.class::cast)
+                .singleElement()
+                .extracting(Argument::getValue);
+    }
+}

java/src/test/java/io/cucumber/cucumberexpressions/CustomParameterTypeTest.java

@@ -1,6 +1,5 @@
 package io.cucumber.cucumberexpressions;
 
-import org.assertj.core.api.AbstractObjectAssert;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
@@ -12,6 +11,7 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 
+import static io.cucumber.cucumberexpressions.Assertions.asserThatSingleArgumentValue;
 import static java.lang.Integer.parseInt;
 import static java.util.Arrays.asList;
 import static java.util.Objects.requireNonNull;
@@ -230,15 +230,6 @@ void matches_RegularExpression_arguments_with_custom_parameter_type_without_name
     private static void getArgumentValue(Optional<List<Argument<?>>> match, int index) {
         match.ifPresent(arguments -> arguments.get(index).getValue());
     }
-    
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private static AbstractObjectAssert<?, Object> asserThatSingleArgumentValue(Optional<List<Argument<?>>> match) {
-        return assertThat(match).get()
-                .asInstanceOf(InstanceOfAssertFactories.LIST)
-                .map(Argument.class::cast)
-                .singleElement()
-                .extracting(Argument::getValue);
-    }
 
     private record Coordinate(int x, int y, int z) {
 

java/src/test/java/io/cucumber/cucumberexpressions/EnumParameterTypeTest.java

@@ -1,14 +1,10 @@
 package io.cucumber.cucumberexpressions;
 
-import org.assertj.core.api.AbstractObjectAssert;
-import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.cucumber.cucumberexpressions.Assertions.asserThatSingleArgumentValue;
 
 class EnumParameterTypeTest {
 
@@ -27,14 +23,4 @@ void converts_to_enum() {
         var args = expression.match("I am happy");
         asserThatSingleArgumentValue(args).isEqualTo(Mood.happy);
     }
-    
-        @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private static AbstractObjectAssert<?, Object> asserThatSingleArgumentValue(Optional<List<Argument<?>>> match) {
-        return assertThat(match).get()
-                .asInstanceOf(InstanceOfAssertFactories.LIST)
-                .map(Argument.class::cast)
-                .singleElement()
-                .extracting(Argument::getValue);
-    }
-
 }

java/src/test/java/io/cucumber/cucumberexpressions/GenericParameterTypeTest.java

@@ -1,18 +1,15 @@
 package io.cucumber.cucumberexpressions;
 
-import org.assertj.core.api.AbstractObjectAssert;
-import org.assertj.core.api.InstanceOfAssertFactories;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 
+import static io.cucumber.cucumberexpressions.Assertions.asserThatSingleArgumentValue;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
-import static org.assertj.core.api.Assertions.assertThat;
 
 public class GenericParameterTypeTest {
 
@@ -33,12 +30,4 @@ public void transforms_to_a_list_of_string() {
         asserThatSingleArgumentValue(args).isEqualTo(asList("three", "blind", "mice"));
     }
 
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private static AbstractObjectAssert<?, Object> asserThatSingleArgumentValue(Optional<List<Argument<?>>> match) {
-        return assertThat(match).get()
-                .asInstanceOf(InstanceOfAssertFactories.LIST)
-                .map(Argument.class::cast)
-                .singleElement()
-                .extracting(Argument::getValue);
-    }
 }

java/src/test/java/io/cucumber/cucumberexpressions/ParameterTypeRegistryTest.java

@@ -1,17 +1,14 @@
 package io.cucumber.cucumberexpressions;
 
-import org.assertj.core.api.AbstractObjectAssert;
-import org.assertj.core.api.InstanceOfAssertFactories;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.regex.Pattern;
 
+import static io.cucumber.cucumberexpressions.Assertions.asserThatSingleArgumentValue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -171,15 +168,6 @@ public void parse_decimal_numbers_in_norwegian() {
         asserThatSingleArgumentValue(expression.match("-1,1")).isEqualTo(new BigDecimal("-1.1"));
         asserThatSingleArgumentValue(expression.match("-,1E1")).isEqualTo(new BigDecimal("-1"));
     }
-    
-    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-    private static AbstractObjectAssert<?, Object> asserThatSingleArgumentValue(Optional<List<Argument<?>>> match) {
-        return assertThat(match).get()
-                .asInstanceOf(InstanceOfAssertFactories.LIST)
-                .map(Argument.class::cast)
-                .singleElement()
-                .extracting(Argument::getValue);
-    }
 
     public static class Name {
         Name(@Nullable String s) {