Skip to content

Commit 07a3b49

Browse files
authored
[Code] Clean up unnecessary public modifiers (#1775)
JUnit 5 tests and test classes can be package private. The public modifier simply adds nothing but ceremony. Cleaning this up will remove a large number of inspection warnings.
1 parent 7df31da commit 07a3b49

File tree

46 files changed

+297
-391
lines changed

Some content is hidden

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

46 files changed

+297
-391
lines changed

core/src/test/java/io/cucumber/core/backend/JavaObjectFactoryTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
import static org.hamcrest.core.IsNull.notNullValue;
1111
import static org.junit.jupiter.api.Assertions.assertAll;
1212

13-
public class JavaObjectFactoryTest {
13+
class JavaObjectFactoryTest {
1414

1515
@Test
16-
public void shouldGiveUsNewInstancesForEachScenario() {
16+
void shouldGiveUsNewInstancesForEachScenario() {
1717
ObjectFactory factory = new DefaultJavaObjectFactory();
18-
factory.addClass(SteDef.class);
18+
factory.addClass(StepDefinition.class);
1919

2020
// Scenario 1
2121
factory.start();
22-
SteDef o1 = factory.getInstance(SteDef.class);
22+
StepDefinition o1 = factory.getInstance(StepDefinition.class);
2323
factory.stop();
2424

2525
// Scenario 2
2626
factory.start();
27-
SteDef o2 = factory.getInstance(SteDef.class);
27+
StepDefinition o2 = factory.getInstance(StepDefinition.class);
2828
factory.stop();
2929

3030
assertAll("Checking SteDef",
@@ -34,7 +34,7 @@ public void shouldGiveUsNewInstancesForEachScenario() {
3434
);
3535
}
3636

37-
public static class SteDef {
37+
public static class StepDefinition {
3838
// we just test the instances
3939
}
4040

core/src/test/java/io/cucumber/core/feature/CucumberFeatureTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
import static org.mockito.Mockito.mock;
1717
import static org.mockito.Mockito.when;
1818

19-
public class CucumberFeatureTest {
19+
class CucumberFeatureTest {
2020

2121
@Test
22-
public void succeeds_if_no_features_are_found() {
22+
void succeeds_if_no_features_are_found() {
2323
URI featurePath = URI.create("does/not/exist");
2424
ResourceLoader resourceLoader = mock(ResourceLoader.class);
2525
when(resourceLoader.resources(featurePath, ".feature")).thenReturn(Collections.emptyList());
2626
new FeatureLoader(resourceLoader).load(singletonList(featurePath));
2727
}
2828

2929
@Test
30-
public void gives_error_message_if_path_does_not_exist() {
30+
void gives_error_message_if_path_does_not_exist() {
3131
URI featurePath = URI.create("path/bar.feature");
3232
ResourceLoader resourceLoader = mock(ResourceLoader.class);
3333
when(resourceLoader.resources(featurePath, ".feature")).thenThrow(new IllegalArgumentException("Not a file or directory: " + "path/bar.feature"));
@@ -39,7 +39,7 @@ public void gives_error_message_if_path_does_not_exist() {
3939
}
4040

4141
@Test
42-
public void gives_error_message_if_feature_on_class_path_does_not_exist() {
42+
void gives_error_message_if_feature_on_class_path_does_not_exist() {
4343
URI featurePath = URI.create("classpath:path/bar.feature");
4444
ResourceLoader resourceLoader = mock(ResourceLoader.class);
4545
when(resourceLoader.resources(featurePath, ".feature")).thenReturn(emptyList());

core/src/test/java/io/cucumber/core/feature/FeatureBuilderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import static org.mockito.Mockito.mock;
1717
import static org.mockito.Mockito.when;
1818

19-
public class FeatureBuilderTest {
19+
class FeatureBuilderTest {
2020

2121
@Test
22-
public void ignores_duplicate_features() throws IOException {
22+
void ignores_duplicate_features() throws IOException {
2323
FeatureBuilder builder = new FeatureBuilder();
2424
URI featurePath = URI.create("foo.feature");
2525
Resource resource1 = createResourceMock(featurePath);
@@ -34,7 +34,7 @@ public void ignores_duplicate_features() throws IOException {
3434
}
3535

3636
@Test
37-
public void works_when_path_and_uri_are_the_same() throws IOException {
37+
void works_when_path_and_uri_are_the_same() throws IOException {
3838
URI featurePath = URI.create("path/foo.feature");
3939
Resource resource = createResourceMock(featurePath);
4040
FeatureBuilder builder = new FeatureBuilder();

core/src/test/java/io/cucumber/core/feature/FeatureIdentifierTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import static org.junit.jupiter.api.Assertions.assertAll;
1212
import static org.junit.jupiter.api.Assertions.assertThrows;
1313

14-
public class FeatureIdentifierTest {
14+
class FeatureIdentifierTest {
1515

1616
@Test
17-
public void can_parse_feature_path_with_feature() {
17+
void can_parse_feature_path_with_feature() {
1818
URI uri = FeatureIdentifier.parse(FeaturePath.parse("classpath:/path/to/file.feature"));
1919

2020
assertAll("Checking uri",
@@ -24,7 +24,7 @@ public void can_parse_feature_path_with_feature() {
2424
}
2525

2626
@Test
27-
public void reject_feature_with_lines() {
27+
void reject_feature_with_lines() {
2828
Executable testMethod = () -> FeatureIdentifier.parse(URI.create("classpath:/path/to/file.feature:10:40"));
2929
IllegalArgumentException actualThrown = assertThrows(IllegalArgumentException.class, testMethod);
3030
assertThat("Unexpected exception message", actualThrown.getMessage(), is(equalTo(
@@ -33,7 +33,7 @@ public void reject_feature_with_lines() {
3333
}
3434

3535
@Test
36-
public void reject_directory_form() {
36+
void reject_directory_form() {
3737
Executable testMethod = () -> FeatureIdentifier.parse(URI.create("classpath:/path/to"));
3838
IllegalArgumentException actualThrown = assertThrows(IllegalArgumentException.class, testMethod);
3939
assertThat("Unexpected exception message", actualThrown.getMessage(), is(equalTo(

core/src/test/java/io/cucumber/core/feature/FeatureWithLinesTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
import static org.hamcrest.core.IsEqual.equalTo;
1212
import static org.junit.jupiter.api.Assertions.assertAll;
1313

14-
public class FeatureWithLinesTest {
14+
class FeatureWithLinesTest {
1515

1616
@Test
17-
public void should_create_FileWithFilters_with_no_lines() {
17+
void should_create_FileWithFilters_with_no_lines() {
1818
FeatureWithLines featureWithLines = FeatureWithLines.parse("foo.feature");
1919

2020
assertAll("Checking FeatureWithLines",
@@ -24,7 +24,7 @@ public void should_create_FileWithFilters_with_no_lines() {
2424
}
2525

2626
@Test
27-
public void should_create_FileWithFilters_with_1_line() {
27+
void should_create_FileWithFilters_with_1_line() {
2828
FeatureWithLines featureWithLines = FeatureWithLines.parse("foo.feature:999");
2929

3030
assertAll("Checking FeatureWithLines",
@@ -34,7 +34,7 @@ public void should_create_FileWithFilters_with_1_line() {
3434
}
3535

3636
@Test
37-
public void should_create_FileWithFilters_with_2_lines() {
37+
void should_create_FileWithFilters_with_2_lines() {
3838
FeatureWithLines featureWithLines = FeatureWithLines.parse("foo.feature:999:2000");
3939

4040
assertAll("Checking FeatureWithLines",

core/src/test/java/io/cucumber/core/io/DelegatingResourceIteratorFactoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import static org.hamcrest.core.Is.isA;
1010
import static org.junit.jupiter.api.Assertions.assertTrue;
1111

12-
public class DelegatingResourceIteratorFactoryTest {
12+
class DelegatingResourceIteratorFactoryTest {
1313

1414
@Test
15-
public void should_load_test_resource_iterator() {
15+
void should_load_test_resource_iterator() {
1616
ResourceIteratorFactory factory =
1717
new DelegatingResourceIteratorFactory(new ZipThenFileResourceIteratorFactory());
1818
URI url = URI.create(TestResourceIteratorFactory.TEST_URL);

core/src/test/java/io/cucumber/core/io/FileResourceTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import static org.hamcrest.core.IsEqual.equalTo;
1111
import static org.junit.jupiter.api.Assertions.assertAll;
1212

13-
public class FileResourceTest {
13+
class FileResourceTest {
1414

1515
@Test
16-
public void for_classpath_files_get_path_should_return_relative_path_from_classpath_root() {
16+
void for_classpath_files_get_path_should_return_relative_path_from_classpath_root() {
1717
FileResource toTest1 = FileResource.createClasspathFileResource(new File("/testPath"), new File("/testPath/test1/test.feature"));
1818
FileResource toTest2 = FileResource.createClasspathFileResource(new File("testPath"), new File("testPath/test1/test.feature"));
1919

@@ -24,7 +24,7 @@ public void for_classpath_files_get_path_should_return_relative_path_from_classp
2424
}
2525

2626
@Test
27-
public void for_filesystem_files_get_path_should_return_the_path() {
27+
void for_filesystem_files_get_path_should_return_the_path() {
2828
// setup
2929
FileResource toTest1 = FileResource.createFileResource(new File("test1"), new File("test1/test.feature"));
3030
FileResource toTest2 = FileResource.createFileResource(new File("test1/test.feature"), new File("test1/test.feature"));

core/src/test/java/io/cucumber/core/io/FlatteningIteratorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import static org.junit.jupiter.api.Assertions.assertFalse;
1717
import static org.junit.jupiter.api.Assertions.assertThrows;
1818

19-
public class FlatteningIteratorTest {
19+
class FlatteningIteratorTest {
2020

2121
@Test
22-
public void flattens_iterators() {
22+
void flattens_iterators() {
2323
final FlatteningIterator<Integer> fi = new FlatteningIterator<>();
2424
fi.push(asList(3, 4).iterator());
2525
fi.push(asList(1, 2).iterator());

core/src/test/java/io/cucumber/core/io/HelpersTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import static org.hamcrest.core.IsEqual.equalTo;
1111
import static org.junit.jupiter.api.Assertions.assertAll;
1212

13-
public class HelpersTest {
13+
class HelpersTest {
1414

1515
@Test
16-
public void computes_file_path_for_jar_protocols() {
16+
void computes_file_path_for_jar_protocols() {
1717

1818
assertAll("Checking Helpers.jarFilePath",
1919
() -> assertThat(jarFilePath(URI.create("jar:file:foo%20bar+zap/cucumber-core.jar!/cucumber/runtime/io")).getSchemeSpecificPart(), is(equalTo("foo bar+zap/cucumber-core.jar"))),

core/src/test/java/io/cucumber/core/io/ZipResourceIteratorFactoryTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import static org.junit.jupiter.api.Assertions.assertTrue;
1010

1111
// https://github.com/cucumber/cucumber-jvm/issues/808
12-
public class ZipResourceIteratorFactoryTest {
12+
class ZipResourceIteratorFactoryTest {
1313

1414
@Test
15-
public void is_factory_for_jar_protocols() {
15+
void is_factory_for_jar_protocols() {
1616
ZipResourceIteratorFactory factory = new ZipResourceIteratorFactory();
1717

1818
assertAll("Checking ZipResourceIteratorFactory",

core/src/test/java/io/cucumber/core/logging/LoggerFactoryTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected boolean matchesSafely(LogRecord logRecord, Description description) {
5050
}
5151

5252
@BeforeEach
53-
public void setup() {
53+
void setup() {
5454
Handler handler = new Handler() {
5555
@Override
5656
public void publish(LogRecord record) {
@@ -77,31 +77,31 @@ public void close() throws SecurityException {
7777
}
7878

7979
@Test
80-
public void error() {
80+
void error() {
8181
logger.error("Error");
8282
assertThat(logged, logRecord("Error", Level.SEVERE, null));
8383
logger.error("Error", exception);
8484
assertThat(logged, logRecord("Error", Level.SEVERE, exception));
8585
}
8686

8787
@Test
88-
public void warn() {
88+
void warn() {
8989
logger.warn("Warn");
9090
assertThat(logged, logRecord("Warn", Level.WARNING, null));
9191
logger.warn("Warn", exception);
9292
assertThat(logged, logRecord("Warn", Level.WARNING, exception));
9393
}
9494

9595
@Test
96-
public void info() {
96+
void info() {
9797
logger.info("Info");
9898
assertThat(logged, logRecord("Info", Level.INFO, null));
9999
logger.info("Info", exception);
100100
assertThat(logged, logRecord("Info", Level.INFO, exception));
101101
}
102102

103103
@Test
104-
public void config() {
104+
void config() {
105105
logger.config("Config");
106106
assertThat(logged, logRecord("Config", Level.CONFIG, null));
107107
logger.config("Config", exception);
@@ -110,15 +110,15 @@ public void config() {
110110

111111

112112
@Test
113-
public void debug() {
113+
void debug() {
114114
logger.debug("Debug");
115115
assertThat(logged, logRecord("Debug", Level.FINE, null));
116116
logger.debug("Debug", exception);
117117
assertThat(logged, logRecord("Debug", Level.FINE, exception));
118118
}
119119

120120
@Test
121-
public void trace() {
121+
void trace() {
122122
logger.trace("Trace");
123123
assertThat(logged, logRecord("Trace", Level.FINER, null));
124124
logger.trace("Trace", exception);

0 commit comments

Comments
 (0)