This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 5a7b3ec45c466c3a4379294e81f4fa746e059dfe Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Tue Nov 17 06:04:59 2026 +0000 Use JUnit 5 assertions and Mockito best practices in tests --- .../rules/ReactorModuleConvergenceTest.java | 8 +++---- .../enforcer/rules/RequireActiveProfileTest.java | 10 ++++----- .../maven/enforcer/rules/TestBannedPlugins.java | 4 ++-- .../enforcer/rules/TestBannedRepositories.java | 4 ++-- .../maven/enforcer/rules/TestExternalRules.java | 4 ++-- .../rules/TestRequireMatchingCoordinates.java | 2 +- .../enforcer/rules/TestRequireNoRepositories.java | 24 ++++++++++---------- .../enforcer/rules/TestRequireSameVersions.java | 26 +++++++++++----------- .../checksum/TestNormalizeLineSeparatorReader.java | 9 ++++---- .../rules/checksum/TestRequireFileChecksum.java | 17 +++++++------- .../checksum/TestRequireTextFileChecksum.java | 12 +++++----- .../rules/dependency/RequireReleaseDepsTest.java | 3 +-- .../rules/files/TestRequireFilesDontExist.java | 13 +++++------ .../rules/files/TestRequireFilesExist.java | 3 +-- .../enforcer/rules/files/TestRequireFilesSize.java | 19 ++++++++-------- .../enforcer/rules/utils/TestArtifactMatcher.java | 4 ++-- .../enforcer/rules/version/TestMavenVersion.java | 4 ++-- .../rules/version/TestRequireJavaVersion.java | 6 ++--- .../maven/plugins/enforcer/TestEnforceMojo.java | 8 +++---- 19 files changed, 86 insertions(+), 94 deletions(-) diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/ReactorModuleConvergenceTest.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/ReactorModuleConvergenceTest.java index 2b71806f..d6e5d1d8 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/ReactorModuleConvergenceTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/ReactorModuleConvergenceTest.java @@ -61,14 +61,14 @@ class ReactorModuleConvergenceTest { } @Test - void shouldNotFailWithNoProject() throws EnforcerRuleException { + void shouldNotFailWithNoProject() throws Exception { setupSortedProjects(Collections.emptyList()); rule.execute(); } @Test - void shouldNotFailWithAValidProject() throws EnforcerRuleException { + void shouldNotFailWithAValidProject() throws Exception { MavenProject mp1 = createProjectParent(); MavenProject mp2 = createProjectChild1(mp1); MavenProject mp3 = createProjectChild2(mp1); @@ -124,7 +124,7 @@ class ReactorModuleConvergenceTest { } @Test - void shouldNotFailWithACompanyParent() throws EnforcerRuleException { + void shouldNotFailWithACompanyParent() throws Exception { MavenProject companyParent = createCompanyParent(); MavenProject mp1 = createProjectParent(companyParent); @@ -178,7 +178,7 @@ class ReactorModuleConvergenceTest { } @Test - void shouldNotFailWithDependencyInReactory() throws EnforcerRuleException { + void shouldNotFailWithDependencyInReactory() throws Exception { MavenProject mp1 = createProjectParent(); MavenProject mp2 = createProjectChild1(mp1); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/RequireActiveProfileTest.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/RequireActiveProfileTest.java index 7a00f1a6..adcb6cfd 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/RequireActiveProfileTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/RequireActiveProfileTest.java @@ -49,13 +49,13 @@ class RequireActiveProfileTest { private RequireActiveProfile rule; @Test - void testNoActiveProfilesInProjectAndNoProfilesExpectedToBeActivated() throws EnforcerRuleException { + void testNoActiveProfilesInProjectAndNoProfilesExpectedToBeActivated() throws Exception { rule.execute(); } @Test - void testActiveProfileAndExpectedActiveProfile() throws EnforcerRuleException { + void testActiveProfileAndExpectedActiveProfile() throws Exception { Map<String, List<String>> profiles = Collections.singletonMap("pom", Arrays.asList("profile-2")); when(project.getInjectedProfileIds()).thenReturn(profiles); @@ -93,7 +93,7 @@ class RequireActiveProfileTest { } @Test - void testTwoActiveProfilesWithOneRequiredProfile() throws EnforcerRuleException { + void testTwoActiveProfilesWithOneRequiredProfile() throws Exception { Map<String, List<String>> profiles = Collections.singletonMap("pom", Arrays.asList("profile-1", "profile-2")); when(project.getInjectedProfileIds()).thenReturn(profiles); @@ -104,7 +104,7 @@ class RequireActiveProfileTest { } @Test - void testTwoActiveProfilesWhereOneProfileIsRequiredToBeActivated() throws EnforcerRuleException { + void testTwoActiveProfilesWhereOneProfileIsRequiredToBeActivated() throws Exception { Map<String, List<String>> profiles = Collections.singletonMap("pom", Arrays.asList("profile-1", "profile-2")); when(project.getInjectedProfileIds()).thenReturn(profiles); @@ -149,7 +149,7 @@ class RequireActiveProfileTest { } @Test - void testOneActiveProfileWithTwoProfilesButNotAll() throws EnforcerRuleException { + void testOneActiveProfileWithTwoProfilesButNotAll() throws Exception { Map<String, List<String>> profiles = Collections.singletonMap("pom", Arrays.asList("profile-X")); when(project.getInjectedProfileIds()).thenReturn(profiles); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedPlugins.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedPlugins.java index e43ca3df..a4e48c19 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedPlugins.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedPlugins.java @@ -59,7 +59,7 @@ class TestBannedPlugins { } @Test - void shouldPassWhenNoPlugins() throws EnforcerRuleException { + void shouldPassWhenNoPlugins() throws Exception { MavenProject project = mock(MavenProject.class); when(session.getCurrentProject()).thenReturn(project); when(project.getPluginArtifacts()).thenReturn(Collections.emptySet()); @@ -125,7 +125,7 @@ class TestBannedPlugins { } @Test - void shouldPassWhenPluginIsIncluded() throws EnforcerRuleException { + void shouldPassWhenPluginIsIncluded() throws Exception { MavenProject project = mock(MavenProject.class); when(session.getCurrentProject()).thenReturn(project); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedRepositories.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedRepositories.java index c00b42ff..31d7a066 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedRepositories.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestBannedRepositories.java @@ -57,7 +57,7 @@ class TestBannedRepositories { } @Test - void testNoCheckRules() throws EnforcerRuleException { + void testNoCheckRules() throws Exception { RemoteRepository repo1 = new RemoteRepository.Builder("repo1", "default", "http://repo1/").build(); List<RemoteRepository> repos = new ArrayList<>(); repos.add(repo1); @@ -96,7 +96,7 @@ class TestBannedRepositories { } @Test - void testAllowedRepositoriesAllOK() throws EnforcerRuleException { + void testAllowedRepositoriesAllOK() throws Exception { RemoteRepository repo1 = new RemoteRepository.Builder("repo1", "default", "http://repo1/").build(); RemoteRepository repo2 = new RemoteRepository.Builder("repo1", "default", "http://repo1/test").build(); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestExternalRules.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestExternalRules.java index 53a27cd4..7f4c5875 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestExternalRules.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestExternalRules.java @@ -88,7 +88,7 @@ class TestExternalRules { } @Test - void shouldLoadRulesFromClassPath() throws EnforcerRuleException { + void shouldLoadRulesFromClassPath() throws Exception { MojoDescriptor mojoDescriptor = new MojoDescriptor(); mojoDescriptor.setRealm(EnforcerTestUtils.getTestClassRealm()); when(mojoExecution.getMojoDescriptor()).thenReturn(mojoDescriptor); @@ -100,7 +100,7 @@ class TestExternalRules { } @Test - void shouldFilterRules() throws EnforcerRuleException { + void shouldFilterRules() throws Exception { MojoDescriptor mojoDescriptor = new MojoDescriptor(); mojoDescriptor.setRealm(EnforcerTestUtils.getTestClassRealm()); when(mojoExecution.getMojoDescriptor()).thenReturn(mojoDescriptor); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireMatchingCoordinates.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireMatchingCoordinates.java index b6b03a7a..4cb589e2 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireMatchingCoordinates.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireMatchingCoordinates.java @@ -60,7 +60,7 @@ class TestRequireMatchingCoordinates { } @Test - void shouldPassWhenCoordinatesMatch() throws EnforcerRuleException { + void shouldPassWhenCoordinatesMatch() throws Exception { rule.setGroupIdPattern("com\\.example\\..*"); when(project.getGroupId()).thenReturn("com.example.app"); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireNoRepositories.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireNoRepositories.java index 8f8b8fd2..29e52d16 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireNoRepositories.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireNoRepositories.java @@ -162,7 +162,7 @@ class TestRequireNoRepositories { * This model contains a single module maven project without any repository. */ @Test - void testAllBannedNoRepositories() throws EnforcerRuleException { + void testAllBannedNoRepositories() throws Exception { MavenProject baseProject = createStandAloneProject(); setupSortedProjects(Collections.singletonList(baseProject)); @@ -201,7 +201,7 @@ class TestRequireNoRepositories { * The model contains a single repository which is allowed by setting allowedRepositories to the id. */ @Test - void testAllBannedWithAllowedRepositories() throws EnforcerRuleException { + void testAllBannedWithAllowedRepositories() throws Exception { final String repositoryId = "repo"; rule.setAllowedRepositories(Collections.singletonList(repositoryId)); @@ -216,7 +216,7 @@ class TestRequireNoRepositories { * The model contains a single repository. Turned off ban repositories. */ @Test - void testRepositoriesNotBannedWithSingleRepository() throws EnforcerRuleException { + void testRepositoriesNotBannedWithSingleRepository() throws Exception { final String repositoryId = "repo"; rule.setBanRepositories(false); @@ -232,7 +232,7 @@ class TestRequireNoRepositories { * The model contains no repository at all. Turned off ban repositories. */ @Test - void testRepositoriesNotBannedWithOutAnyRepository() throws EnforcerRuleException { + void testRepositoriesNotBannedWithOutAnyRepository() throws Exception { rule.setBanRepositories(false); MavenProject baseProject = createStandAloneProject(); @@ -246,7 +246,7 @@ class TestRequireNoRepositories { * plugin repositories. */ @Test - void testAllBannedWithAllowedPluginRepositories() throws EnforcerRuleException { + void testAllBannedWithAllowedPluginRepositories() throws Exception { final String repositoryId = "repo"; rule.setAllowedPluginRepositories(Collections.singletonList(repositoryId)); @@ -261,7 +261,7 @@ class TestRequireNoRepositories { * The model contains a single plugin repository. Turned off ban plugin repositories. */ @Test - void testPluginRepositoriesNotBannedWithSinglePluginRepository() throws EnforcerRuleException { + void testPluginRepositoriesNotBannedWithSinglePluginRepository() throws Exception { final String repositoryId = "repo"; rule.setBanPluginRepositories(false); @@ -277,7 +277,7 @@ class TestRequireNoRepositories { * The model contains no repository at all. Turned off ban plugin repositories. */ @Test - void testPluginRepositoriesNotBannedWithOutAnyRepository() throws EnforcerRuleException { + void testPluginRepositoriesNotBannedWithOutAnyRepository() throws Exception { rule.setBanPluginRepositories(false); MavenProject baseProject = createStandAloneProject(); @@ -298,7 +298,7 @@ class TestRequireNoRepositories { } @Test - void testAllBannedWithSnapshotRepositoryAllowedRepositories() throws EnforcerRuleException { + void testAllBannedWithSnapshotRepositoryAllowedRepositories() throws Exception { final String repositoryId = "repo"; rule.setAllowedRepositories(Collections.singletonList(repositoryId)); @@ -310,7 +310,7 @@ class TestRequireNoRepositories { } @Test - void testAllBannedWithSnapshotRepositoryAndSetAllowSnapshotRepositories() throws EnforcerRuleException { + void testAllBannedWithSnapshotRepositoryAndSetAllowSnapshotRepositories() throws Exception { final String repositoryId = "repo"; rule.setAllowSnapshotRepositories(true); @@ -322,7 +322,7 @@ class TestRequireNoRepositories { } @Test - void testAllBannedWithSnapshotPluginRepositoryAndSetAllowSnapshotPluginRepositories() throws EnforcerRuleException { + void testAllBannedWithSnapshotPluginRepositoryAndSetAllowSnapshotPluginRepositories() throws Exception { final String repositoryId = "repo"; rule.setAllowSnapshotPluginRepositories(true); @@ -334,7 +334,7 @@ class TestRequireNoRepositories { } @Test - void testAllBannedWithEmptyRepository() throws EnforcerRuleException { + void testAllBannedWithEmptyRepository() throws Exception { MavenProject baseProject = createStandAloneProject(); addEmptyRepository(baseProject); setupSortedProjects(Collections.singletonList(baseProject)); @@ -343,7 +343,7 @@ class TestRequireNoRepositories { } @Test - void testAllBannedWithEmptyPluginRepository() throws EnforcerRuleException { + void testAllBannedWithEmptyPluginRepository() throws Exception { MavenProject baseProject = createStandAloneProject(); addEmptyPluginRepository(baseProject); setupSortedProjects(Collections.singletonList(baseProject)); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java index dac775ac..3cee4426 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/TestRequireSameVersions.java @@ -57,7 +57,7 @@ class TestRequireSameVersions { } @Test - void testProjectWithSameVersionsInBuildAndReport() throws IOException { + void testProjectWithSameVersionsInBuildAndReport() throws Exception { String version = "1.0.0"; Artifact dependency = constructArtifact("acme-dependency", version); Artifact buildPluginOne = constructArtifact("acme-build-plugin-one", version); @@ -86,7 +86,7 @@ class TestRequireSameVersions { } @Test - void testProjectWithSameVersionsInPlugins() throws IOException { + void testProjectWithSameVersionsInPlugins() throws Exception { String version = "1.0.0"; Artifact dependency = constructArtifact("acme-dependency", version); Artifact buildPluginOne = constructArtifact("acme-build-plugin-one", version); @@ -115,7 +115,7 @@ class TestRequireSameVersions { } @Test - void testProjectWithSameVersionsInBuildAndReportAndPlugins() throws IOException { + void testProjectWithSameVersionsInBuildAndReportAndPlugins() throws Exception { String version = "1.0.0"; Artifact dependency = constructArtifact("acme-dependency", version); Artifact buildPluginOne = constructArtifact("acme-build-plugin-one", version); @@ -144,7 +144,7 @@ class TestRequireSameVersions { } @Test - void testProjectWithDifferentPluginVersionsInBuildAndReport() throws IOException { + void testProjectWithDifferentPluginVersionsInBuildAndReport() throws Exception { String version = "1.0.0"; Artifact dependency = constructArtifact("acme-dependency", version); Artifact buildPluginOne = constructArtifact("acme-build-plugin-one", version); @@ -173,7 +173,7 @@ class TestRequireSameVersions { } @Test - void testProjectWithDifferentPluginVersionsInPlugins() throws IOException { + void testProjectWithDifferentPluginVersionsInPlugins() throws Exception { String version = "1.0.0"; Artifact dependency = constructArtifact("acme-dependency", version); Artifact buildPluginOne = constructArtifact("acme-build-plugin-one", version); @@ -202,7 +202,7 @@ class TestRequireSameVersions { } @Test - void testProjectWithDifferentPluginVersionsInBuildAndReportAndPlugins() throws IOException { + void testProjectWithDifferentPluginVersionsInBuildAndReportAndPlugins() throws Exception { String version = "1.0.0"; Artifact dependency = constructArtifact("acme-dependency", version); Artifact buildPluginOne = constructArtifact("acme-build-plugin-one", version); @@ -231,7 +231,7 @@ class TestRequireSameVersions { } @Test - void testProjectWithDifferentDependencyVersionsInBuildAndReportAndPlugins() throws IOException { + void testProjectWithDifferentDependencyVersionsInBuildAndReportAndPlugins() throws Exception { String version = "1.0.0"; Artifact dependency = constructArtifact("acme-dependency", "1.0.1"); Artifact buildPluginOne = constructArtifact("acme-build-plugin-one", version); @@ -260,7 +260,7 @@ class TestRequireSameVersions { } @Test - void testReportPluginUsesManagedVersionWhenArtifactVersionIsRelease() throws IOException { + void testReportPluginUsesManagedVersionWhenArtifactVersionIsRelease() throws Exception { String version = "3.5.3"; Artifact buildPlugin = @@ -297,7 +297,7 @@ class TestRequireSameVersions { } @Test - void testReportPluginUsesBuildPluginVersionBeforeManagedVersion() throws IOException { + void testReportPluginUsesBuildPluginVersionBeforeManagedVersion() throws Exception { String buildPluginVersion = "3.5.3"; String managedVersion = "3.6.0"; @@ -342,7 +342,7 @@ class TestRequireSameVersions { } @Test - void testReportPluginFailsWhenManagedVersionDiffersFromBuildPlugin() throws IOException { + void testReportPluginFailsWhenManagedVersionDiffersFromBuildPlugin() throws Exception { String buildPluginVersion = "3.5.3"; String managedVersion = "3.6.0"; @@ -380,7 +380,7 @@ class TestRequireSameVersions { } @Test - void shouldOutputCustomMessageWhenVersionsDiffer() throws IOException { + void shouldOutputCustomMessageWhenVersionsDiffer() throws Exception { String customMessage = "Custom same versions message"; rule.setMessage(customMessage); @@ -404,7 +404,7 @@ class TestRequireSameVersions { } @Test - void failureMessageListsEachPluginUnderItsVersion() throws IOException { + void failureMessageListsEachPluginUnderItsVersion() throws Exception { Artifact surefire = constructArtifact("acme-surefire", "2.14"); Artifact failsafe = constructArtifact("acme-failsafe", "2.15"); Artifact surefireReport = constructArtifact("acme-surefire-report", "2.13"); @@ -429,7 +429,7 @@ class TestRequireSameVersions { } @Test - void shouldListMembersFromAllSourcesSharingAConflictingVersion() throws IOException { + void shouldListMembersFromAllSourcesSharingAConflictingVersion() throws Exception { String conflictVersion = "1.0"; Artifact dependencyAtConflictVersion = constructArtifact("acme-dependency", conflictVersion); Artifact buildPluginAtConflictVersion = constructArtifact("acme-build-plugin", conflictVersion); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestNormalizeLineSeparatorReader.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestNormalizeLineSeparatorReader.java index 6346cb92..1fba6153 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestNormalizeLineSeparatorReader.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestNormalizeLineSeparatorReader.java @@ -18,7 +18,6 @@ */ package org.apache.maven.enforcer.rules.checksum; -import java.io.IOException; import java.io.Reader; import java.io.StringReader; @@ -34,7 +33,7 @@ class TestNormalizeLineSeparatorReader { private static final String WINDOWS_MULTILINE_STRING = "line1\r\nline2\r\n\r\n"; @Test - void testUnixToWindows() throws IOException { + void testUnixToWindows() throws Exception { try (Reader reader = new NormalizeLineSeparatorReader(new StringReader(UNIX_MULTILINE_STRING), LineSeparator.WINDOWS)) { assertEquals(WINDOWS_MULTILINE_STRING, IOUtils.toString(reader)); @@ -42,7 +41,7 @@ class TestNormalizeLineSeparatorReader { } @Test - void testUnixToUnix() throws IOException { + void testUnixToUnix() throws Exception { try (Reader reader = new NormalizeLineSeparatorReader(new StringReader(UNIX_MULTILINE_STRING), LineSeparator.UNIX)) { assertEquals(UNIX_MULTILINE_STRING, IOUtils.toString(reader)); @@ -50,7 +49,7 @@ class TestNormalizeLineSeparatorReader { } @Test - void testWindowsToUnix() throws IOException { + void testWindowsToUnix() throws Exception { try (Reader reader = new NormalizeLineSeparatorReader(new StringReader(WINDOWS_MULTILINE_STRING), LineSeparator.UNIX)) { assertEquals(UNIX_MULTILINE_STRING, IOUtils.toString(reader)); @@ -58,7 +57,7 @@ class TestNormalizeLineSeparatorReader { } @Test - void testWindowsToWindows() throws IOException { + void testWindowsToWindows() throws Exception { try (Reader reader = new NormalizeLineSeparatorReader(new StringReader(WINDOWS_MULTILINE_STRING), LineSeparator.WINDOWS)) { assertEquals(WINDOWS_MULTILINE_STRING, IOUtils.toString(reader)); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireFileChecksum.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireFileChecksum.java index 00988b6e..c614fe29 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireFileChecksum.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireFileChecksum.java @@ -19,7 +19,6 @@ package org.apache.maven.enforcer.rules.checksum; import java.io.File; -import java.io.IOException; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.codehaus.plexus.util.FileUtils; @@ -42,7 +41,7 @@ class TestRequireFileChecksum { private File temporaryFolder; @Test - void testFileChecksumMd5() throws IOException, EnforcerRuleException { + void testFileChecksumMd5() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "message"); @@ -54,7 +53,7 @@ class TestRequireFileChecksum { } @Test - void testFileChecksumMd5UpperCase() throws IOException, EnforcerRuleException { + void testFileChecksumMd5UpperCase() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "message"); @@ -94,7 +93,7 @@ class TestRequireFileChecksum { } @Test - void testFileChecksumMd5GivenFileIsNotReadableFailure() throws IOException { + void testFileChecksumMd5GivenFileIsNotReadableFailure() throws Exception { File t = File.createTempFile("junit", null, temporaryFolder); File f = new File(t.getAbsolutePath()) { private static final long serialVersionUID = 6987790643999338089L; @@ -166,7 +165,7 @@ class TestRequireFileChecksum { } @Test - void testFileChecksumMd5ChecksumMismatchFailure() throws IOException { + void testFileChecksumMd5ChecksumMismatchFailure() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); Throwable exception = assertThrows(EnforcerRuleException.class, () -> { FileUtils.fileWrite(f, "message"); @@ -201,7 +200,7 @@ class TestRequireFileChecksum { } @Test - void testFileChecksumSha1() throws IOException, EnforcerRuleException { + void testFileChecksumSha1() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "message"); @@ -213,7 +212,7 @@ class TestRequireFileChecksum { } @Test - void testFileChecksumSha256() throws IOException, EnforcerRuleException { + void testFileChecksumSha256() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "message"); @@ -225,7 +224,7 @@ class TestRequireFileChecksum { } @Test - void testFileChecksumSha384() throws IOException, EnforcerRuleException { + void testFileChecksumSha384() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "message"); @@ -238,7 +237,7 @@ class TestRequireFileChecksum { } @Test - void testFileChecksumSha512() throws IOException, EnforcerRuleException { + void testFileChecksumSha512() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "message"); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java index 46f8ea27..f51a2af9 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/checksum/TestRequireTextFileChecksum.java @@ -19,13 +19,11 @@ package org.apache.maven.enforcer.rules.checksum; import java.io.File; -import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Properties; import org.apache.maven.enforcer.rule.api.EnforcerLogger; -import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rules.checksum.NormalizeLineSeparatorReader.LineSeparator; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; @@ -64,7 +62,7 @@ class TestRequireTextFileChecksum { } @Test - void testFileChecksumMd5NormalizedFromUnixToWindows() throws IOException, EnforcerRuleException { + void testFileChecksumMd5NormalizedFromUnixToWindows() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "line1\nline2\n"); @@ -78,7 +76,7 @@ class TestRequireTextFileChecksum { } @Test - void testFileChecksumMd5NormalizedFromWindowsToWindows() throws IOException, EnforcerRuleException { + void testFileChecksumMd5NormalizedFromWindowsToWindows() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "line1\r\nline2\r\n"); @@ -92,7 +90,7 @@ class TestRequireTextFileChecksum { } @Test - void testFileChecksumMd5NormalizedFromWindowsToUnix() throws IOException, EnforcerRuleException { + void testFileChecksumMd5NormalizedFromWindowsToUnix() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "line1\r\nline2\r\n"); @@ -106,7 +104,7 @@ class TestRequireTextFileChecksum { } @Test - void testFileChecksumMd5NormalizedFromUnixToUnix() throws IOException, EnforcerRuleException { + void testFileChecksumMd5NormalizedFromUnixToUnix() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "line1\nline2\n"); @@ -120,7 +118,7 @@ class TestRequireTextFileChecksum { } @Test - void testFileChecksumMd5NormalizedWithMissingFileCharsetParameter() throws IOException, EnforcerRuleException { + void testFileChecksumMd5NormalizedWithMissingFileCharsetParameter() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); FileUtils.fileWrite(f, "line1\nline2\n"); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/dependency/RequireReleaseDepsTest.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/dependency/RequireReleaseDepsTest.java index 25f516f3..989ecc0e 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/dependency/RequireReleaseDepsTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/dependency/RequireReleaseDepsTest.java @@ -18,7 +18,6 @@ */ package org.apache.maven.enforcer.rules.dependency; -import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -65,7 +64,7 @@ class RequireReleaseDepsTest { private RequireReleaseDeps rule; @Test - void testSearchNonTransitive() throws IOException { + void testSearchNonTransitive() throws Exception { when(session.getCurrentProject()).thenReturn(project); when(project.getDependencyArtifacts()).thenReturn(ARTIFACT_STUB_FACTORY.getScopedArtifacts()); rule.setSearchTransitive(false); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java index 6f2d82e0..918947be 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesDontExist.java @@ -19,7 +19,6 @@ package org.apache.maven.enforcer.rules.files; import java.io.File; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Arrays; @@ -47,7 +46,7 @@ class TestRequireFilesDontExist { private final RequireFilesDontExist rule = new RequireFilesDontExist(); @Test - void testFileExists() throws IOException { + void testFileExists() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); rule.setFilesList(Collections.singletonList(f)); @@ -59,7 +58,7 @@ class TestRequireFilesDontExist { } @Test - void testFileOsIndependentDoesNotExist() throws EnforcerRuleException { + void testFileOsIndependentDoesNotExist() throws Exception { // a file differing only in case is not the requested file, whatever the filesystem says rule.setFilesList(Collections.singletonList(new File("POM.xml"))); @@ -76,7 +75,7 @@ class TestRequireFilesDontExist { } @Test - void testEmptyFileAllowNull() throws EnforcerRuleException { + void testEmptyFileAllowNull() throws Exception { rule.setFilesList(Collections.singletonList(null)); rule.setAllowNulls(true); rule.execute(); @@ -93,7 +92,7 @@ class TestRequireFilesDontExist { } @Test - void testEmptyFileListAllowNull() throws EnforcerRuleException { + void testEmptyFileListAllowNull() throws Exception { rule.setFilesList(Collections.emptyList()); assertTrue(rule.getFiles().isEmpty()); rule.setAllowNulls(true); @@ -101,7 +100,7 @@ class TestRequireFilesDontExist { } @Test - void testDeletedFileDetected() throws EnforcerRuleException, IOException { + void testDeletedFileDetected() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); rule.setFilesList(Collections.singletonList(f)); @@ -156,7 +155,7 @@ class TestRequireFilesDontExist { } @Test - void testDeletedFileDetectedSatisfyAny() throws EnforcerRuleException, IOException { + void testDeletedFileDetectedSatisfyAny() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java index 3dae1ad8..ed119b11 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesExist.java @@ -19,7 +19,6 @@ package org.apache.maven.enforcer.rules.files; import java.io.File; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Arrays; @@ -153,7 +152,7 @@ class TestRequireFilesExist { } @Test - void testFileExistsSatisfyAny() throws EnforcerRuleException, IOException { + void testFileExistsSatisfyAny() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java index e78f1916..8abccad0 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/files/TestRequireFilesSize.java @@ -21,7 +21,6 @@ package org.apache.maven.enforcer.rules.files; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -75,7 +74,7 @@ class TestRequireFilesSize { } @Test - void testFileExists() throws EnforcerRuleException, IOException { + void testFileExists() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); rule.setFilesList(Collections.singletonList(f)); @@ -93,14 +92,14 @@ class TestRequireFilesSize { } @Test - void testEmptyFileAllowNull() throws EnforcerRuleException { + void testEmptyFileAllowNull() throws Exception { rule.setFilesList(Collections.singletonList(null)); rule.setAllowNulls(true); rule.execute(); } @Test - void testEmptyFileList() throws EnforcerRuleException, IOException { + void testEmptyFileList() throws Exception { rule.setFilesList(Collections.emptyList()); assertTrue(rule.getFiles().isEmpty()); @@ -120,7 +119,7 @@ class TestRequireFilesSize { } @Test - void testFileDoesNotExist() throws IOException { + void testFileDoesNotExist() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); f.delete(); assertFalse(f.exists()); @@ -142,7 +141,7 @@ class TestRequireFilesSize { } @Test - void testFileTooSmall() throws IOException { + void testFileTooSmall() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); rule.setFilesList(Collections.singletonList(f)); rule.setMinsize(10); @@ -153,7 +152,7 @@ class TestRequireFilesSize { } @Test - void testFileTooBig() throws IOException { + void testFileTooBig() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); try (BufferedWriter out = new BufferedWriter(new FileWriter(f))) { out.write("123456789101112131415"); @@ -169,7 +168,7 @@ class TestRequireFilesSize { } @Test - void testRequireFilesSizeSatisfyAny() throws EnforcerRuleException, IOException { + void testRequireFilesSizeSatisfyAny() throws Exception { File f = File.createTempFile("junit", null, temporaryFolder); try (BufferedWriter out = new BufferedWriter(new FileWriter(f))) { out.write("123456789101112131415"); @@ -222,7 +221,7 @@ class TestRequireFilesSize { } @Test - void testDirectoryContentOverUpperBound() throws IOException { + void testDirectoryContentOverUpperBound() throws Exception { Path d = Files.createTempDirectory(temporaryFolder.toPath(), "junit"); long totalSize = d.toFile().length(); for (int i = 0; i < 3; i++) { @@ -240,7 +239,7 @@ class TestRequireFilesSize { } @Test - void testDirectoryContentUnderLowerBound() throws IOException, EnforcerRuleException { + void testDirectoryContentUnderLowerBound() throws Exception { Path d = Files.createTempDirectory(temporaryFolder.toPath(), "junit"); long totalSize = d.toFile().length(); for (int i = 0; i < 3; i++) { diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/utils/TestArtifactMatcher.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/utils/TestArtifactMatcher.java index 8d42f0e4..41a994fc 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/utils/TestArtifactMatcher.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/utils/TestArtifactMatcher.java @@ -73,7 +73,7 @@ class TestArtifactMatcher { } @Test - void testPattern() throws InvalidVersionSpecificationException { + void testPattern() throws Exception { assertPatternDoesMatch("groupId:artifactId:1.0:jar:compile", "groupId", "artifactId", "1.0", "compile", "jar"); assertPatternDoesMatch("groupId:artifactId:1.0:jar:compile", "groupId", "artifactId", "1.0", "", ""); @@ -200,7 +200,7 @@ class TestArtifactMatcher { * @throws InvalidVersionSpecificationException the invalid version specification exception */ @Test - void testContainsVersion() throws InvalidVersionSpecificationException { + void testContainsVersion() throws Exception { ArtifactVersion version = new DefaultArtifactVersion("2.0.5"); // test ranges assertTrue(ArtifactMatcher.containsVersion(VersionRange.createFromVersionSpec("[2.0.5,)"), version)); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestMavenVersion.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestMavenVersion.java index 820dde96..e1f4bdb1 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestMavenVersion.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestMavenVersion.java @@ -60,7 +60,7 @@ class TestMavenVersion { * @throws EnforcerRuleException the enforcer rule exception */ @Test - void testRule() throws EnforcerRuleException { + void testRule() throws Exception { when(runtimeInformation.getMavenVersion()).thenReturn("3.0"); @@ -90,7 +90,7 @@ class TestMavenVersion { * @throws EnforcerRuleException the enforcer rule exception */ @Test - void checkRequireVersionMatrix() throws EnforcerRuleException { + void checkRequireVersionMatrix() throws Exception { when(runtimeInformation.getMavenVersion()).thenReturn("3.6.1"); rule.setVersion("3.6.0"); diff --git a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestRequireJavaVersion.java b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestRequireJavaVersion.java index bb4ea908..b86254bf 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestRequireJavaVersion.java +++ b/enforcer-rules/src/test/java/org/apache/maven/enforcer/rules/version/TestRequireJavaVersion.java @@ -87,7 +87,7 @@ class TestRequireJavaVersion { * @throws EnforcerRuleException the enforcer rule exception */ @Test - void settingsTheJavaVersionAsNormalizedVersionShouldNotFail() throws EnforcerRuleException { + void settingsTheJavaVersionAsNormalizedVersionShouldNotFail() throws Exception { String normalizedJDKVersion = RequireJavaVersion.normalizeJDKVersion(SystemUtils.JAVA_VERSION); rule.setVersion(normalizedJDKVersion); @@ -103,7 +103,7 @@ class TestRequireJavaVersion { * is not in the exact required range. The rule must accept the raw runtime string first (#967). */ @Test - void exactFivePartJavaVersionIsAllowedEvenWhenNormalizedFormDiffers() throws EnforcerRuleException { + void exactFivePartJavaVersionIsAllowedEvenWhenNormalizedFormDiffers() throws Exception { String exact = "21.0.10.0.1"; rule.enforceVersion("JDK", exact, new DefaultArtifactVersion(exact)); } @@ -115,7 +115,7 @@ class TestRequireJavaVersion { } @Test - void settingsTheJavaVersionAsExactRuntimeVersionShouldNotFail() throws EnforcerRuleException { + void settingsTheJavaVersionAsExactRuntimeVersionShouldNotFail() throws Exception { rule.setVersion(SystemUtils.JAVA_VERSION); rule.execute(); } diff --git a/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java b/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java index a744f2de..f1c412e0 100644 --- a/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java +++ b/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java @@ -350,7 +350,7 @@ class TestEnforceMojo { } @Test - void testFailIfNoTests() throws MojoExecutionException { + void testFailIfNoTests() throws Exception { mojo.setFail(false); mojo.setFailIfNoRules(false); @@ -363,7 +363,7 @@ class TestEnforceMojo { } @Test - void testFailIfBothRuleOverridePropertiesAreSet() throws MojoExecutionException { + void testFailIfBothRuleOverridePropertiesAreSet() throws Exception { mojo.setFail(false); List<String> rules = Arrays.asList("rule1", "rule2"); @@ -376,7 +376,7 @@ class TestEnforceMojo { } @Test - void testShouldPrintWarnWhenUsingDeprecatedRulesProperty() throws MojoExecutionException { + void testShouldPrintWarnWhenUsingDeprecatedRulesProperty() throws Exception { mojo.setFail(false); Log logSpy = setupLogSpy(); @@ -388,7 +388,7 @@ class TestEnforceMojo { } @Test - void testShouldNotPrintWarnWhenDeprecatedRulesPropertyIsEmpty() throws MojoExecutionException { + void testShouldNotPrintWarnWhenDeprecatedRulesPropertyIsEmpty() throws Exception { mojo.setFail(false); Log logSpy = setupLogSpy();
