Skip to content

Commit fe355ce

Browse files
author
Julien Kronegg
committed
fix: applied checkstyle on test classes for #2767
1 parent 4b773ad commit fe355ce

File tree

47 files changed

+249
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+249
-82
lines changed

cucumber-archetype/src/main/resources/archetype-resources/src/test/java/StepDefinitions.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package ${package};
22

3-
import io.cucumber.java.en.*;
4-
5-
import org.junit.jupiter.api.Assertions.*;
3+
import io.cucumber.java.en.Given;
4+
import io.cucumber.java.en.Then;
5+
import io.cucumber.java.en.When;
66

77
public class StepDefinitions {
88

cucumber-archetype/src/test/resources/projects/should-generate-project/reference/src/test/java/com/example/StepDefinitions.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.example;
22

3-
import io.cucumber.java.en.*;
4-
5-
import org.junit.jupiter.api.Assertions.*;
3+
import io.cucumber.java.en.Given;
4+
import io.cucumber.java.en.Then;
5+
import io.cucumber.java.en.When;
66

77
public class StepDefinitions {
88

cucumber-core/src/test/java/io/cucumber/core/backend/StubPendingException.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.cucumber.core.backend;
22

3-
import io.cucumber.core.backend.Pending;
4-
53
import java.io.PrintStream;
64
import java.io.PrintWriter;
75

cucumber-core/src/test/java/io/cucumber/core/eventbus/RandomUuidGeneratorTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import java.util.UUID;
66

7-
import static org.junit.jupiter.api.Assertions.*;
7+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
8+
import static org.junit.jupiter.api.Assertions.assertNotNull;
89

910
class RandomUuidGeneratorTest {
1011
@Test

cucumber-core/src/test/java/io/cucumber/core/exception/UnrecoverableExceptionsTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import org.junit.jupiter.api.Test;
44

55
import static io.cucumber.core.exception.UnrecoverableExceptions.rethrowIfUnrecoverable;
6-
import static org.junit.jupiter.api.Assertions.*;
6+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
7+
import static org.junit.jupiter.api.Assertions.assertThrows;
78

89
class UnrecoverableExceptionsTest {
910

cucumber-core/src/test/java/io/cucumber/core/options/RuntimeOptionsBuilderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io.cucumber.core.eventbus.IncrementingUuidGenerator;
44
import org.junit.jupiter.api.Test;
55

6-
import static org.junit.jupiter.api.Assertions.*;
6+
import static org.junit.jupiter.api.Assertions.assertEquals;
77

88
class RuntimeOptionsBuilderTest {
99

cucumber-core/src/test/java/io/cucumber/core/options/UuidGeneratorParserTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import org.junit.jupiter.api.Test;
88

99
import static org.hamcrest.MatcherAssert.assertThat;
10-
import static org.junit.jupiter.api.Assertions.*;
10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
import static org.junit.jupiter.api.Assertions.assertThrows;
1112

1213
class UuidGeneratorParserTest {
1314

cucumber-core/src/test/java/io/cucumber/core/plugin/CanonicalEventOrderTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.cucumber.plugin.event.SnippetsSuggestedEvent;
77
import io.cucumber.plugin.event.SnippetsSuggestedEvent.Suggestion;
88
import io.cucumber.plugin.event.Status;
9-
import io.cucumber.plugin.event.TestCase;
109
import io.cucumber.plugin.event.TestCaseStarted;
1110
import io.cucumber.plugin.event.TestRunFinished;
1211
import io.cucumber.plugin.event.TestRunStarted;

cucumber-core/src/test/java/io/cucumber/core/plugin/PluginFactoryTest.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88
import io.cucumber.messages.types.Envelope;
99
import io.cucumber.plugin.ConcurrentEventListener;
1010
import io.cucumber.plugin.EventListener;
11-
import io.cucumber.plugin.event.*;
11+
import io.cucumber.plugin.event.EventHandler;
12+
import io.cucumber.plugin.event.EventPublisher;
13+
import io.cucumber.plugin.event.Result;
14+
import io.cucumber.plugin.event.Status;
15+
import io.cucumber.plugin.event.TestRunFinished;
16+
import io.cucumber.plugin.event.TestRunStarted;
17+
import io.cucumber.plugin.event.TestStepFinished;
1218
import org.junit.jupiter.api.AfterEach;
1319
import org.junit.jupiter.api.Test;
1420
import org.junit.jupiter.api.function.Executable;

cucumber-core/src/test/java/io/cucumber/core/plugin/PluginsTest.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
import java.util.List;
1616
import java.util.Map;
1717

18-
import static org.junit.jupiter.api.Assertions.*;
18+
import static org.junit.jupiter.api.Assertions.assertEquals;
19+
import static org.junit.jupiter.api.Assertions.assertFalse;
20+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
21+
import static org.junit.jupiter.api.Assertions.assertIterableEquals;
22+
import static org.junit.jupiter.api.Assertions.assertNotNull;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
1924

2025
class PluginsTest {
2126

cucumber-core/src/test/java/io/cucumber/core/plugin/ProgressFormatterTest.java

+10-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22

33
import io.cucumber.core.eventbus.EventBus;
44
import io.cucumber.core.runtime.TimeServiceEventBus;
5-
import io.cucumber.plugin.event.*;
5+
import io.cucumber.plugin.event.Argument;
6+
import io.cucumber.plugin.event.Location;
7+
import io.cucumber.plugin.event.PickleStepTestStep;
8+
import io.cucumber.plugin.event.Result;
9+
import io.cucumber.plugin.event.Step;
10+
import io.cucumber.plugin.event.StepArgument;
11+
import io.cucumber.plugin.event.TestCase;
12+
import io.cucumber.plugin.event.TestRunFinished;
13+
import io.cucumber.plugin.event.TestStep;
14+
import io.cucumber.plugin.event.TestStepFinished;
615
import org.junit.jupiter.api.BeforeEach;
716
import org.junit.jupiter.api.Test;
817

cucumber-core/src/test/java/io/cucumber/core/plugin/UnusedStepsSummaryPrinterTest.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
package io.cucumber.core.plugin;
22

33
import io.cucumber.core.runtime.TimeServiceEventBus;
4-
import io.cucumber.plugin.event.*;
4+
import io.cucumber.plugin.event.Result;
5+
import io.cucumber.plugin.event.Status;
6+
import io.cucumber.plugin.event.StepDefinedEvent;
7+
import io.cucumber.plugin.event.StepDefinition;
8+
import io.cucumber.plugin.event.TestRunFinished;
9+
import io.cucumber.plugin.event.TestStep;
10+
import io.cucumber.plugin.event.TestStepFinished;
511
import org.junit.jupiter.api.Test;
612

713
import java.io.ByteArrayOutputStream;

cucumber-core/src/test/java/io/cucumber/core/plugin/UsageFormatterTest.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package io.cucumber.core.plugin;
22

3-
import io.cucumber.plugin.event.*;
3+
import io.cucumber.plugin.event.PickleStepTestStep;
4+
import io.cucumber.plugin.event.Result;
5+
import io.cucumber.plugin.event.Status;
6+
import io.cucumber.plugin.event.TestStep;
7+
import io.cucumber.plugin.event.TestStepFinished;
48
import org.json.JSONException;
59
import org.junit.jupiter.api.Disabled;
610
import org.junit.jupiter.api.Test;

cucumber-core/src/test/java/io/cucumber/core/runner/CachingGlueTest.java

+23-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
package io.cucumber.core.runner;
22

3-
import io.cucumber.core.backend.*;
3+
import io.cucumber.core.backend.CucumberBackendException;
4+
import io.cucumber.core.backend.CucumberInvocationTargetException;
5+
import io.cucumber.core.backend.DataTableTypeDefinition;
6+
import io.cucumber.core.backend.DefaultDataTableCellTransformerDefinition;
7+
import io.cucumber.core.backend.DefaultDataTableEntryTransformerDefinition;
8+
import io.cucumber.core.backend.DefaultParameterTransformerDefinition;
9+
import io.cucumber.core.backend.DocStringTypeDefinition;
10+
import io.cucumber.core.backend.HookDefinition;
11+
import io.cucumber.core.backend.ParameterInfo;
12+
import io.cucumber.core.backend.ParameterTypeDefinition;
13+
import io.cucumber.core.backend.ScenarioScoped;
14+
import io.cucumber.core.backend.SourceReference;
15+
import io.cucumber.core.backend.StepDefinition;
416
import io.cucumber.core.backend.TestCaseState;
517
import io.cucumber.core.eventbus.EventBus;
618
import io.cucumber.core.feature.TestFeatureParser;
@@ -22,7 +34,11 @@
2234
import java.lang.reflect.Type;
2335
import java.net.URI;
2436
import java.time.Clock;
25-
import java.util.*;
37+
import java.util.ArrayList;
38+
import java.util.Collections;
39+
import java.util.List;
40+
import java.util.Optional;
41+
import java.util.UUID;
2642
import java.util.stream.Collectors;
2743

2844
import static java.util.Locale.ENGLISH;
@@ -31,7 +47,11 @@
3147
import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
3248
import static org.hamcrest.core.Is.is;
3349
import static org.hamcrest.core.IsEqual.equalTo;
34-
import static org.junit.jupiter.api.Assertions.*;
50+
import static org.junit.jupiter.api.Assertions.assertAll;
51+
import static org.junit.jupiter.api.Assertions.assertEquals;
52+
import static org.junit.jupiter.api.Assertions.assertNotNull;
53+
import static org.junit.jupiter.api.Assertions.assertThrows;
54+
import static org.junit.jupiter.api.Assertions.assertTrue;
3555

3656
class CachingGlueTest {
3757

cucumber-core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import static org.hamcrest.MatcherAssert.assertThat;
2121
import static org.hamcrest.core.Is.is;
2222
import static org.hamcrest.core.IsEqual.equalTo;
23-
import static org.junit.jupiter.api.Assertions.assertFalse;
24-
import static org.junit.jupiter.api.Assertions.assertTrue;
2523
import static org.mockito.ArgumentMatchers.isA;
2624
import static org.mockito.Mockito.inOrder;
2725
import static org.mockito.Mockito.mock;

cucumber-core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
import static org.hamcrest.core.Is.is;
3939
import static org.hamcrest.core.IsEqual.equalTo;
4040
import static org.junit.jupiter.api.Assertions.assertAll;
41-
import static org.junit.jupiter.api.Assertions.assertFalse;
42-
import static org.junit.jupiter.api.Assertions.assertTrue;
4341
import static org.mockito.ArgumentCaptor.forClass;
4442
import static org.mockito.ArgumentMatchers.any;
4543
import static org.mockito.ArgumentMatchers.argThat;

cucumber-core/src/test/java/io/cucumber/core/runner/TestCaseStateResultTest.java

+14-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@
33
import io.cucumber.core.eventbus.EventBus;
44
import io.cucumber.core.feature.TestFeatureParser;
55
import io.cucumber.core.gherkin.Feature;
6-
import io.cucumber.plugin.event.*;
6+
import io.cucumber.plugin.event.EmbedEvent;
7+
import io.cucumber.plugin.event.EventHandler;
8+
import io.cucumber.plugin.event.Result;
9+
import io.cucumber.plugin.event.Status;
10+
import io.cucumber.plugin.event.WriteEvent;
711
import org.junit.jupiter.api.BeforeEach;
812
import org.junit.jupiter.api.Test;
913

1014
import java.time.Instant;
11-
import java.util.*;
15+
import java.util.ArrayList;
16+
import java.util.Collections;
17+
import java.util.List;
18+
import java.util.UUID;
1219

1320
import static io.cucumber.core.backend.Status.FAILED;
1421
import static io.cucumber.core.backend.Status.PASSED;
@@ -19,7 +26,11 @@
1926
import static org.hamcrest.MatcherAssert.assertThat;
2027
import static org.hamcrest.core.Is.is;
2128
import static org.hamcrest.core.IsEqual.equalTo;
22-
import static org.junit.jupiter.api.Assertions.*;
29+
import static org.junit.jupiter.api.Assertions.assertAll;
30+
import static org.junit.jupiter.api.Assertions.assertEquals;
31+
import static org.junit.jupiter.api.Assertions.assertFalse;
32+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
33+
import static org.junit.jupiter.api.Assertions.assertTrue;
2334

2435
class TestCaseStateResultTest {
2536

cucumber-core/src/test/java/io/cucumber/core/runner/TestCaseTest.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
package io.cucumber.core.runner;
22

3-
import io.cucumber.core.backend.*;
3+
import io.cucumber.core.backend.CucumberBackendException;
4+
import io.cucumber.core.backend.CucumberInvocationTargetException;
5+
import io.cucumber.core.backend.HookDefinition;
6+
import io.cucumber.core.backend.ParameterInfo;
47
import io.cucumber.core.backend.StepDefinition;
58
import io.cucumber.core.eventbus.EventBus;
69
import io.cucumber.core.feature.TestFeatureParser;
710
import io.cucumber.core.gherkin.Feature;
811
import io.cucumber.core.gherkin.Pickle;
9-
import io.cucumber.plugin.event.*;
12+
import io.cucumber.plugin.event.EventHandler;
1013
import io.cucumber.plugin.event.Status;
14+
import io.cucumber.plugin.event.TestCaseFinished;
15+
import io.cucumber.plugin.event.TestCaseStarted;
16+
import io.cucumber.plugin.event.TestStepFinished;
17+
import io.cucumber.plugin.event.TestStepStarted;
1118
import org.junit.jupiter.api.Test;
1219

1320
import java.net.URI;
@@ -22,7 +29,7 @@
2229
import static io.cucumber.plugin.event.HookType.BEFORE_STEP;
2330
import static java.util.Arrays.asList;
2431
import static java.util.Collections.singletonList;
25-
import static org.junit.jupiter.api.Assertions.*;
32+
import static org.junit.jupiter.api.Assertions.assertEquals;
2633

2734
class TestCaseTest {
2835
private final Feature feature = TestFeatureParser.parse("" +

cucumber-core/src/test/java/io/cucumber/core/runner/ThrowableCollectorTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import org.junit.jupiter.api.Test;
44
import org.opentest4j.TestAbortedException;
55

6-
import static org.junit.jupiter.api.Assertions.*;
6+
import static org.junit.jupiter.api.Assertions.assertEquals;
7+
import static org.junit.jupiter.api.Assertions.assertNull;
8+
import static org.junit.jupiter.api.Assertions.assertThrows;
79

810
class ThrowableCollectorTest {
911

cucumber-core/src/test/java/io/cucumber/core/runtime/CucumberExecutionContextTest.java

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
import io.cucumber.core.options.RuntimeOptions;
55
import io.cucumber.core.options.RuntimeOptionsBuilder;
66
import io.cucumber.core.plugin.StubTestCase;
7-
import io.cucumber.plugin.event.*;
7+
import io.cucumber.plugin.event.Result;
8+
import io.cucumber.plugin.event.Status;
9+
import io.cucumber.plugin.event.TestCaseFinished;
10+
import io.cucumber.plugin.event.TestRunFinished;
11+
import io.cucumber.plugin.event.TestRunStarted;
812
import org.junit.jupiter.api.Test;
913

1014
import java.time.Clock;
@@ -38,7 +42,7 @@ class CucumberExecutionContextTest {
3842
private final CucumberExecutionContext context = new CucumberExecutionContext(bus, exitStatus, runnerSupplier);
3943

4044
@Test
41-
public void collects_and_rethrows_failures_in_runner() {
45+
void collects_and_rethrows_failures_in_runner() {
4246
IllegalStateException thrown = assertThrows(IllegalStateException.class, () -> context.runTestCase(runner -> {
4347
throw failure;
4448
}));
@@ -47,7 +51,7 @@ public void collects_and_rethrows_failures_in_runner() {
4751
}
4852

4953
@Test
50-
public void rethrows_but_does_not_collect_failures_in_test_case() {
54+
void rethrows_but_does_not_collect_failures_in_test_case() {
5155
IllegalStateException thrown = assertThrows(IllegalStateException.class, () -> context.runTestCase(runner -> {
5256
try (TestCaseResultObserver r = new TestCaseResultObserver(bus)) {
5357
bus.send(new TestCaseFinished(bus.getInstant(), new StubTestCase(),
@@ -64,7 +68,7 @@ public void rethrows_but_does_not_collect_failures_in_test_case() {
6468
}
6569

6670
@Test
67-
public void emits_failures_in_events() {
71+
void emits_failures_in_events() {
6872
List<TestRunStarted> testRunStarted = new ArrayList<>();
6973
List<TestRunFinished> testRunFinished = new ArrayList<>();
7074

cucumber-core/src/test/java/io/cucumber/core/runtime/ObjectFactoryServiceLoaderTest.java

-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
import io.cucumber.core.backend.DefaultObjectFactory;
44
import io.cucumber.core.backend.ObjectFactory;
55
import io.cucumber.core.backend.Options;
6-
import io.cucumber.core.eventbus.IncrementingUuidGenerator;
7-
import io.cucumber.core.eventbus.RandomUuidGenerator;
8-
import io.cucumber.core.eventbus.UuidGenerator;
96
import io.cucumber.core.exception.CucumberException;
10-
import org.hamcrest.Matchers;
11-
import org.junit.jupiter.api.Disabled;
127
import org.junit.jupiter.api.Test;
138

149
import java.util.function.Supplier;

cucumber-core/src/test/java/io/cucumber/core/runtime/RuntimeTest.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package io.cucumber.core.runtime;
22

3-
import io.cucumber.core.backend.*;
3+
import io.cucumber.core.backend.CucumberBackendException;
4+
import io.cucumber.core.backend.Glue;
5+
import io.cucumber.core.backend.HookDefinition;
6+
import io.cucumber.core.backend.ParameterInfo;
7+
import io.cucumber.core.backend.ScenarioScoped;
8+
import io.cucumber.core.backend.StaticHookDefinition;
9+
import io.cucumber.core.backend.TestCaseState;
410
import io.cucumber.core.eventbus.EventBus;
511
import io.cucumber.core.exception.CompositeCucumberException;
612
import io.cucumber.core.exception.CucumberException;

cucumber-core/src/test/java/io/cucumber/core/runtime/ServiceLoaderTestClassLoader.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
/**
1616
* Testing classloader for ServiceLoader. This classloader overrides the
17-
* META-INF/services/<interface> file with a custom definition.
17+
* META-INF/services/&lt;interface&gt; file with a custom definition.
1818
*/
1919
public class ServiceLoaderTestClassLoader extends URLClassLoader {
2020
Class<?> metaInfInterface;
2121
Class<?>[] implementingClasses;
2222

2323
/**
2424
* Constructs a classloader which has no
25-
* META-INF/services/<metaInfInterface>.
25+
* META-INF/services/&lt;metaInfInterface&gt;.
2626
*
2727
* @param metaInfInterface ServiceLoader interface
2828
*/
@@ -31,7 +31,7 @@ public ServiceLoaderTestClassLoader(Class<?> metaInfInterface) {
3131
}
3232

3333
/**
34-
* Constructs a fake META-INF/services/<metaInfInterface> file which
34+
* Constructs a fake META-INF/services/&lt;metaInfInterface&gt; file which
3535
* contains the provided array of classes. When the implementingClasses
3636
* array is null, the META-INF file will not be constructed. The classes
3737
* from implementingClasses are not required to implement the

0 commit comments

Comments
 (0)