diff --git a/src/test/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategyTest.java b/src/test/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategyTest.java index 976a3f2a..6e5537dd 100644 --- a/src/test/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategyTest.java +++ b/src/test/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategyTest.java @@ -72,7 +72,7 @@ void setUp() { } @Test - void testBasicParamsMatching() { + void basicParamsMatching() { boolean windows = SystemUtils.IS_OS_WINDOWS; @@ -110,7 +110,7 @@ void testBasicParamsMatching() { } @Test - void testSkipValue() { + void skipValue() { String propertyName = "anyObject"; @@ -139,7 +139,7 @@ void testSkipValue() { } @Test - void testDefaultValue() { + void defaultValue() { String propertyName = "anyObject"; @@ -167,7 +167,7 @@ void testDefaultValue() { } @Test - void testMismatch() { + void mismatch() { String propertyName = "anyObject"; diff --git a/src/test/java/org/apache/maven/buildcache/CacheUtilsPermissionsTest.java b/src/test/java/org/apache/maven/buildcache/CacheUtilsPermissionsTest.java index 4f0d0eec..29421c35 100644 --- a/src/test/java/org/apache/maven/buildcache/CacheUtilsPermissionsTest.java +++ b/src/test/java/org/apache/maven/buildcache/CacheUtilsPermissionsTest.java @@ -50,7 +50,7 @@ class CacheUtilsPermissionsTest { * cache correctness similar to how Git includes file mode in tree hashes. */ @Test - void testPermissionsAffectFileHashWhenEnabled() throws IOException { + void permissionsAffectFileHashWhenEnabled() throws Exception { // Skip test on non-POSIX filesystems (e.g., Windows) if (!tempDir.getFileSystem().supportedFileAttributeViews().contains("posix")) { return; @@ -100,7 +100,7 @@ void testPermissionsAffectFileHashWhenEnabled() throws IOException { * the key point is that permission information is NOT deterministically stored. */ @Test - void testPermissionsDoNotAffectHashWhenDisabled() throws IOException { + void permissionsDoNotAffectHashWhenDisabled() throws Exception { // Skip test on non-POSIX filesystems (e.g., Windows) if (!tempDir.getFileSystem().supportedFileAttributeViews().contains("posix")) { return; diff --git a/src/test/java/org/apache/maven/buildcache/LifecyclePhasesHelperTest.java b/src/test/java/org/apache/maven/buildcache/LifecyclePhasesHelperTest.java index 17e63c6e..c24803df 100644 --- a/src/test/java/org/apache/maven/buildcache/LifecyclePhasesHelperTest.java +++ b/src/test/java/org/apache/maven/buildcache/LifecyclePhasesHelperTest.java @@ -158,17 +158,14 @@ void isLaterPhase() { assertFalse(lifecyclePhasesHelper.isLaterPhase("test", "site")); assertFalse(lifecyclePhasesHelper.isLaterPhase("clean", "site")); - assertThrows(IllegalArgumentException.class, () -> { - lifecyclePhasesHelper.isLaterPhase("install", null); - }); + assertThrows(IllegalArgumentException.class, () -> + lifecyclePhasesHelper.isLaterPhase("install", null)); - assertThrows(IllegalArgumentException.class, () -> { - lifecyclePhasesHelper.isLaterPhase("install", "unknown phase"); - }); + assertThrows(IllegalArgumentException.class, () -> + lifecyclePhasesHelper.isLaterPhase("install", "unknown phase")); - assertThrows(IllegalArgumentException.class, () -> { - lifecyclePhasesHelper.isLaterPhase("unknown phase", "install"); - }); + assertThrows(IllegalArgumentException.class, () -> + lifecyclePhasesHelper.isLaterPhase("unknown phase", "install")); } @Test @@ -225,7 +222,7 @@ void getCleanSegmentForkedAnyLifecyclePhase() { } @Test - void testCachedSegment() { + void cachedSegment() { MojoExecution compile = mockedMojoExecution("compile"); MojoExecution test = mockedMojoExecution("test"); List mojoExecutions = Arrays.asList(compile, test, mockedMojoExecution("install")); @@ -239,7 +236,7 @@ void testCachedSegment() { } @Test - void testEmptyCachedSegment() { + void emptyCachedSegment() { MojoExecution compile = mockedMojoExecution("compile"); MojoExecution test = mockedMojoExecution("test"); MojoExecution install = mockedMojoExecution("install"); @@ -254,7 +251,7 @@ void testEmptyCachedSegment() { } @Test - void testCachedSegmentForked() { + void cachedSegmentForked() { MojoExecution me1 = mockedMojoExecution(null); MojoExecution me2 = mockedMojoExecution(null); @@ -273,7 +270,7 @@ void testCachedSegmentForked() { @ParameterizedTest @ValueSource(strings = {"install", "site"}) - void testAllInCachedSegment() { + void allInCachedSegment() { MojoExecution compile = mockedMojoExecution("compile"); MojoExecution test = mockedMojoExecution("test"); MojoExecution install = mockedMojoExecution("install"); @@ -288,7 +285,7 @@ void testAllInCachedSegment() { } @Test - void testPostCachedSegment() { + void postCachedSegment() { MojoExecution compile = mockedMojoExecution("compile"); MojoExecution test = mockedMojoExecution("test"); MojoExecution install = mockedMojoExecution("install"); @@ -304,7 +301,7 @@ void testPostCachedSegment() { } @Test - void testAllPostCachedSegment() { + void allPostCachedSegment() { MojoExecution compile = mockedMojoExecution("compile"); MojoExecution test = mockedMojoExecution("test"); MojoExecution install = mockedMojoExecution("install"); @@ -320,7 +317,7 @@ void testAllPostCachedSegment() { } @Test - void testPostCachedSegmentForked() { + void postCachedSegmentForked() { MojoExecution me1 = mockedMojoExecution(null); MojoExecution me2 = mockedMojoExecution(null); @@ -340,7 +337,7 @@ void testPostCachedSegmentForked() { @ParameterizedTest @ValueSource(strings = {"install", "site"}) - void testEmptyPostCachedSegmentInclusive() { + void emptyPostCachedSegmentInclusive() { MojoExecution compile = mockedMojoExecution("compile"); MojoExecution test = mockedMojoExecution("test"); MojoExecution install = mockedMojoExecution("install"); diff --git a/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java b/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java index 96ae86c5..4eb5fd14 100644 --- a/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java +++ b/src/test/java/org/apache/maven/buildcache/checksum/InputExclusionTest.java @@ -32,11 +32,13 @@ import org.apache.maven.buildcache.xml.config.Exclude; import org.apache.maven.model.Build; import org.apache.maven.project.MavenProject; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + class InputExclusionTest { @TempDir @@ -47,37 +49,37 @@ class InputExclusionTest { * @throws IOException */ @Test - void exclusionByFolder() throws IOException { + void exclusionByFolder() throws Exception { FsTree fsTree = createFsTree(); // Exclude folder 1 + everything inside based on the starting path ExclusionResolver exclusionResolver = createExclusionResolver("folder1", "**", EntryType.ALL, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.folder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.folder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.folder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); // Exclude everything inside folder 1 based on the glob exclusionResolver = createExclusionResolver("", "folder1/**", EntryType.ALL, MatcherType.PATH); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.folder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.subFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.folder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); // Exclusion on folder exclusionResolver = createExclusionResolver("", "folder1", EntryType.DIRECTORY, MatcherType.PATH); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.folder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.folder1)); exclusionResolver = createExclusionResolver("", "folder1", EntryType.DIRECTORY, MatcherType.FILENAME); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.folder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.folder1)); exclusionResolver = createExclusionResolver("", "folder1", EntryType.FILE, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.folder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.folder1)); } /** @@ -85,31 +87,31 @@ void exclusionByFolder() throws IOException { * @throws IOException */ @Test - void exclusionByFileExtension() throws IOException { + void exclusionByFileExtension() throws Exception { FsTree fsTree = createFsTree(); // Excludes all json files ExclusionResolver exclusionResolver = createExclusionResolver("", "*.json", EntryType.FILE, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); // Excludes all json files under folder 1 exclusionResolver = createExclusionResolver("folder1", "*.json", EntryType.FILE, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); } /** @@ -117,56 +119,56 @@ void exclusionByFileExtension() throws IOException { * @throws IOException */ @Test - void exclusionOfOneSpecificFile() throws IOException { + void exclusionOfOneSpecificFile() throws Exception { FsTree fsTree = createFsTree(); // Exclude the json file in subfolder 1 ExclusionResolver exclusionResolver = createExclusionResolver( "folder1/subfolder1/other-file.json", "**", EntryType.ALL, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); // Exclude the json file in subfolder 1 by glob v1 exclusionResolver = createExclusionResolver("folder1/subfolder1", "other-file.json", EntryType.ALL, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); // Exclude the json file in subfolder 1 by glob v2 exclusionResolver = createExclusionResolver("", "folder1/subfolder1/other-file.json", EntryType.ALL, MatcherType.PATH); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); } /** @@ -174,57 +176,57 @@ void exclusionOfOneSpecificFile() throws IOException { * @throws IOException */ @Test - void exclusionOfOneSpecificFileWindowsStyle() throws IOException { + void exclusionOfOneSpecificFileWindowsStyle() throws Exception { FsTree fsTree = createFsTree(); // Exclude the json file in subfolder 1 ExclusionResolver exclusionResolver = createExclusionResolver( "folder1\\subfolder1\\other-file.json", "**", EntryType.ALL, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); // Exclude the json file in subfolder 1 by glob v1 exclusionResolver = createExclusionResolver("folder1\\subfolder1", "other-file.json", EntryType.ALL, MatcherType.FILENAME); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); // Exclude the json file in subfolder 1 by glob v2 (\ is a meta character in glob syntax + in java syntax, so we // need to double escape it) exclusionResolver = createExclusionResolver( "", "folder1\\\\subfolder1\\\\other-file.json", EntryType.ALL, MatcherType.PATH); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); } /** @@ -232,39 +234,39 @@ void exclusionOfOneSpecificFileWindowsStyle() throws IOException { * @throws IOException */ @Test - void exclusionByPatternInFilename() throws IOException { + void exclusionByPatternInFilename() throws Exception { FsTree fsTree = createFsTree(); // Excludes all files containing the string "my-f" in their filename ExclusionResolver exclusionResolver = createExclusionResolver("", "*my-f*", EntryType.ALL, MatcherType.FILENAME); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); // Excludes all files containing the string "my-f" in their path exclusionResolver = createExclusionResolver("", "**my-f*", EntryType.ALL, MatcherType.PATH); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); } /** @@ -275,7 +277,7 @@ void exclusionByPatternInFilename() throws IOException { * @throws IOException */ @Test - void exclusionViaProjectProperties() throws IOException { + void exclusionViaProjectProperties() throws Exception { FsTree fsTree = createFsTree(); MavenProject mavenProject = Mockito.mock(MavenProject.class); @@ -307,18 +309,18 @@ void exclusionViaProjectProperties() throws IOException { Mockito.when(mavenProject.getProperties()).thenReturn(properties); ExclusionResolver exclusionResolver = createExclusionResolver(mavenProject); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); - Assertions.assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); - Assertions.assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileRootFolder)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileRootFolder)); + assertTrue(exclusionResolver.excludesPath(fsTree.javaFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileSubFolder1)); + assertTrue(exclusionResolver.excludesPath(fsTree.jsonFileSubFolder1)); + assertFalse(exclusionResolver.excludesPath(fsTree.javaFileFolder2)); + assertTrue(exclusionResolver.excludesPath(fsTree.txtFileFolder2)); + assertFalse(exclusionResolver.excludesPath(fsTree.jsonFileFolder2)); } private FsTree createFsTree() throws IOException { diff --git a/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputSnapshotResolutionTest.java b/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputSnapshotResolutionTest.java index b10d3a80..c895a4b8 100644 --- a/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputSnapshotResolutionTest.java +++ b/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputSnapshotResolutionTest.java @@ -143,7 +143,7 @@ void setUp() { } @Test - void testArtifactRequestWithRepositoriesSet() throws Exception { + void artifactRequestWithRepositoriesSet() throws Exception { // Given: A snapshot dependency and configured repositories Dependency dependency = new Dependency(); dependency.setGroupId("com.example"); @@ -212,7 +212,7 @@ void testArtifactRequestWithRepositoriesSet() throws Exception { } @Test - void testArtifactRequestWithoutRepositories() throws Exception { + void artifactRequestWithoutRepositories() throws Exception { // Given: A snapshot dependency with no remote repositories configured Dependency dependency = new Dependency(); dependency.setGroupId("com.example"); @@ -270,7 +270,7 @@ void testArtifactRequestWithoutRepositories() throws Exception { } @Test - void testArtifactRequestWithMultipleRepositories() throws Exception { + void artifactRequestWithMultipleRepositories() throws Exception { // Given: A snapshot dependency with multiple repositories configured Dependency dependency = new Dependency(); dependency.setGroupId("com.example"); diff --git a/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java b/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java index c24b7b05..9ff5fbfb 100644 --- a/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java +++ b/src/test/java/org/apache/maven/buildcache/checksum/MavenProjectInputTest.java @@ -50,7 +50,7 @@ class MavenProjectInputTest { private static final String DEFAULT_GLOB = "*"; @Test - void testCollectFilteredFiles() { + void collectFilteredFiles() { List collectedFiles = new ArrayList<>(); MavenProjectInput.walkDirectoryFiles( Paths.get("src/test/resources/test-folder"), collectedFiles, DEFAULT_GLOB, it -> it.getFileName() @@ -60,7 +60,7 @@ void testCollectFilteredFiles() { } @Test - void testCollectNonFilteredFiles() { + void collectNonFilteredFiles() { List 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 index 50c5bae1..ed749c0d 100644 --- a/src/test/java/org/apache/maven/buildcache/checksum/SHAHashTest.java +++ b/src/test/java/org/apache/maven/buildcache/checksum/SHAHashTest.java @@ -60,14 +60,14 @@ class SHAHashTest { private static final HashChecksum CHECKSUM = SHA256.createChecksum(0); @Test - void testEmptyArray() { + void emptyArray() { byte[] emptyArray = new byte[0]; String hash = ALGORITHM.hash(emptyArray); assertEquals(EMPTY_HASH, hash); } @Test - void testSimpleHash() { + void simpleHash() { String helloHash = ALGORITHM.hash(HELLO_ARRAY); assertEquals(HELLO_HASH, helloHash); @@ -76,7 +76,7 @@ void testSimpleHash() { } @Test - void testSimpleChecksum() { + void simpleChecksum() { 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 index 2ae33378..e3dc6137 100644 --- a/src/test/java/org/apache/maven/buildcache/checksum/XXHashTest.java +++ b/src/test/java/org/apache/maven/buildcache/checksum/XXHashTest.java @@ -63,14 +63,14 @@ class XXHashTest { private static final HashAlgorithm ALGORITHM = XX.createAlgorithm(); @Test - void testEmptyArray() { + void emptyArray() { byte[] emptyArray = new byte[0]; String hash = ALGORITHM.hash(emptyArray); assertEquals(EMPTY_HASH, hash); } @Test - void testSimpleHash() { + void simpleHash() { String helloHash = ALGORITHM.hash(HELLO_ARRAY); assertEquals(HELLO_HASH, helloHash); @@ -79,7 +79,7 @@ void testSimpleHash() { } @Test - void testSimpleChecksum() { + void simpleChecksum() { String helloChecksum = ALGORITHM.hash(longToBytes(1, HELLO_LONG)); assertEquals(HELLO_CHECKSUM, helloChecksum); @@ -91,31 +91,31 @@ void testSimpleChecksum() { } @Test - void testEmptyBuffer() { + void emptyBuffer() { assertEmptyBuffer(XX.createChecksum(0)); assertEmptyBuffer(XXMM.createChecksum(0)); } @Test - void testSingleHash() { + void singleHash() { assertSingleHash(XX.createChecksum(1)); assertSingleHash(XXMM.createChecksum(1)); } @Test - void testSingleChecksum() { + void singleChecksum() { assertSingleChecksum(XX.createChecksum(1)); assertSingleChecksum(XXMM.createChecksum(1)); } @Test - void testNotFullChecksum() { + void notFullChecksum() { assertSingleChecksum(XX.createChecksum(2)); assertSingleChecksum(XXMM.createChecksum(2)); } @Test - void testFullChecksum() { + void fullChecksum() { 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 index 9d9b6d2f..886d7a1f 100644 --- a/src/test/java/org/apache/maven/buildcache/hash/HexUtilsTest.java +++ b/src/test/java/org/apache/maven/buildcache/hash/HexUtilsTest.java @@ -26,7 +26,7 @@ class HexUtilsTest { @Test - void testEncodeToHex() { + void encodeToHex() { // 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 @@ void testEncodeToHex() { } @Test - void testDecodeHex() { + void decodeHex() { 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 index 382ba76a..56621e0c 100644 --- a/src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/BuildExtensionTest.java @@ -18,19 +18,18 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import org.apache.maven.buildcache.its.junit.IntegrationTest; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.apache.maven.buildcache.util.LogFileUtils.findFirstLineContainingTextsInLogs; import static org.apache.maven.buildcache.xml.CacheConfigImpl.CACHE_LOCATION_PROPERTY_NAME; import static org.apache.maven.buildcache.xml.CacheConfigImpl.SKIP_SAVE; +import static org.junit.jupiter.api.Assertions.assertNull; @IntegrationTest("src/test/projects/build-extension") class BuildExtensionTest { @@ -38,7 +37,7 @@ class BuildExtensionTest { private static final String PROJECT_NAME = "org.apache.maven.caching.test.simple:simple"; @Test - void simple(Verifier verifier) throws VerificationException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log-1.txt"); @@ -52,7 +51,7 @@ void simple(Verifier verifier) throws VerificationException { } @Test - void skipSaving(Verifier verifier) throws VerificationException, IOException { + void skipSaving(Verifier verifier) throws Exception { verifier.setAutoclean(false); Path tempDirectory = Files.createTempDirectory("skip-saving-test"); verifier.getCliOptions().clear(); @@ -72,6 +71,6 @@ void skipSaving(Verifier verifier) throws VerificationException, IOException { } private static void verifyNoTextInLog(Verifier verifier, String text) throws VerificationException { - Assertions.assertNull(findFirstLineContainingTextsInLogs(verifier, text)); + assertNull(findFirstLineContainingTextsInLogs(verifier, text)); } } diff --git a/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java b/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java index fb1d082a..d2b76f9d 100644 --- a/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/CoreExtensionTest.java @@ -19,7 +19,6 @@ package org.apache.maven.buildcache.its; import org.apache.maven.buildcache.its.junit.IntegrationTest; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.jupiter.api.Test; @@ -29,7 +28,7 @@ class CoreExtensionTest { private static final String PROJECT_NAME = "org.apache.maven.caching.test.simple:simple"; @Test - void simple(Verifier verifier) throws VerificationException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log-1.txt"); @@ -43,7 +42,7 @@ void simple(Verifier verifier) throws VerificationException { } @Test - void simpleBuildChangeVersionReuseBuildCache(Verifier verifier) throws VerificationException { + void simpleBuildChangeVersionReuseBuildCache(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log-1.txt"); diff --git a/src/test/java/org/apache/maven/buildcache/its/DuplicateGoalsTest.java b/src/test/java/org/apache/maven/buildcache/its/DuplicateGoalsTest.java index 3b2ae701..8417762e 100644 --- a/src/test/java/org/apache/maven/buildcache/its/DuplicateGoalsTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/DuplicateGoalsTest.java @@ -21,7 +21,6 @@ import java.util.Arrays; import org.apache.maven.buildcache.its.junit.IntegrationTest; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.jupiter.api.Test; @@ -31,7 +30,7 @@ class DuplicateGoalsTest { private static final String PROJECT_NAME = "org.apache.maven.caching.test.goals:duplicate"; @Test - void simple(Verifier verifier) throws VerificationException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); // run with an extra goal diff --git a/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionCoreExtensionTest.java b/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionCoreExtensionTest.java index 52a7a252..7f5d8a85 100644 --- a/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionCoreExtensionTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionCoreExtensionTest.java @@ -55,7 +55,7 @@ void tearDown() throws IOException { } @Test - void testForkedExecution(Verifier verifier) throws VerificationException { + void forkedExecution(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log-1.txt"); diff --git a/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionsTest.java b/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionsTest.java index f85ba111..d598a066 100644 --- a/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionsTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/ForkedExecutionsTest.java @@ -28,7 +28,6 @@ import com.github.tomakehurst.wiremock.matching.UrlPathPattern; import org.apache.commons.io.FileUtils; import org.apache.maven.buildcache.its.junit.IntegrationTest; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -69,7 +68,7 @@ void tearDown() throws IOException { } @Test - void testForkedExecution(Verifier verifier) throws VerificationException { + void forkedExecution(Verifier verifier) throws Exception { UrlPathPattern buildInfoPath = urlPathMatching(".*/buildinfo.xml"); wm.stubFor(get(buildInfoPath).willReturn(notFound())); diff --git a/src/test/java/org/apache/maven/buildcache/its/IncludeExcludeTest.java b/src/test/java/org/apache/maven/buildcache/its/IncludeExcludeTest.java index ef26ecf4..e6c4800d 100644 --- a/src/test/java/org/apache/maven/buildcache/its/IncludeExcludeTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/IncludeExcludeTest.java @@ -26,9 +26,12 @@ import org.apache.maven.buildcache.util.LogFileUtils; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + @IntegrationTest("src/test/projects/include-exclude") class IncludeExcludeTest { @@ -42,7 +45,7 @@ class IncludeExcludeTest { * @throws VerificationException */ @Test - void includeExclude(Verifier verifier) throws VerificationException { + void includeExclude(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setMavenDebug(true); @@ -67,10 +70,10 @@ private void verifyLogs(Verifier verifier) throws VerificationException { String foundXFiles = LogFileUtils.findFirstLineContainingTextsInLogs(verifier, "Found ", " input files."); Matcher m = NB_SRC_PATTERN.matcher(foundXFiles); - Assertions.assertTrue( + assertTrue( m.find(), "Found XX input files string not found in log. This test might need an update?"); - Assertions.assertEquals(nbFilesToFind, m.group(2), "Expected " + nbFilesToFind + " as source."); + assertEquals(nbFilesToFind, m.group(2), "Expected " + nbFilesToFind + " as source."); // Verify and inspect the line describing precisely which input files were chosen String srcInputLine = LogFileUtils.findFirstLineContainingTextsInLogs(verifier, "Src input: ["); @@ -91,7 +94,7 @@ private void verifyLogs(Verifier verifier) throws VerificationException { // Verify that excluded directories are "cut" from inspection as soon as possible String blacklistedLine = LogFileUtils.findFirstLineContainingTextsInLogs( verifier, "Skipping subtree (blacklisted)", "buildcache" + File.separator + "not"); - Assertions.assertNotNull( + assertNotNull( blacklistedLine, "Expecting a debug line saying that \"src/main/java/org/apache/maven/buildcache/not\" is excluded from tree walking."); } diff --git a/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java b/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java index 504abb1f..fd061e68 100644 --- a/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/IncrementalRestoreTest.java @@ -27,10 +27,12 @@ import org.apache.maven.buildcache.its.junit.IntegrationTest; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.apache.maven.buildcache.util.LogFileUtils.findFirstLineContainingTextsInLogs; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Check if a restoration restores build incrementally,i.e. package -> verify -> install -> deploy, @@ -101,7 +103,7 @@ class IncrementalRestoreTest { private Path jarJavadocCacheFile; @Test - void simple(Verifier verifier) throws VerificationException, IOException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setMavenDebug(true); @@ -135,10 +137,10 @@ private void initialBuild(Verifier verifier) throws VerificationException, IOExc jarCacheFile = buildInfoPath.getParent().resolve(MBUILDCACHE_INCREMENTAL_JAR); jarSourcesCacheFile = buildInfoPath.getParent().resolve(MBUILDCACHE_INCREMENTAL_SOURCES_JAR); jarJavadocCacheFile = buildInfoPath.getParent().resolve(MBUILDCACHE_INCREMENTAL_JAVADOC_JAR); - Assertions.assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); - Assertions.assertFalse( + assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); + assertFalse( Files.exists(jarSourcesCacheFile), "Not expected sources artifact saved in build cache."); - Assertions.assertFalse( + assertFalse( Files.exists(jarJavadocCacheFile), "Not expected javadoc artifact saved in build cache."); } @@ -156,7 +158,7 @@ private void verifyPackageWithCache(Verifier verifier) throws VerificationExcept verifySkippedPluginExecutions(verifier); verifier.verifyFilePresent(GENERATED_JAR); verifyCachedExtraOutputs(verifier); - Assertions.assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); + assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); } private void verifyWithCache(Verifier verifier) throws VerificationException { @@ -176,7 +178,7 @@ private void verifyWithCache(Verifier verifier) throws VerificationException { verifier.verifyTextInLog(SAVED_BUILD_TO_LOCAL_FILE); verifier.verifyFilePresent(GENERATED_JAR); verifyCachedExtraOutputs(verifier); - Assertions.assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); + assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); } private void installWithCache(Verifier verifier) throws VerificationException { @@ -199,7 +201,7 @@ private void installWithCache(Verifier verifier) throws VerificationException { verifier.verifyTextInLog(SAVED_BUILD_TO_LOCAL_FILE); verifier.verifyFilePresent(GENERATED_JAR); verifyCachedExtraOutputs(verifier); - Assertions.assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); + assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); } private void deployWithCache(Verifier verifier) throws VerificationException { @@ -224,9 +226,9 @@ private void deployWithCache(Verifier verifier) throws VerificationException { verifier.verifyFilePresent(GENERATED_SOURCES_JAR); verifier.verifyFilePresent(GENERATED_JAVADOC_JAR); verifyCachedExtraOutputs(verifier); - Assertions.assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); - Assertions.assertTrue(Files.exists(jarSourcesCacheFile), "Expected sources artifact saved in build cache."); - Assertions.assertTrue(Files.exists(jarJavadocCacheFile), "Expected javadoc artifact saved in build cache."); + assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); + assertTrue(Files.exists(jarSourcesCacheFile), "Expected sources artifact saved in build cache."); + assertTrue(Files.exists(jarJavadocCacheFile), "Expected javadoc artifact saved in build cache."); } private void replayInstallWithCache(Verifier verifier) throws VerificationException { @@ -247,9 +249,9 @@ private void replayInstallWithCache(Verifier verifier) throws VerificationExcept verifier.verifyFilePresent(GENERATED_SOURCES_JAR); verifier.verifyFilePresent(GENERATED_JAVADOC_JAR); verifyCachedExtraOutputs(verifier); - Assertions.assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); - Assertions.assertTrue(Files.exists(jarSourcesCacheFile), "Expected sources artifact saved in build cache."); - Assertions.assertTrue(Files.exists(jarJavadocCacheFile), "Expected javadoc artifact saved in build cache."); + assertTrue(Files.exists(jarCacheFile), "Expected artifact saved in build cache."); + assertTrue(Files.exists(jarSourcesCacheFile), "Expected sources artifact saved in build cache."); + assertTrue(Files.exists(jarJavadocCacheFile), "Expected javadoc artifact saved in build cache."); } private void cleanBuild(Verifier verifier) throws VerificationException { @@ -299,11 +301,11 @@ private void verifyNoCachedPluginExecutions(Verifier verifier) throws Verificati } private static void verifyNoTextInLog(Verifier verifier, String text, String message) throws VerificationException { - Assertions.assertNull(findFirstLineContainingTextsInLogs(verifier, text), message); + assertNull(findFirstLineContainingTextsInLogs(verifier, text), message); } private static void verifyNoTextInLog(Verifier verifier, String text) throws VerificationException { - Assertions.assertNull(findFirstLineContainingTextsInLogs(verifier, text)); + assertNull(findFirstLineContainingTextsInLogs(verifier, text)); } private static Path getSavedBuildInfoPath(Verifier verifier) throws VerificationException { diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue115Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue115Test.java index 3e1adff6..9bbebf14 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue115Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue115Test.java @@ -32,7 +32,7 @@ class Issue115Test { private static final String RESTORED_MESSAGE = "Found cached build, restoring " + PROJECT_NAME + " from cache"; @Test - void buildShouldRestoreProjectWithoutError(Verifier verifier) throws VerificationException { + void buildShouldRestoreProjectWithoutError(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log-1.txt"); verifier.executeGoal("package"); diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue21Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue21Test.java index e01585eb..c29c2a3e 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue21Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue21Test.java @@ -19,7 +19,6 @@ package org.apache.maven.buildcache.its; import org.apache.maven.buildcache.its.junit.IntegrationTest; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.jupiter.api.Test; @@ -27,7 +26,7 @@ class Issue21Test { @Test - void simple(Verifier verifier) throws VerificationException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log.txt"); diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue367Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue367Test.java index 4214401c..261e5194 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue367Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue367Test.java @@ -18,7 +18,6 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.List; @@ -39,7 +38,7 @@ class Issue367Test { @Test void fileOutsideInputDirectoryMatchingProjectLevelGlobPatternShouldNotInvalidateCache(Verifier verifier) - throws VerificationException, IOException { + throws Exception { assumeFalse(SystemUtils.IS_OS_WINDOWS); verifier.setAutoclean(false); diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue56Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue56Test.java index fcc8b0e2..1ee9e09a 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue56Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue56Test.java @@ -18,10 +18,7 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; - import org.apache.maven.buildcache.its.junit.IntegrationTest; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.jupiter.api.Test; @@ -29,7 +26,7 @@ class Issue56Test { @Test - void simple(Verifier verifier) throws VerificationException, IOException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log.txt"); diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue67Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue67Test.java index cf60cef3..816ee6bc 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue67Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue67Test.java @@ -18,7 +18,6 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Arrays; @@ -28,9 +27,11 @@ import org.apache.maven.buildcache.its.junit.IntegrationTest; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Check if a restoration error is handled properly = the build should be executed "normally", like if there is no cache. */ @@ -41,7 +42,7 @@ class Issue67Test { private static final String GENERATED_JAR = "target/mbuildcache-67-0.0.1-SNAPSHOT.jar"; @Test - void simple(Verifier verifier) throws VerificationException, IOException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setMavenDebug(true); @@ -53,12 +54,12 @@ void simple(Verifier verifier) throws VerificationException, IOException { verifier.verifyFilePresent(GENERATED_JAR); String savedPathLogLine = findFirstLineContainingTextsInLogs(verifier, SAVED_BUILD_TO_LOCAL_FILE); - Assertions.assertNotNull(savedPathLogLine, "We expect a debug log line with the path to the saved cache file"); + assertNotNull(savedPathLogLine, "We expect a debug log line with the path to the saved cache file"); String[] array = savedPathLogLine.split(SAVED_BUILD_TO_LOCAL_FILE); String jarCachePath = array[array.length - 1].replace("buildinfo.xml", "mbuildcache-67.jar"); // We remove from the local cache repository the jar artifact. In order to launch a restoration error. - Assertions.assertTrue( + assertTrue( Files.deleteIfExists(Paths.get(jarCachePath)), "mbuildcache-67.jar was expected in the local cache"); // Second build, with a corrupted cache diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java index d124433f..51ce5d65 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue74Test.java @@ -29,11 +29,12 @@ import org.apache.maven.buildcache.util.LogFileUtils; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * Check if cached builds are cleaned up correctly also for projects * which don't contain a package phase. @@ -44,7 +45,7 @@ class Issue74Test { private static final Logger LOGGER = LoggerFactory.getLogger(Issue74Test.class); @Test - void simple(Verifier verifier) throws VerificationException, IOException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setMavenDebug(true); @@ -89,7 +90,7 @@ private static void verifyBuildCacheEntries(final Verifier verifier, long expect List entries = Files.list(projectPathInCache).filter(p -> Files.isDirectory(p)).collect(Collectors.toList()); - Assertions.assertEquals( + assertEquals( expectedBuilds, entries.size(), "Expected amount of cached builds not satisfied. Found: " diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java index f0b024c0..703b019c 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue76Test.java @@ -19,7 +19,6 @@ package org.apache.maven.buildcache.its; import org.apache.maven.buildcache.its.junit.IntegrationTest; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.jupiter.api.Test; @@ -29,7 +28,7 @@ class Issue76Test { private static final String PROJECT_NAME = "org.apache.maven.caching.test:mbuildcache-76"; @Test - void simpleBuildChangeVersionBuildInstallAgain(Verifier verifier) throws VerificationException { + void simpleBuildChangeVersionBuildInstallAgain(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log-1.txt"); diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue87Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue87Test.java index 90cc6c59..d9b6afa2 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue87Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue87Test.java @@ -18,7 +18,6 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; @@ -43,7 +42,7 @@ class Issue87Test { "Found cached build, restoring " + MODULE2_PROJECT_NAME + " from cache"; @Test - void simple(Verifier verifier) throws VerificationException, IOException { + void simple(Verifier verifier) throws Exception { verifier.setLogFileName("../log-0.txt"); verifier.executeGoals(Arrays.asList("-f", "external", "install")); verifier.verifyErrorFreeLog(); diff --git a/src/test/java/org/apache/maven/buildcache/its/Issue99Test.java b/src/test/java/org/apache/maven/buildcache/its/Issue99Test.java index adc1de53..b7ebdea0 100644 --- a/src/test/java/org/apache/maven/buildcache/its/Issue99Test.java +++ b/src/test/java/org/apache/maven/buildcache/its/Issue99Test.java @@ -18,7 +18,6 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.List; @@ -34,7 +33,7 @@ class Issue99Test { @Test - void renamedFileInvalidatesCache(Verifier verifier) throws VerificationException, IOException { + void renamedFileInvalidatesCache(Verifier verifier) throws Exception { verifier.setAutoclean(false); verifier.setLogFileName("../log-0.txt"); diff --git a/src/test/java/org/apache/maven/buildcache/its/MandatoryCleanTest.java b/src/test/java/org/apache/maven/buildcache/its/MandatoryCleanTest.java index 5b25af98..f0ed227a 100644 --- a/src/test/java/org/apache/maven/buildcache/its/MandatoryCleanTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/MandatoryCleanTest.java @@ -18,7 +18,6 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; @@ -29,10 +28,10 @@ import org.apache.maven.buildcache.xml.CacheConfigImpl; import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.apache.maven.buildcache.xml.CacheConfigImpl.CACHE_LOCATION_PROPERTY_NAME; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; /** @@ -46,7 +45,7 @@ class MandatoryCleanTest { private static final String CACHE_BUILD_LOG = "Found cached build, restoring %s from cache"; @Test - void simple(Verifier verifier) throws VerificationException, IOException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); Path tempDirectory = Files.createTempDirectory("simple-mandatory-clean"); @@ -58,7 +57,7 @@ void simple(Verifier verifier) throws VerificationException, IOException { verifier.verifyErrorFreeLog(); List cacheSkippedBuild1 = LogFileUtils.findLinesContainingTextsInLogs( verifier, "Cache storing is skipped since there was no \"clean\" phase."); - Assertions.assertEquals(2, cacheSkippedBuild1.size(), "Expected 2 skipped module caching"); + assertEquals(2, cacheSkippedBuild1.size(), "Expected 2 skipped module caching"); assertThrows( VerificationException.class, @@ -74,7 +73,7 @@ void simple(Verifier verifier) throws VerificationException, IOException { verifier.verifyErrorFreeLog(); List cacheSkippedBuild2 = LogFileUtils.findLinesContainingTextsInLogs( verifier, "Cache storing is skipped since there was no \"clean\" phase."); - Assertions.assertEquals(0, cacheSkippedBuild2.size(), "Expected 2 skipped module caching"); + assertEquals(0, cacheSkippedBuild2.size(), "Expected 2 skipped module caching"); assertThrows( VerificationException.class, () -> verifier.verifyTextInLog(String.format(CACHE_BUILD_LOG, MODULE_NAME_1)), @@ -89,14 +88,14 @@ void simple(Verifier verifier) throws VerificationException, IOException { verifier.verifyErrorFreeLog(); List cacheSkippedBuild3 = LogFileUtils.findLinesContainingTextsInLogs( verifier, "Cache storing is skipped since there was no \"clean\" phase."); - Assertions.assertEquals(0, cacheSkippedBuild3.size(), "loading from cache, no more caching required"); + assertEquals(0, cacheSkippedBuild3.size(), "loading from cache, no more caching required"); // Expect to find and restore cached project verifier.verifyTextInLog(String.format(CACHE_BUILD_LOG, MODULE_NAME_1)); verifier.verifyTextInLog(String.format(CACHE_BUILD_LOG, MODULE_NAME_2)); } @Test - void disabledViaProperty(Verifier verifier) throws VerificationException { + void disabledViaProperty(Verifier verifier) throws Exception { verifier.setAutoclean(false); @@ -105,7 +104,7 @@ void disabledViaProperty(Verifier verifier) throws VerificationException { verifier.verifyErrorFreeLog(); List cacheSkippedBuild1 = LogFileUtils.findLinesContainingTextsInLogs( verifier, "Cache storing is skipped since there was no \"clean\" phase."); - Assertions.assertEquals(2, cacheSkippedBuild1.size(), "Expected 2 skipped module caching"); + assertEquals(2, cacheSkippedBuild1.size(), "Expected 2 skipped module caching"); assertThrows( VerificationException.class, @@ -124,7 +123,7 @@ void disabledViaProperty(Verifier verifier) throws VerificationException { verifier.verifyErrorFreeLog(); List cacheSkippedBuild2 = LogFileUtils.findLinesContainingTextsInLogs( verifier, "Cache storing is skipped since there was no \"clean\" phase."); - Assertions.assertEquals(2, cacheSkippedBuild2.size(), "Expected 2 skipped module caching"); + assertEquals(2, cacheSkippedBuild2.size(), "Expected 2 skipped module caching"); assertThrows( VerificationException.class, @@ -143,7 +142,7 @@ void disabledViaProperty(Verifier verifier) throws VerificationException { verifier.verifyErrorFreeLog(); List cacheSkippedBuild3 = LogFileUtils.findLinesContainingTextsInLogs( verifier, "Cache storing is skipped since there was no \"clean\" phase."); - Assertions.assertEquals(0, cacheSkippedBuild3.size(), "Expected 2 skipped module caching"); + assertEquals(0, cacheSkippedBuild3.size(), "Expected 2 skipped module caching"); assertThrows( VerificationException.class, () -> verifier.verifyTextInLog(String.format(CACHE_BUILD_LOG, MODULE_NAME_1)), diff --git a/src/test/java/org/apache/maven/buildcache/its/PerModuleFlagsTest.java b/src/test/java/org/apache/maven/buildcache/its/PerModuleFlagsTest.java index c5e2213f..eeef8e21 100644 --- a/src/test/java/org/apache/maven/buildcache/its/PerModuleFlagsTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/PerModuleFlagsTest.java @@ -18,10 +18,7 @@ */ package org.apache.maven.buildcache.its; -import java.io.IOException; - import org.apache.maven.buildcache.its.junit.IntegrationTest; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.junit.jupiter.api.Test; @@ -32,7 +29,7 @@ class PerModuleFlagsTest { private static final String PROJECT_NAME_MODULE3 = "org.apache.maven.caching.test.multimodule:module3"; @Test - void simple(Verifier verifier) throws VerificationException, IOException { + void simple(Verifier verifier) throws Exception { verifier.setAutoclean(false); // 1st build diff --git a/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java b/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java index baf0984b..aab20127 100644 --- a/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java +++ b/src/test/java/org/apache/maven/buildcache/its/RemoteCacheDavTest.java @@ -34,7 +34,6 @@ import org.apache.maven.buildcache.its.junit.Inject; import org.apache.maven.buildcache.its.junit.IntegrationTest; import org.apache.maven.buildcache.its.junit.IntegrationTestExtension; -import org.apache.maven.it.VerificationException; import org.apache.maven.it.Verifier; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.AfterEach; @@ -119,7 +118,7 @@ public static Stream transports() { @ParameterizedTest @MethodSource("transports") - void doTestRemoteCache(String transport) throws VerificationException, IOException { + void doTestRemoteCache(String transport) throws Exception { String url = ("wagon".equals(transport) ? "dav:" : "") + "http://localhost:" + dav.getFirstMappedPort() + "/mbce"; substitute( diff --git a/src/test/java/org/apache/maven/buildcache/xml/CacheConfigImplTest.java b/src/test/java/org/apache/maven/buildcache/xml/CacheConfigImplTest.java index b7106174..d6d6166b 100644 --- a/src/test/java/org/apache/maven/buildcache/xml/CacheConfigImplTest.java +++ b/src/test/java/org/apache/maven/buildcache/xml/CacheConfigImplTest.java @@ -60,6 +60,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -179,9 +180,7 @@ private void assertDefaults(Map overrides) { asserts.put("getExcludePatterns", () -> assertEquals(Collections.emptyList(), testObject.getExcludePatterns())); asserts.put( "getExecutionDirScanConfig", - () -> assertTrue( - testObject.getExecutionDirScanConfig(mock(Plugin.class), mock(PluginExecution.class)) - instanceof DefaultPluginScanConfig)); + () -> assertInstanceOf(DefaultPluginScanConfig.class, testObject.getExecutionDirScanConfig(mock(Plugin.class), mock(PluginExecution.class)))); asserts.put( "getGlobalExcludePaths", () -> assertEquals(Collections.emptyList(), testObject.getGlobalExcludePaths())); @@ -201,8 +200,7 @@ private void assertDefaults(Map overrides) { () -> assertEquals(Collections.emptyList(), testObject.getNologProperties(mock(MojoExecution.class)))); asserts.put( "getPluginDirScanConfig", - () -> assertTrue( - testObject.getPluginDirScanConfig(mock(Plugin.class)) instanceof DefaultPluginScanConfig)); + () -> assertInstanceOf(DefaultPluginScanConfig.class, testObject.getPluginDirScanConfig(mock(Plugin.class)))); asserts.put( "getTrackedProperties", () -> assertEquals( @@ -228,14 +226,14 @@ private void assertDefaults(Map overrides) { } @Test - void testInitializationInvalidMavenVersion() { + void initializationInvalidMavenVersion() { when(rtInfo.isMavenVersion(ArgumentMatchers.anyString())).thenReturn(false); assertEquals(CacheState.DISABLED, testObject.initialize()); } @Test - void testInitializationDisabledUserProperty() { + void initializationDisabledUserProperty() { when(mockProperties.getProperty(CacheConfigImpl.CACHE_ENABLED_PROPERTY_NAME)) .thenReturn("false"); @@ -243,7 +241,7 @@ void testInitializationDisabledUserProperty() { } @Test - void testInitializationDisabledSystemProperty() { + void initializationDisabledSystemProperty() { when(mockProperties.getProperty(CacheConfigImpl.CACHE_ENABLED_PROPERTY_NAME)) .thenReturn(null) .thenReturn("false"); @@ -252,7 +250,7 @@ void testInitializationDisabledSystemProperty() { } @Test - void testInitializationDisabledInXML() { + void initializationDisabledInXML() { Configuration configuration = new Configuration(); configuration.setEnabled(false); testCacheConfig.setConfiguration(configuration); @@ -261,7 +259,7 @@ void testInitializationDisabledInXML() { } @Test - void testInitializationNonExistantXMLFromProperty() { + void initializationNonExistantXMLFromProperty() { when(mockProperties.getProperty(CacheConfigImpl.CONFIG_PATH_PROPERTY_NAME)) .thenReturn("does-not-exist"); @@ -270,7 +268,7 @@ void testInitializationNonExistantXMLFromProperty() { } @Test - void testInitializationNonExistantXMLFromRoot() throws IOException { + void initializationNonExistantXMLFromRoot() throws Exception { deepMockConfigFile(rootConfigFile, false); assertEquals(CacheState.INITIALIZED, testObject.initialize()); @@ -278,7 +276,7 @@ void testInitializationNonExistantXMLFromRoot() throws IOException { } @Test - void testInitializationExplicitlyEnabledUserPropertyOverridesXML() { + void initializationExplicitlyEnabledUserPropertyOverridesXML() { Configuration configuration = new Configuration(); configuration.setEnabled(false); testCacheConfig.setConfiguration(configuration); @@ -290,7 +288,7 @@ void testInitializationExplicitlyEnabledUserPropertyOverridesXML() { } @Test - void testRemoteEnableInXMLButNoURL() { + void remoteEnableInXMLButNoURL() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setEnabled(true); @@ -302,7 +300,7 @@ void testRemoteEnableInXMLButNoURL() { } @Test - void testRemoteEnableInXMLWithURL() { + void remoteEnableInXMLWithURL() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setEnabled(true); @@ -317,7 +315,7 @@ void testRemoteEnableInXMLWithURL() { } @Test - void testRemoteEnableByUserPropertyOverrideNoURL() { + void remoteEnableByUserPropertyOverrideNoURL() { when(mockProperties.getProperty(CacheConfigImpl.REMOTE_ENABLED_PROPERTY_NAME)) .thenReturn("true"); @@ -326,7 +324,7 @@ void testRemoteEnableByUserPropertyOverrideNoURL() { } @Test - void testRemoteEnableByUserPropertyOverrideWithURL() { + void remoteEnableByUserPropertyOverrideWithURL() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); @@ -342,7 +340,7 @@ void testRemoteEnableByUserPropertyOverrideWithURL() { } @Test - void testRemoteDisableByUserPropertyOverride() { + void remoteDisableByUserPropertyOverride() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); @@ -357,7 +355,7 @@ void testRemoteDisableByUserPropertyOverride() { } @Test - void testRemoveSaveEnabledInXML() { + void removeSaveEnabledInXML() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); @@ -374,7 +372,7 @@ void testRemoveSaveEnabledInXML() { } @Test - void testRemoveSaveEnabledByUserProperty() { + void removeSaveEnabledByUserProperty() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); @@ -392,7 +390,7 @@ void testRemoveSaveEnabledByUserProperty() { } @Test - void testRemoveSaveDisabledByUserProperty() { + void removeSaveDisabledByUserProperty() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); @@ -410,7 +408,7 @@ void testRemoveSaveDisabledByUserProperty() { } @Test - void testRemoteSaveIgnoredWhenRemoteDisabledInXML() { + void remoteSaveIgnoredWhenRemoteDisabledInXML() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setSaveToRemote(true); @@ -422,7 +420,7 @@ void testRemoteSaveIgnoredWhenRemoteDisabledInXML() { } @Test - void testRemoteSaveIgnoredWhenRemoteDisabledUserProperty() { + void remoteSaveIgnoredWhenRemoteDisabledUserProperty() { when(mockProperties.getProperty(CacheConfigImpl.SAVE_TO_REMOTE_PROPERTY_NAME)) .thenReturn("true"); @@ -431,7 +429,7 @@ void testRemoteSaveIgnoredWhenRemoteDisabledUserProperty() { } @Test - void testRemoteSaveIgnoredWhenRemoteDisabledByUserPropertyOverride() { + void remoteSaveIgnoredWhenRemoteDisabledByUserPropertyOverride() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); @@ -447,7 +445,7 @@ void testRemoteSaveIgnoredWhenRemoteDisabledByUserPropertyOverride() { } @Test - void testRemoveSaveFinalEnabledByUserProperty() { + void removeSaveFinalEnabledByUserProperty() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); @@ -467,7 +465,7 @@ void testRemoveSaveFinalEnabledByUserProperty() { } @Test - void testRemoveSaveFinalIgnoredWhenRemoteSaveDisabled() { + void removeSaveFinalIgnoredWhenRemoteSaveDisabled() { Configuration configuration = new Configuration(); Remote remote = new Remote(); remote.setUrl("dummy.url.xyz"); diff --git a/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java b/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java index a22638c7..bd369961 100644 --- a/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java +++ b/src/test/java/org/apache/maven/buildcache/xml/XmlServiceTest.java @@ -30,7 +30,7 @@ class XmlServiceTest { @Test @Disabled("cache-build-1.0.0.xsd not found") - void testConfig() throws Exception { + void config() throws Exception { SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); Schema schema = sf.newSchema(getClass().getResource("/build-cache-config-1.0.0.xsd")); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); @@ -40,7 +40,7 @@ void testConfig() throws Exception { @Test @Disabled("cache-build-1.0.0.xsd not found") - void testReport() throws Exception { + void report() throws Exception { SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); Schema schema = sf.newSchema(getClass().getResource("/build-cache-report-1.0.0.xsd")); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); @@ -50,7 +50,7 @@ void testReport() throws Exception { @Test @Disabled("cache-build-1.0.0.xsd not found") - void testBuild() throws Exception { + void build() throws Exception { SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); Schema schema = sf.newSchema(getClass().getResource("/build-cache-build-1.0.0.xsd")); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); @@ -60,7 +60,7 @@ void testBuild() throws Exception { @Test @Disabled("cache-build-1.0.0.xsd not found") - void testDiff() throws Exception { + void diff() throws Exception { SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); Schema schema = sf.newSchema(getClass().getResource("/build-cache-diff-1.0.0.xsd")); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();