Fixes #370 - Removed unnecessary public modifiers from tests classes/methods

khmarbaise · khmarbaise · commit 0fbb00f8e4f2 · 2025-08-13T19:51:52.000+02:00
diff --git a/src/test/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategyTest.java b/src/test/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategyTest.java
@@ -103,7 +103,7 @@ void testBasicParamsMatching() {
                             ? Paths.get("c:\\a\\b\\c").toFile()
                             : Paths.get("/a/b/c").toFile(),
                     Paths.get(windows ? "..\\d\\e" : "../d/e"),
-                    Arrays.<String>asList("a", "b", "c"),
+                    Arrays.asList("a", "b", "c"),
                     new String[] {"c", "d", "e"});
 
             assertTrue(strategy.isParamsMatched(projectMock, executionMock, testMojo, cacheRecordMock));
diff --git a/src/test/java/org/apache/maven/buildcache/BuildInfoTest.java b/src/test/java/org/apache/maven/buildcache/BuildInfoTest.java
@@ -41,10 +41,10 @@
 import org.apache.maven.buildcache.xml.build.PropertyValue;
 import org.junit.jupiter.api.Test;
 
-public class BuildInfoTest {
+class BuildInfoTest {
 
     @Test
-    public void name() throws Exception {
+    void name() throws Exception {
 
         XmlService xmlService = new XmlService();
 
diff --git a/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java b/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java
@@ -37,7 +37,7 @@
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
-public class InputExclusionTest {
+class InputExclusionTest {
 
     @TempDir
     private Path testFolder;
@@ -47,7 +47,7 @@ public class InputExclusionTest {
      * @throws IOException
      */
     @Test
-    public void exclusionByFolder() throws IOException {
+    void exclusionByFolder() throws IOException {
         FsTree fsTree = createFsTree();
 
         // Exclude folder 1 + everything inside based on the starting path
@@ -85,7 +85,7 @@ public void exclusionByFolder() throws IOException {
      * @throws IOException
      */
     @Test
-    public void exclusionByFileExtension() throws IOException {
+    void exclusionByFileExtension() throws IOException {
         FsTree fsTree = createFsTree();
 
         // Excludes all json files
@@ -117,7 +117,7 @@ public void exclusionByFileExtension() throws IOException {
      * @throws IOException
      */
     @Test
-    public void exclusionOfOneSpecificFile() throws IOException {
+    void exclusionOfOneSpecificFile() throws IOException {
         FsTree fsTree = createFsTree();
 
         // Exclude the json file in subfolder 1
@@ -174,7 +174,7 @@ public void exclusionOfOneSpecificFile() throws IOException {
      * @throws IOException
      */
     @Test
-    public void exclusionOfOneSpecificFileWindowsStyle() throws IOException {
+    void exclusionOfOneSpecificFileWindowsStyle() throws IOException {
         FsTree fsTree = createFsTree();
 
         // Exclude the json file in subfolder 1
@@ -232,7 +232,7 @@ public void exclusionOfOneSpecificFileWindowsStyle() throws IOException {
      * @throws IOException
      */
     @Test
-    public void exclusionByPatternInFilename() throws IOException {
+    void exclusionByPatternInFilename() throws IOException {
         FsTree fsTree = createFsTree();
 
         // Excludes all files containing the string "my-f" in their filename
@@ -275,7 +275,7 @@ public void exclusionByPatternInFilename() throws IOException {
      * @throws IOException
      */
     @Test
-    public void exclusionViaProjectProperties() throws IOException {
+    void exclusionViaProjectProperties() throws IOException {
         FsTree fsTree = createFsTree();
 
         MavenProject mavenProject = Mockito.mock(MavenProject.class);
@@ -348,8 +348,7 @@ private ExclusionResolver createExclusionResolver(MavenProject mavenProject) {
 
         CacheConfig cacheConfig = Mockito.mock(CacheConfig.class);
         Mockito.when(cacheConfig.getGlobalExcludePaths()).thenReturn(new ArrayList<>());
-        ExclusionResolver resolver = new ExclusionResolver(mavenProject, cacheConfig);
-        return resolver;
+        return new ExclusionResolver(mavenProject, cacheConfig);
     }
 
     private ExclusionResolver createExclusionResolver(
@@ -375,8 +374,7 @@ private ExclusionResolver createExclusionResolver(
 
         CacheConfig cacheConfig = Mockito.mock(CacheConfig.class);
         Mockito.when(cacheConfig.getGlobalExcludePaths()).thenReturn(Arrays.asList(exclude));
-        ExclusionResolver resolver = new ExclusionResolver(mavenProject, cacheConfig);
-        return resolver;
+        return new ExclusionResolver(mavenProject, cacheConfig);
     }
 
     /**
diff --git a/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java b/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java
@@ -45,12 +45,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class MavenProjectInputTest {
+class MavenProjectInputTest {
 
     private static final String DEFAULT_GLOB = "*";
 
     @Test
-    public void testCollectFilteredFiles() {
+    void testCollectFilteredFiles() {
         List<Path> collectedFiles = new ArrayList<>();
         MavenProjectInput.walkDirectoryFiles(
                 Paths.get("src/test/resources/test-folder"), collectedFiles, DEFAULT_GLOB, it -> it.getFileName()
@@ -60,7 +60,7 @@ public void testCollectFilteredFiles() {
     }
 
     @Test
-    public void testCollectNonFilteredFiles() {
+    void testCollectNonFilteredFiles() {
         List<Path> collectedFiles = new ArrayList<>();
         MavenProjectInput.walkDirectoryFiles(
                 Paths.get("src/test/resources/test-folder"), collectedFiles, DEFAULT_GLOB, it -> false);
diff --git a/src/test/java/org/apache/maven/buildcache/checksum/SHAHashTest.java b/src/test/java/org/apache/maven/buildcache/checksum/SHAHashTest.java
@@ -45,7 +45,7 @@
 import static org.apache.maven.buildcache.hash.HashFactory.SHA256;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class SHAHashTest {
+class SHAHashTest {
 
     private static final byte[] HELLO_ARRAY = "hello".getBytes(StandardCharsets.UTF_8);
     private static final byte[] WORLD_ARRAY = "world".getBytes(StandardCharsets.UTF_8);
@@ -60,14 +60,14 @@ public class SHAHashTest {
     private static final HashChecksum CHECKSUM = SHA256.createChecksum(0);
 
     @Test
-    public void testEmptyArray() {
+    void testEmptyArray() {
         byte[] emptyArray = new byte[0];
         String hash = ALGORITHM.hash(emptyArray);
         assertEquals(EMPTY_HASH, hash);
     }
 
     @Test
-    public void testSimpleHash() {
+    void testSimpleHash() {
         String helloHash = ALGORITHM.hash(HELLO_ARRAY);
         assertEquals(HELLO_HASH, helloHash);
 
@@ -76,7 +76,7 @@ public void testSimpleHash() {
     }
 
     @Test
-    public void testSimpleChecksum() {
+    void testSimpleChecksum() {
         assertEquals(HELLO_HASH, CHECKSUM.update(HELLO_ARRAY));
         assertEquals(HELLO_CHECKSUM, CHECKSUM.digest());
 
diff --git a/src/test/java/org/apache/maven/buildcache/checksum/XXHashTest.java b/src/test/java/org/apache/maven/buildcache/checksum/XXHashTest.java
@@ -47,7 +47,7 @@
 import static org.apache.maven.buildcache.hash.HashFactory.XXMM;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class XXHashTest {
+class XXHashTest {
 
     private static final byte[] HELLO_ARRAY = "hello".getBytes(StandardCharsets.UTF_8);
     private static final byte[] WORLD_ARRAY = "world".getBytes(StandardCharsets.UTF_8);
@@ -63,14 +63,14 @@ public class XXHashTest {
     private static final HashAlgorithm ALGORITHM = XX.createAlgorithm();
 
     @Test
-    public void testEmptyArray() {
+    void testEmptyArray() {
         byte[] emptyArray = new byte[0];
         String hash = ALGORITHM.hash(emptyArray);
         assertEquals(EMPTY_HASH, hash);
     }
 
     @Test
-    public void testSimpleHash() {
+    void testSimpleHash() {
         String helloHash = ALGORITHM.hash(HELLO_ARRAY);
         assertEquals(HELLO_HASH, helloHash);
 
@@ -79,7 +79,7 @@ public void testSimpleHash() {
     }
 
     @Test
-    public void testSimpleChecksum() {
+    void testSimpleChecksum() {
         String helloChecksum = ALGORITHM.hash(longToBytes(1, HELLO_LONG));
         assertEquals(HELLO_CHECKSUM, helloChecksum);
 
@@ -91,31 +91,31 @@ public void testSimpleChecksum() {
     }
 
     @Test
-    public void testEmptyBuffer() {
+    void testEmptyBuffer() {
         assertEmptyBuffer(XX.createChecksum(0));
         assertEmptyBuffer(XXMM.createChecksum(0));
     }
 
     @Test
-    public void testSingleHash() {
+    void testSingleHash() {
         assertSingleHash(XX.createChecksum(1));
         assertSingleHash(XXMM.createChecksum(1));
     }
 
     @Test
-    public void testSingleChecksum() {
+    void testSingleChecksum() {
         assertSingleChecksum(XX.createChecksum(1));
         assertSingleChecksum(XXMM.createChecksum(1));
     }
 
     @Test
-    public void testNotFullChecksum() {
+    void testNotFullChecksum() {
         assertSingleChecksum(XX.createChecksum(2));
         assertSingleChecksum(XXMM.createChecksum(2));
     }
 
     @Test
-    public void testFullChecksum() {
+    void testFullChecksum() {
         assertFullChecksum(XX.createChecksum(2));
         assertFullChecksum(XXMM.createChecksum(2));
     }
diff --git a/src/test/java/org/apache/maven/buildcache/hash/HexUtilsTest.java b/src/test/java/org/apache/maven/buildcache/hash/HexUtilsTest.java
@@ -23,10 +23,10 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class HexUtilsTest {
+class HexUtilsTest {
 
     @Test
-    public void testEncodeToHex() {
+    void testEncodeToHex() {
         // array length = 8 left padded with zeroes
         assertEquals("0000000000000000", HexUtils.encode(new byte[8]));
         assertEquals("00", HexUtils.encode(new byte[1]));
@@ -39,7 +39,7 @@ public void testEncodeToHex() {
     }
 
     @Test
-    public void testDecodeHex() {
+    void testDecodeHex() {
         assertArrayEquals(new byte[] {0}, HexUtils.decode("00"));
         assertArrayEquals(new byte[] {10}, HexUtils.decode("0a"));
         assertArrayEquals(new byte[] {10}, HexUtils.decode("0A"));
diff --git a/src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java b/src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java
@@ -33,7 +33,7 @@
 import static org.apache.maven.buildcache.xml.CacheConfigImpl.SKIP_SAVE;
 
 @IntegrationTest("src/test/projects/build-extension")
-public class BuildExtensionTest {
+class BuildExtensionTest {
 
     private static final String PROJECT_NAME = "org.apache.maven.caching.test.simple:simple";
 
diff --git a/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java b/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java
@@ -24,7 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 @IntegrationTest("src/test/projects/core-extension")
-public class CoreExtensionTest {
+class CoreExtensionTest {
 
     private static final String PROJECT_NAME = "org.apache.maven.caching.test.simple:simple";
 
diff --git a/src/test/java/org/apache/maven/buildcache/its/DuplicateGoalsTest.java b/src/test/java/org/apache/maven/buildcache/its/DuplicateGoalsTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 @IntegrationTest("src/test/projects/duplicate-goals")
-public class DuplicateGoalsTest {
+class DuplicateGoalsTest {
 
     private static final String PROJECT_NAME = "org.apache.maven.caching.test.goals:duplicate";
 
diff --git a/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionCoreExtensionTest.java b/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionCoreExtensionTest.java
@@ -39,7 +39,7 @@
  * The test checks that extensions receives expected events for forked executions and completes build successfully
  */
 @IntegrationTest("src/test/projects/forked-executions-core-extension")
-public class ForkedExecutionCoreExtensionTest {
+class ForkedExecutionCoreExtensionTest {
 
     private static final String PROJECT_NAME = "org.apache.maven.caching.test.simple:forked-executions-core-extension";
     private Path tempDirectory;
diff --git a/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionsTest.java b/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionsTest.java
@@ -49,9 +49,7 @@
  * Verifies MBUILDCACHE-25 - build cache calculated and saved exactly once in presence of forked executions
  */
 @IntegrationTest("src/test/projects/forked-executions-core-extension-remote")
-public class ForkedExecutionsTest {
-
-    private static final String PROJECT_NAME = "org.apache.maven.caching.test.simple:forked-executions-core-extension";
+class ForkedExecutionsTest {
 
     @RegisterExtension
     static WireMockExtension wm = WireMockExtension.newInstance()
diff --git a/src/test/java/org/apache/maven/buildcache/its/IncludeExcludeTest.java b/src/test/java/org/apache/maven/buildcache/its/IncludeExcludeTest.java
@@ -30,7 +30,7 @@
 import org.junit.jupiter.api.Test;
 
 @IntegrationTest("src/test/projects/include-exclude")
-public class IncludeExcludeTest {
+class IncludeExcludeTest {
 
     private static final Pattern NB_SRC_PATTERN = Pattern.compile("^(.*Found )([0-9]*)( input files.*)");
 
diff --git a/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java b/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java
@@ -37,7 +37,7 @@
  * so that the cached executions are not run again for builds with a higher goal.
  */
 @IntegrationTest("src/test/projects/mbuildcache-incremental")
-public class IncrementalRestoreTest {
+class IncrementalRestoreTest {
 
     public static final String SAVED_BUILD_TO_LOCAL_FILE = "Saved Build to local file: ";
     public static final String GENERATED_JAR = "target/mbuildcache-incremental-final.jar";
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue115Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue115Test.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 @IntegrationTest("src/test/projects/mbuildcache-115")
-public class Issue115Test {
+class Issue115Test {
 
     private static final String PROJECT_NAME = "org.apache.maven.caching.test:mbuildcache-115";
     private static final String RESTORED_MESSAGE = "Found cached build, restoring " + PROJECT_NAME + " from cache";
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue21Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue21Test.java
@@ -24,7 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 @IntegrationTest("src/test/projects/mbuildcache-21")
-public class Issue21Test {
+class Issue21Test {
 
     @Test
     void simple(Verifier verifier) throws VerificationException {
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue56Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue56Test.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 @IntegrationTest("src/test/projects/mbuildcache-56-mojo-parameter-as-method")
-public class Issue56Test {
+class Issue56Test {
 
     @Test
     void simple(Verifier verifier) throws VerificationException, IOException {
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue67Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue67Test.java
@@ -35,10 +35,10 @@
  * Check if a restoration error is handled properly = the build should be executed "normally", like if there is no cache.
  */
 @IntegrationTest("src/test/projects/mbuildcache-67")
-public class Issue67Test {
+class Issue67Test {
 
-    public static final String SAVED_BUILD_TO_LOCAL_FILE = "Saved Build to local file: ";
-    public static final String GENERATED_JAR = "target/mbuildcache-67-0.0.1-SNAPSHOT.jar";
+    private static final String SAVED_BUILD_TO_LOCAL_FILE = "Saved Build to local file: ";
+    private static final String GENERATED_JAR = "target/mbuildcache-67-0.0.1-SNAPSHOT.jar";
 
     @Test
     void simple(Verifier verifier) throws VerificationException, IOException {
@@ -88,10 +88,9 @@ void simple(Verifier verifier) throws VerificationException, IOException {
     private static String findFirstLineContainingTextsInLogs(final Verifier verifier, final String... texts)
             throws VerificationException {
         List<String> lines = verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false);
-        Iterator it = lines.iterator();
 
-        while (it.hasNext()) {
-            String line = verifier.stripAnsi((String) it.next());
+        for (String s : lines) {
+            String line = Verifier.stripAnsi(s);
             boolean matches = true;
             Iterator<String> toMatchIterator = Arrays.stream(texts).iterator();
             while (matches && toMatchIterator.hasNext()) {
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java
@@ -39,7 +39,7 @@
  * which don't contain a package phase.
  */
 @IntegrationTest("src/test/projects/mbuildcache-74-clean-cache-any-artifact")
-public class Issue74Test {
+class Issue74Test {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Issue74Test.class);
 
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java
@@ -24,7 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 @IntegrationTest("src/test/projects/mbuildcache-76")
-public class Issue76Test {
+class Issue76Test {
 
     private static final String PROJECT_NAME = "org.apache.maven.caching.test:mbuildcache-76";
 
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue87Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue87Test.java
diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue99Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue99Test.java
diff --git a/src/test/java/org/apache/maven/buildcache/its/MandatoryCleanTest.java b/src/test/java/org/apache/maven/buildcache/its/MandatoryCleanTest.java
diff --git a/src/test/java/org/apache/maven/buildcache/its/PerModuleFlagsTest.java b/src/test/java/org/apache/maven/buildcache/its/PerModuleFlagsTest.java
diff --git a/src/test/java/org/apache/maven/buildcache/xml/CacheConfigImplTest.java b/src/test/java/org/apache/maven/buildcache/xml/CacheConfigImplTest.java
diff --git a/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java b/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java
