[All] Apply checkstyle on test classes (#2783)

mpkorstanje · web-flow · commit 16da27f73478 · 2023-08-08T19:24:46.000+02:00
Co-authored-by: Julien Kronegg &lt;julien [at] kronegg.ch&gt;
diff --git a/cucumber-core/src/test/java/io/cucumber/core/eventbus/RandomUuidGeneratorTest.java b/cucumber-core/src/test/java/io/cucumber/core/eventbus/RandomUuidGeneratorTest.java
@@ -4,7 +4,8 @@
 
 import java.util.UUID;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class RandomUuidGeneratorTest {
     @Test
diff --git a/cucumber-core/src/test/java/io/cucumber/core/exception/UnrecoverableExceptionsTest.java b/cucumber-core/src/test/java/io/cucumber/core/exception/UnrecoverableExceptionsTest.java
@@ -3,7 +3,8 @@
 import org.junit.jupiter.api.Test;
 
 import static io.cucumber.core.exception.UnrecoverableExceptions.rethrowIfUnrecoverable;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class UnrecoverableExceptionsTest {
 
diff --git a/cucumber-core/src/test/java/io/cucumber/core/options/RuntimeOptionsBuilderTest.java b/cucumber-core/src/test/java/io/cucumber/core/options/RuntimeOptionsBuilderTest.java
@@ -3,7 +3,7 @@
 import io.cucumber.core.eventbus.IncrementingUuidGenerator;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class RuntimeOptionsBuilderTest {
 
diff --git a/cucumber-core/src/test/java/io/cucumber/core/options/UuidGeneratorParserTest.java b/cucumber-core/src/test/java/io/cucumber/core/options/UuidGeneratorParserTest.java
@@ -7,7 +7,8 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class UuidGeneratorParserTest {
 
diff --git a/cucumber-core/src/test/java/io/cucumber/core/runner/CachingGlueTest.java b/cucumber-core/src/test/java/io/cucumber/core/runner/CachingGlueTest.java
@@ -43,7 +43,11 @@
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/cucumber-core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java b/cucumber-core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java
@@ -20,8 +20,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
@@ -45,7 +43,7 @@ class HookTestStepTest {
     private final EventBus bus = mock(EventBus.class);
     private final UUID testExecutionId = UUID.randomUUID();
     private final TestCaseState state = new TestCaseState(bus, testExecutionId, testCase);
-    private HookTestStep step = new HookTestStep(UUID.randomUUID(), HookType.AFTER_STEP, definitionMatch);
+    private final HookTestStep step = new HookTestStep(UUID.randomUUID(), HookType.AFTER_STEP, definitionMatch);
 
     @BeforeEach
     void init() {
diff --git a/cucumber-core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java b/cucumber-core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java
@@ -38,8 +38,6 @@
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentCaptor.forClass;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
diff --git a/cucumber-core/src/test/java/io/cucumber/core/runner/ThrowableCollectorTest.java b/cucumber-core/src/test/java/io/cucumber/core/runner/ThrowableCollectorTest.java
@@ -3,7 +3,9 @@
 import org.junit.jupiter.api.Test;
 import org.opentest4j.TestAbortedException;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class ThrowableCollectorTest {
 
diff --git a/cucumber-core/src/test/java/io/cucumber/core/runtime/ObjectFactoryServiceLoaderTest.java b/cucumber-core/src/test/java/io/cucumber/core/runtime/ObjectFactoryServiceLoaderTest.java
@@ -3,12 +3,7 @@
 import io.cucumber.core.backend.DefaultObjectFactory;
 import io.cucumber.core.backend.ObjectFactory;
 import io.cucumber.core.backend.Options;
-import io.cucumber.core.eventbus.IncrementingUuidGenerator;
-import io.cucumber.core.eventbus.RandomUuidGenerator;
-import io.cucumber.core.eventbus.UuidGenerator;
 import io.cucumber.core.exception.CucumberException;
-import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.function.Supplier;
@@ -21,7 +16,7 @@
 
 /**
  * Testcases for `ObjectFactoryServiceLoader`
- *
+ * <p>
  * <!-- @formatter:off -->
  * | # | object-factory property | Available services                                    | Result                                                                           |
  * |---|-------------------------|-------------------------------------------------------|----------------------------------------------------------------------------------|
@@ -35,7 +30,7 @@
  * | 8 | OtherFactory            | DefaultObjectFactory                                  | exception, class not found through SPI                                           |
  * | 9 | undefined               | OtherFactory                                          | OtherFactory used                                                                |
  * <!-- @formatter:on -->
- *
+ * <p>
  * Essentially this means that
  * * (2) Cucumber works by default
  * * (4) When adding a custom implementation to the class path it is used automatically
diff --git a/cucumber-core/src/test/java/io/cucumber/core/runtime/ServiceLoaderTestClassLoader.java b/cucumber-core/src/test/java/io/cucumber/core/runtime/ServiceLoaderTestClassLoader.java
@@ -14,15 +14,14 @@
 
 /**
  * Testing classloader for ServiceLoader. This classloader overrides the
- * META-INF/services/<interface> file with a custom definition.
+ * META-INF/services/interface-class-name file with a custom definition.
  */
 public class ServiceLoaderTestClassLoader extends URLClassLoader {
     Class<?> metaInfInterface;
     Class<?>[] implementingClasses;
 
     /**
-     * Constructs a classloader which has no
-     * META-INF/services/<metaInfInterface>.
+     * Constructs a classloader which has no META-INF/services/metaInfInterface.
      *
      * @param metaInfInterface ServiceLoader interface
      */
@@ -31,11 +30,10 @@ public ServiceLoaderTestClassLoader(Class<?> metaInfInterface) {
     }
 
     /**
-     * Constructs a fake META-INF/services/<metaInfInterface> file which
-     * contains the provided array of classes. When the implementingClasses
-     * array is null, the META-INF file will not be constructed. The classes
-     * from implementingClasses are not required to implement the
-     * metaInfInterface.
+     * Constructs a fake META-INF/services/metaInfInterface file which contains
+     * the provided array of classes. When the implementingClasses array is
+     * null, the META-INF file will not be constructed. The classes from
+     * implementingClasses are not required to implement the metaInfInterface.
      *
      * @param metaInfInterface    ServiceLoader interface
      * @param implementingClasses potential subclasses of the ServiceLoader
diff --git a/cucumber-core/src/test/java/io/cucumber/core/runtime/UuidGeneratorServiceLoaderTest.java b/cucumber-core/src/test/java/io/cucumber/core/runtime/UuidGeneratorServiceLoaderTest.java
@@ -8,16 +8,16 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 
-import java.util.*;
+import java.util.UUID;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * # Testcases for `UuidGeneratorServiceLoader`
- *
+ * <p>
  * <!-- @formatter:off -->
  * | #   | uuid-generator property   | Available services                                                                  | Result                                                                           |
  * |-----|---------------------------|-------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
diff --git a/cucumber-gherkin/src/test/java/io/cucumber/core/gherkin/FeatureParserTest.java b/cucumber-gherkin/src/test/java/io/cucumber/core/gherkin/FeatureParserTest.java
@@ -1,12 +1,10 @@
 package io.cucumber.core.gherkin;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/cucumber-java8/src/test/java/io/cucumber/java8/Java8BackendTest.java b/cucumber-java8/src/test/java/io/cucumber/java8/Java8BackendTest.java
@@ -10,7 +10,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.net.URI;
-import java.util.Arrays;
 
 import static java.lang.Thread.currentThread;
 import static java.util.Arrays.asList;
diff --git a/cucumber-picocontainer/src/test/java/io/cucumber/picocontainer/StepDefinitions.java b/cucumber-picocontainer/src/test/java/io/cucumber/picocontainer/StepDefinitions.java
@@ -1,6 +1,10 @@
 package io.cucumber.picocontainer;
 
-import io.cucumber.java.*;
+import io.cucumber.java.After;
+import io.cucumber.java.AfterAll;
+import io.cucumber.java.Before;
+import io.cucumber.java.BeforeAll;
+import io.cucumber.java.Scenario;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
@@ -9,7 +13,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class StepDefinitions {
 
diff --git a/cucumber-spring/src/test/java/io/cucumber/spring/Issue1970Test.java b/cucumber-spring/src/test/java/io/cucumber/spring/Issue1970Test.java
@@ -1,7 +1,6 @@
 package io.cucumber.spring;
 
 import io.cucumber.core.backend.ObjectFactory;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -14,7 +13,7 @@
 import static io.cucumber.spring.CucumberTestContext.SCOPE_CUCUMBER_GLUE;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
-class Issue1970 {
+class Issue1970Test {
 
     @Test
     public void issue1970() {
diff --git a/cucumber-spring/src/test/java/io/cucumber/spring/SpringFactoryTest.java b/cucumber-spring/src/test/java/io/cucumber/spring/SpringFactoryTest.java
@@ -20,15 +20,10 @@
 import io.cucumber.spring.metaconfig.general.BellyMetaStepDefinitions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestContext;
-import org.springframework.test.context.TestExecutionListener;
-import org.springframework.test.context.TestExecutionListeners;
 
 import java.util.Optional;
 
@@ -416,7 +411,4 @@ public FailedTestInstanceCreation() {
         }
     }
 
-    public static class StubException extends Exception {
-
-    }
 }
diff --git a/cucumber-spring/src/test/java/io/cucumber/spring/annotationconfig/AnnotationContextConfiguration.java b/cucumber-spring/src/test/java/io/cucumber/spring/annotationconfig/AnnotationContextConfiguration.java
@@ -2,7 +2,6 @@
 
 import io.cucumber.spring.CucumberContextConfiguration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.web.WebAppConfiguration;
 
 @ContextConfiguration("classpath:cucumber.xml")
 @CucumberContextConfiguration
diff --git a/cucumber-spring/src/test/java/io/cucumber/spring/cucumbercontextconfigannotation/WithInheritedAnnotation.java b/cucumber-spring/src/test/java/io/cucumber/spring/cucumbercontextconfigannotation/WithInheritedAnnotation.java
@@ -3,7 +3,11 @@
 import io.cucumber.spring.CucumberContextConfiguration;
 import org.springframework.test.context.ContextConfiguration;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 public class WithInheritedAnnotation extends ParentClass {
 }
diff --git a/cucumber-spring/src/test/java/io/cucumber/spring/cucumbercontextconfigannotation/WithMetaAnnotation.java b/cucumber-spring/src/test/java/io/cucumber/spring/cucumbercontextconfigannotation/WithMetaAnnotation.java
@@ -3,7 +3,10 @@
 import io.cucumber.spring.CucumberContextConfiguration;
 import org.springframework.test.context.ContextConfiguration;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @MyTestAnnotation
 public class WithMetaAnnotation {
diff --git a/cucumber-spring/src/test/java/io/cucumber/spring/threading/ThreadingStepDefinitions.java b/cucumber-spring/src/test/java/io/cucumber/spring/threading/ThreadingStepDefinitions.java
@@ -5,7 +5,6 @@
 import io.cucumber.java.en.When;
 import io.cucumber.spring.CucumberContextConfiguration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.web.WebAppConfiguration;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/datatable/src/test/java/io/cucumber/datatable/DataTableTypeRegistryTest.java b/datatable/src/test/java/io/cucumber/datatable/DataTableTypeRegistryTest.java
@@ -14,7 +14,10 @@
 import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class DataTableTypeRegistryTest {
 
diff --git a/datatable/src/test/java/io/cucumber/datatable/NoConverterDefinedTest.java b/datatable/src/test/java/io/cucumber/datatable/NoConverterDefinedTest.java
@@ -1,7 +1,6 @@
 package io.cucumber.datatable;
 
 import io.cucumber.datatable.DataTable.TableConverter;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static java.util.Collections.singletonList;
diff --git a/datatable/src/test/java/io/cucumber/datatable/TableDifferTest.java b/datatable/src/test/java/io/cucumber/datatable/TableDifferTest.java
@@ -6,7 +6,9 @@
 import java.util.List;
 
 import static java.util.Collections.singletonList;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 class TableDifferTest {
 
diff --git a/docstring/src/test/java/io/cucumber/docstring/DocStringTypeRegistryTest.java b/docstring/src/test/java/io/cucumber/docstring/DocStringTypeRegistryTest.java
@@ -8,7 +8,6 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class DocStringTypeRegistryTest {
diff --git a/examples/calculator-java-cli/src/test/java/io/cucumber/examples/calculator/ShoppingStepDefinitions.java b/examples/calculator-java-cli/src/test/java/io/cucumber/examples/calculator/ShoppingStepDefinitions.java
@@ -15,7 +15,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static io.cucumber.examples.calculator.ShoppingStepDefinitions.Price.*;
+import static io.cucumber.examples.calculator.ShoppingStepDefinitions.Price.fromString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
diff --git a/pom.xml b/pom.xml
@@ -441,6 +441,7 @@
                     <configuration>
                         <consoleOutput>true</consoleOutput>
                         <failsOnError>true</failsOnError>
+                        <includeTestSourceDirectory>true</includeTestSourceDirectory>
                         <checkstyleRules>
                             <module name="Checker">
                                 <property name="severity" value="error"/>
