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 a4611a3fbaf38fff65ca350228e93f180bed4991 Author: Sylwester Lachiewicz <[email protected]> AuthorDate: Mon Nov 15 21:15:58 2021 +0100 [MENFORCER-372] Small tests cleanup --- .../enforcer/BanDistributionManagement.java | 4 +- .../plugins/enforcer/RequireNoRepositories.java | 4 +- .../enforcer/BanDistributionManagementTest.java | 25 +--- .../enforcer/BannedDependenciesTestSetup.java | 13 +- .../maven/plugins/enforcer/EnforcerTestUtils.java | 16 +-- .../enforcer/ReactorModuleConvergenceTest.java | 29 ++-- .../plugins/enforcer/RequireActiveProfileTest.java | 15 +-- .../plugins/enforcer/RequirePrerequisiteTest.java | 5 - .../enforcer/RequireUpperBoundDepsTest.java | 5 +- .../enforcer/TestAbstractVersionEnforcer.java | 2 +- .../plugins/enforcer/TestBannedDependencies.java | 75 +++-------- .../plugins/enforcer/TestBannedRepositories.java | 7 +- .../plugins/enforcer/TestEvaluateBeanshell.java | 150 +++++++++------------ .../enforcer/TestRequireEnvironmentVariable.java | 4 - .../plugins/enforcer/TestRequireFileChecksum.java | 24 +--- .../enforcer/TestRequireFilesDontExist.java | 8 +- .../plugins/enforcer/TestRequireFilesExist.java | 5 +- .../plugins/enforcer/TestRequireFilesSize.java | 9 +- .../plugins/enforcer/TestRequireJavaVendor.java | 4 - .../plugins/enforcer/TestRequireJavaVersion.java | 1 - .../enforcer/TestRequireNoRepositories.java | 11 +- .../maven/plugins/enforcer/TestRequireOS.java | 5 +- .../enforcer/TestRequirePluginVersions.java | 30 ++--- .../plugins/enforcer/TestRequireProperty.java | 4 - .../plugins/enforcer/TestRequireReleaseDeps.java | 4 +- .../enforcer/TestRequireReleaseVersion.java | 6 +- .../enforcer/TestRequireTextFileChecksum.java | 2 +- .../enforcer/utils/EnforcerRuleUtilsHelper.java | 4 +- .../enforcer/utils/TestArtifactMatcher.java | 15 +-- .../apache/maven/plugins/enforcer/EnforceMojo.java | 3 +- .../enforcer/TestDefaultEnforcementRuleHelper.java | 3 +- 31 files changed, 165 insertions(+), 327 deletions(-) diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java index 601b56f..3f2d846 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java @@ -53,13 +53,11 @@ public class BanDistributionManagement */ private boolean allowSite = false; - private Log logger; - @Override public void execute( EnforcerRuleHelper helper ) throws EnforcerRuleException { - logger = helper.getLog(); + Log logger = helper.getLog(); try { diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java index 23a21dd..ec784db 100644 --- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java +++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java @@ -114,14 +114,12 @@ public class RequireNoRepositories { this.allowSnapshotPluginRepositories = allowSnapshotPluginRepositories; } - - private Log logger; @Override public void execute( EnforcerRuleHelper helper ) throws EnforcerRuleException { - logger = helper.getLog(); + Log logger = helper.getLog(); MavenSession session; try diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BanDistributionManagementTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BanDistributionManagementTest.java index 2d27063..790c610 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BanDistributionManagementTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BanDistributionManagementTest.java @@ -63,12 +63,10 @@ public class BanDistributionManagementTest * </repository> * </distributionManagement> * </pre> - * - * @throws Exception if any occurs + * */ @Test public void shouldThrowExceptionIfDistributionManagementIsDefinedWithRepository() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { BanDistributionManagement rule = @@ -89,12 +87,10 @@ public class BanDistributionManagementTest * </snapshotRepository> * </distributionManagement> * </pre> - * - * @throws Exception if any occurs + * */ @Test public void shouldThrowExceptionIfDistributionManagementIsDefinedWithRepositorySnapshotRepository() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { BanDistributionManagement rule = @@ -118,12 +114,10 @@ public class BanDistributionManagementTest * </site> * </distributionManagement> * </pre> - * - * @throws Exception if any occurs + * */ @Test public void shouldThrowExceptionIfDistributionManagementIsDefinedWithRepositorySnapshotRepositorySite() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { BanDistributionManagement rule = @@ -244,19 +238,14 @@ public class BanDistributionManagementTest when( parentProject.getOriginalModel() ).thenReturn( model ); when( project.getParent() ).thenReturn( parentProject ); - BanDistributionManagement rule = setupEnforcerRule(); - - return rule; + return setupEnforcerRule(); } private BanDistributionManagement setupProjectWithoutDistributionManagement() throws ExpressionEvaluationException { project = setupProject( null ); - - BanDistributionManagement rule = setupEnforcerRule(); - - return rule; + return setupEnforcerRule(); } private BanDistributionManagement setupProjectWithDistributionManagement( DeploymentRepository repository, @@ -274,9 +263,7 @@ public class BanDistributionManagementTest when( project.getParent() ).thenReturn( mock( MavenProject.class ) ); when( project.isExecutionRoot() ).thenReturn( true ); - BanDistributionManagement rule = setupEnforcerRule(); - - return rule; + return setupEnforcerRule(); } private MavenProject setupProject( DistributionManagement distributionManagement ) diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java index 659de75..141ac75 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/BannedDependenciesTestSetup.java @@ -36,8 +36,8 @@ public class BannedDependenciesTestSetup public BannedDependenciesTestSetup() throws IOException { - this.excludes = new ArrayList<String>(); - this.includes = new ArrayList<String>(); + this.excludes = new ArrayList<>(); + this.includes = new ArrayList<>(); ArtifactStubFactory factory = new ArtifactStubFactory(); @@ -56,11 +56,11 @@ public class BannedDependenciesTestSetup private List<String> excludes; - private List<String> includes; + private final List<String> includes; - private BannedDependencies rule; + private final BannedDependencies rule; - private EnforcerRuleHelper helper; + private final EnforcerRuleHelper helper; public void setSearchTransitive( boolean searchTransitive ) { @@ -94,7 +94,7 @@ public class BannedDependenciesTestSetup private BannedDependencies newBannedDependenciesRule() { - BannedDependencies rule = new BannedDependencies() + return new BannedDependencies() { @Override protected Set<Artifact> getDependenciesToCheck( ProjectBuildingRequest buildingRequest ) @@ -106,7 +106,6 @@ public class BannedDependenciesTestSetup return isSearchTransitive() ? project.getArtifacts() : project.getDependencyArtifacts(); } }; - return rule; } } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java index 430a2fd..bcbcccc 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java @@ -29,7 +29,6 @@ import java.util.Properties; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; -import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResult; @@ -44,7 +43,6 @@ import org.apache.maven.plugins.enforcer.utils.MockEnforcerExpressionEvaluator; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingRequest; import org.apache.maven.shared.dependency.graph.DependencyCollectorBuilder; -import org.apache.maven.shared.dependency.graph.DependencyCollectorBuilderException; import org.apache.maven.shared.dependency.graph.internal.DefaultDependencyNode; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator; @@ -147,20 +145,10 @@ public final class EnforcerTestUtils child2.setChildren( Collections.emptyList() ); node.setChildren( Arrays.asList( child1, child2 ) ); - DependencyCollectorBuilder dependencyCollectorBuilder = new DependencyCollectorBuilder() - { - @Override - public org.apache.maven.shared.dependency.graph.DependencyNode collectDependencyGraph( ProjectBuildingRequest buildingRequest, - ArtifactFilter filter ) - throws DependencyCollectorBuilderException - { - return node; - } - }; - try { - Mockito.when( container.lookup( DependencyCollectorBuilder.class ) ).thenReturn( dependencyCollectorBuilder ); + when( container.lookup( DependencyCollectorBuilder.class ) ) + .thenReturn( ( buildingRequest, filter ) -> node ); } catch ( ComponentLookupException e ) { diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java index 636ec49..7f6348d 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergenceTest.java @@ -75,14 +75,14 @@ public class ReactorModuleConvergenceTest public void shouldNotFailWithNoProject() throws EnforcerRuleException { - setupSortedProjects( Collections.<MavenProject>emptyList() ); + setupSortedProjects( Collections.emptyList() ); rule.execute( helper ); } @Test public void shouldNotFailWithAValidProject() - throws EnforcerRuleException, ExpressionEvaluationException + throws EnforcerRuleException { MavenProject mp1 = createProjectParent(); MavenProject mp2 = createProjectChild1( mp1 ); @@ -96,7 +96,6 @@ public class ReactorModuleConvergenceTest @Test public void shouldFailWithWrongVersionInOneChild() - throws EnforcerRuleException, ExpressionEvaluationException { assertThrows( EnforcerRuleException.class, () -> { MavenProject mp1 = createProjectParent(); @@ -116,7 +115,6 @@ public class ReactorModuleConvergenceTest @Test public void shouldFailWithWrongParent() - throws EnforcerRuleException, ExpressionEvaluationException { assertThrows( EnforcerRuleException.class, () -> { MavenProject mp1 = createProjectParent(); @@ -126,7 +124,7 @@ public class ReactorModuleConvergenceTest when( wrongParentVerison.getArtifactId() ).thenReturn( "m1" ); when( wrongParentVerison.getVersion() ).thenReturn( "1.1-SNAPSHOT" ); when( wrongParentVerison.getId() ).thenReturn( "org.apache.enforcer:m1:jar:1.1-SNAPSHOT" ); - when( wrongParentVerison.getDependencies() ).thenReturn( Collections.<Dependency>emptyList() ); + when( wrongParentVerison.getDependencies() ).thenReturn( Collections.emptyList() ); MavenProject mp2 = createProjectChild2( wrongParentVerison ); MavenProject mp3 = createProjectChild2( mp1 ); @@ -144,7 +142,7 @@ public class ReactorModuleConvergenceTest @Test public void shouldNotFailWithACompanyParent() - throws EnforcerRuleException, ExpressionEvaluationException + throws EnforcerRuleException { MavenProject companyParent = createCompanyParent(); MavenProject mp1 = createProjectParent( companyParent ); @@ -160,7 +158,6 @@ public class ReactorModuleConvergenceTest @Test public void shouldFailWithMissingParentsInReactory() - throws EnforcerRuleException, ExpressionEvaluationException { assertThrows( EnforcerRuleException.class, () -> { MavenProject mp1 = createProjectParent(); @@ -176,7 +173,6 @@ public class ReactorModuleConvergenceTest @Test public void shouldFailWithAParentWhichIsNotPartOfTheReactory() - throws EnforcerRuleException, ExpressionEvaluationException { assertThrows( EnforcerRuleException.class, () -> { MavenProject mp1 = createProjectParent(); @@ -186,7 +182,7 @@ public class ReactorModuleConvergenceTest when( wrongParentVerison.getArtifactId() ).thenReturn( "m1" ); when( wrongParentVerison.getVersion() ).thenReturn( "1.0-SNAPSHOT" ); when( wrongParentVerison.getId() ).thenReturn( "org.apache.enforcer:m1:jar:1.0-SNAPSHOT" ); - when( wrongParentVerison.getDependencies() ).thenReturn( Collections.<Dependency>emptyList() ); + when( wrongParentVerison.getDependencies() ).thenReturn( Collections.emptyList() ); MavenProject mp2 = createProjectChild2( wrongParentVerison ); MavenProject mp3 = createProjectChild2( mp1 ); @@ -204,13 +200,13 @@ public class ReactorModuleConvergenceTest @Test public void shouldNotFailWithDependencyInReactory() - throws EnforcerRuleException, ExpressionEvaluationException + throws EnforcerRuleException { MavenProject mp1 = createProjectParent(); MavenProject mp2 = createProjectChild1( mp1 ); Dependency goodDependency = createDependency( "org.junit", "junit", "2.0" ); - List<Dependency> depListMP2 = Arrays.asList( goodDependency ); + List<Dependency> depListMP2 = Arrays. asList( goodDependency ); when( mp2.getDependencies() ).thenReturn( depListMP2 ); MavenProject mp3 = createProjectChild2( mp1 ); @@ -226,7 +222,6 @@ public class ReactorModuleConvergenceTest @Test public void shouldFailWithWrongDependencyInReactor() - throws EnforcerRuleException, ExpressionEvaluationException { assertThrows( EnforcerRuleException.class, () -> { MavenProject mp1 = createProjectParent(); @@ -275,7 +270,7 @@ public class ReactorModuleConvergenceTest when( mp2.getArtifactId() ).thenReturn( "m1" ); when( mp2.getVersion() ).thenReturn( "1.1-SNAPSHOT" ); when( mp2.getId() ).thenReturn( "org.apache.enforcer:m1:jar:1.1-SNAPSHOT" ); - when( mp2.getDependencies() ).thenReturn( Collections.<Dependency>emptyList() ); + when( mp2.getDependencies() ).thenReturn( Collections.emptyList() ); return mp2; } @@ -287,7 +282,7 @@ public class ReactorModuleConvergenceTest when( mp3.getArtifactId() ).thenReturn( "m2" ); when( mp3.getVersion() ).thenReturn( "1.0-SNAPSHOT" ); when( mp3.getId() ).thenReturn( "org.apache.enforcer:m2:jar:1.0-SNAPSHOT" ); - when( mp3.getDependencies() ).thenReturn( Collections.<Dependency>emptyList() ); + when( mp3.getDependencies() ).thenReturn( Collections.emptyList() ); return mp3; } @@ -299,7 +294,7 @@ public class ReactorModuleConvergenceTest when( mp2.getArtifactId() ).thenReturn( "m1" ); when( mp2.getVersion() ).thenReturn( "1.0-SNAPSHOT" ); when( mp2.getId() ).thenReturn( "org.apache.enforcer:m1:jar:1.0-SNAPSHOT" ); - when( mp2.getDependencies() ).thenReturn( Collections.<Dependency>emptyList() ); + when( mp2.getDependencies() ).thenReturn( Collections.emptyList() ); return mp2; } @@ -310,7 +305,7 @@ public class ReactorModuleConvergenceTest when( nonReactorParent.getArtifactId() ).thenReturn( "parent" ); when( nonReactorParent.getVersion() ).thenReturn( "1.1" ); when( nonReactorParent.getId() ).thenReturn( "org.apache.enforcer.parent:parent:jar:1.1" ); - when( nonReactorParent.getDependencies() ).thenReturn( Collections.<Dependency>emptyList() ); + when( nonReactorParent.getDependencies() ).thenReturn( Collections.emptyList() ); return nonReactorParent; } @@ -331,7 +326,7 @@ public class ReactorModuleConvergenceTest when( mp1.getArtifactId() ).thenReturn( "parent" ); when( mp1.getVersion() ).thenReturn( "1.0-SNAPSHOT" ); when( mp1.getId() ).thenReturn( "org.apache.enforcer:parent:pom:1.0-SNAPSHOT" ); - when( mp1.getDependencies() ).thenReturn( Collections.<Dependency>emptyList() ); + when( mp1.getDependencies() ).thenReturn( Collections.emptyList() ); return mp1; } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java index c95aaf8..becd7e8 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireActiveProfileTest.java @@ -63,7 +63,7 @@ public class RequireActiveProfileTest public void testNoActiveProfilesInProjectAndNoProfilesExpectedToBeActivated() throws EnforcerRuleException { - when( project.getInjectedProfileIds() ).thenReturn( Collections.<String, List<String>>emptyMap() ); + when( project.getInjectedProfileIds() ).thenReturn( Collections.emptyMap() ); rule.execute( helper ); } @@ -72,8 +72,7 @@ public class RequireActiveProfileTest public void testActiveProfileAndExpectedActiveProfile() throws EnforcerRuleException { - Map<String, List<String>> profiles = - Collections.<String, List<String>>singletonMap( "pom", Arrays.asList( "profile-2" ) ); + Map<String, List<String>> profiles = Collections.singletonMap( "pom", Arrays.asList( "profile-2" ) ); when( project.getInjectedProfileIds() ).thenReturn( profiles ); @@ -84,10 +83,9 @@ public class RequireActiveProfileTest @Test public void testNoActiveProfileButTheRuleRequestedAnActiveProfile() - throws EnforcerRuleException { assertThrows( EnforcerRuleException.class, () -> { - when( project.getInjectedProfileIds() ).thenReturn( Collections.<String, List<String>>emptyMap() ); + when( project.getInjectedProfileIds() ).thenReturn( Collections.emptyMap() ); rule.setProfiles( "profile-2" ); @@ -99,10 +97,9 @@ public class RequireActiveProfileTest @Test public void testNoActiveProfileButWeExpectToGetAnExceptionWithAll() - throws EnforcerRuleException { assertThrows( EnforcerRuleException.class, () -> { - when( project.getInjectedProfileIds() ).thenReturn( Collections.<String, List<String>>emptyMap() ); + when( project.getInjectedProfileIds() ).thenReturn( Collections.emptyMap() ); rule.setProfiles( "profile-2" ); rule.setAll( true ); @@ -144,7 +141,6 @@ public class RequireActiveProfileTest @Test public void testTwoActiveProfilesWithTwoRequiredProfilesWhereOneOfThemIsNotPartOfTheActiveProfiles() - throws EnforcerRuleException, ExpressionEvaluationException { assertThrows( EnforcerRuleException.class, () -> { Map<String, List<String>> profiles = @@ -163,7 +159,6 @@ public class RequireActiveProfileTest @Test public void testOneActiveProfilesWithTwoRequiredProfiles() - throws EnforcerRuleException, ExpressionEvaluationException { assertThrows( EnforcerRuleException.class, () -> { Map<String, List<String>> profiles = Collections.singletonMap( "pom", Arrays.asList( "profile-X" ) ); @@ -181,7 +176,7 @@ public class RequireActiveProfileTest @Test public void testOneActiveProfileWithTwoProfilesButNotAll() - throws EnforcerRuleException, ExpressionEvaluationException + throws EnforcerRuleException { Map<String, List<String>> profiles = Collections.singletonMap( "pom", Arrays.asList( "profile-X" ) ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java index e351001..78be3d3 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequirePrerequisiteTest.java @@ -55,7 +55,6 @@ public class RequirePrerequisiteTest @Test public void testNoPrerequisite() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { RequirePrerequisite rule = new RequirePrerequisite(); @@ -75,7 +74,6 @@ public class RequirePrerequisiteTest @Test public void testLowerMavenPrerequisite() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { when( project.getPrerequisites() ).thenReturn( new Prerequisites() ); @@ -88,7 +86,6 @@ public class RequirePrerequisiteTest @Test public void testLowerMavenRangePrerequisite() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { when( project.getPrerequisites() ).thenReturn( new Prerequisites() ); @@ -102,7 +99,6 @@ public class RequirePrerequisiteTest @Test public void testMavenRangesPrerequisite() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { Prerequisites prerequisites = new Prerequisites(); @@ -147,7 +143,6 @@ public class RequirePrerequisiteTest @Test public void testMatchingPackagings() - throws Exception { assertThrows( EnforcerRuleException.class, () -> { when( project.getPackaging() ).thenReturn( "maven-plugin" ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDepsTest.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDepsTest.java index 67d80d5..f519ae1 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDepsTest.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDepsTest.java @@ -1,7 +1,5 @@ package org.apache.maven.plugins.enforcer; -import org.junit.jupiter.api.Assertions; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -31,6 +29,7 @@ import org.apache.maven.plugin.testing.ArtifactStubFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.junit.jupiter.api.Assertions.fail; public class RequireUpperBoundDepsTest { @@ -49,7 +48,7 @@ public class RequireUpperBoundDepsTest try { rule.execute( helper ); - Assertions.fail( "Did not detect upper bounds error" ); + fail( "Did not detect upper bounds error" ); } catch ( EnforcerRuleException ex ) { diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java index 27660f2..4337e7c 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java @@ -126,7 +126,7 @@ public class TestAbstractVersionEnforcer } else { - fail( "Received wrong exception. Expected EnforcerRuleExeption. Received:" + e.toString() ); + fail( "Received wrong exception. Expected EnforcerRuleExeption. Received:" + e ); } } } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java index 9965a85..e2aaaf5 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java @@ -97,56 +97,38 @@ public class TestBannedDependencies @Test public void testGroupIdArtifactIdVersion() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "testGroupId:release:1.0" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "testGroupId:release:1.0" ) ); } @Test public void testGroupIdArtifactId() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "testGroupId:release" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "testGroupId:release" ) ); } @Test public void testGroupId() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "testGroupId" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "testGroupId" ) ); } @Test public void testSpaceTrimmingGroupIdArtifactIdVersion() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( " testGroupId : release : 1.0 " ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( " testGroupId : release : 1.0 " ) ); } @Test public void groupIdArtifactIdVersionType() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "g:a:1.0:war" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "g:a:1.0:war" ) ); } @Test public void groupIdArtifactIdVersionTypeScope() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "g:a:1.0:war:compile" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "g:a:1.0:war:compile" ) ); } // @Test(expected = EnforcerRuleException.class) @@ -184,29 +166,20 @@ public class TestBannedDependencies @Test public void testWildCardForGroupIdArtifactId() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "*:release" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "*:release" ) ); } @Test public void testWildcardForGroupIdWildcardForArtifactIdVersion() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "*:*:1.0" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "*:*:1.0" ) ); } @Test public void testWildcardForGroupIdArtifactIdWildcardForVersion() - throws Exception { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "*:release:*" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "*:release:*" ) ); } } @@ -232,29 +205,20 @@ public class TestBannedDependencies @Test public void groupIdArtifactIdWithWildcard() - throws EnforcerRuleException { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "testGroupId:re*" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "testGroupId:re*" ) ); } @Test public void groupIdArtifactIdVersionTypeWildcardScope() - throws EnforcerRuleException { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "g:a:1.0:war:co*" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "g:a:1.0:war:co*" ) ); } @Test public void groupIdArtifactIdVersionWildcardTypeScope() - throws EnforcerRuleException { - assertThrows( EnforcerRuleException.class, () -> { - addExcludeAndRunRule( "g:a:1.0:w*:compile" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addExcludeAndRunRule( "g:a:1.0:w*:compile" ) ); } } @@ -278,20 +242,14 @@ public class TestBannedDependencies @Test public void onlyThreeColonsWithoutAnythingElse() - throws EnforcerRuleException { - assertThrows( IllegalArgumentException.class, () -> { - addExcludeAndRunRule( ":::" ); - } ); + assertThrows( IllegalArgumentException.class, () -> addExcludeAndRunRule( ":::" ) ); } @Test public void onlySevenColonsWithoutAnythingElse() - throws EnforcerRuleException { - assertThrows( IllegalArgumentException.class, () -> { - addExcludeAndRunRule( ":::::::" ); - } ); + assertThrows( IllegalArgumentException.class, () -> addExcludeAndRunRule( ":::::::" ) ); } } @@ -330,11 +288,8 @@ public class TestBannedDependencies @Test public void includeEverythingAndExcludeEveryGroupIdAndScopeRuntimeYYYY() - throws EnforcerRuleException { - assertThrows( EnforcerRuleException.class, () -> { - addIncludeExcludeAndRunRule( "*:test", "*:runtime" ); - } ); + assertThrows( EnforcerRuleException.class, () -> addIncludeExcludeAndRunRule( "*:test", "*:runtime" ) ); } } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java index f513859..ce7ac38 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedRepositories.java @@ -46,7 +46,6 @@ public class TestBannedRepositories @BeforeEach public void setUp() - throws Exception { rule = new BannedRepositories(); rule.setMessage( "my message" ); @@ -86,7 +85,7 @@ public class TestBannedRepositories project.setRemoteArtifactRepositories( repos ); project.setPluginArtifactRepositories( repos ); - List<String> bannedRepositories = new ArrayList<String>(); + List<String> bannedRepositories = new ArrayList<>(); String pattern1 = "http://repo1/*";; bannedRepositories.add( pattern1 ); @@ -118,7 +117,7 @@ public class TestBannedRepositories project.setRemoteArtifactRepositories( repos ); project.setPluginArtifactRepositories( repos ); - List<String> bannedRepositories = new ArrayList<String>(); + List<String> bannedRepositories = new ArrayList<>(); String pattern1 = "http://repo1/*";; bannedRepositories.add( pattern1 ); @@ -143,7 +142,7 @@ public class TestBannedRepositories project.setRemoteArtifactRepositories( repos ); project.setPluginArtifactRepositories( repos ); - List<String> patterns = new ArrayList<String>(); + List<String> patterns = new ArrayList<>(); String pattern1 = "http://repo1/*";; patterns.add( pattern1 ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java index 39c353e..2ddad53 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java @@ -72,7 +72,6 @@ public class TestEvaluateBeanshell @Test public void testRuleFail() - throws Exception { EvaluateBeanshell rule = new EvaluateBeanshell(); // this property should be set by the surefire @@ -94,7 +93,6 @@ public class TestEvaluateBeanshell @Test public void testRuleFailNoMessage() - throws Exception { EvaluateBeanshell rule = new EvaluateBeanshell(); // this property should be set by the surefire @@ -131,13 +129,12 @@ public class TestEvaluateBeanshell } catch ( EnforcerRuleException e ) { - assertFalse( e.getLocalizedMessage().equals( rule.getMessage() ) ); + assertNotEquals( e.getLocalizedMessage(), rule.getMessage() ); } } @Test public void testRuleInvalidBeanshell() - throws Exception { EvaluateBeanshell rule = new EvaluateBeanshell(); rule.setCondition( "this is not valid beanshell" ); @@ -150,7 +147,7 @@ public class TestEvaluateBeanshell } catch ( EnforcerRuleException e ) { - assertFalse( e.getLocalizedMessage().equals( rule.getMessage() ) ); + assertNotEquals( e.getLocalizedMessage(), rule.getMessage() ); } } @@ -165,79 +162,64 @@ public class TestEvaluateBeanshell final List<Runnable> runnables = new ArrayList<>(); - runnables.add( new Runnable() - { - @Override - public void run() - { - final int threadNumber = 0; - MockProject multiProject = new MockProject(); - multiProject.setProperty( "property1", "prop" + threadNumber ); - multiProject.setProperty( "property2", "prop" + threadNumber ); + runnables.add( () -> { + final int threadNumber = 0; + MockProject multiProject = new MockProject(); + multiProject.setProperty( "property1", "prop" + threadNumber ); + multiProject.setProperty( "property2", "prop" + threadNumber ); - EvaluateBeanshell rule = new EvaluateBeanshell(); - rule.setCondition( condition ); - rule.setMessage( "Race condition in thread " + threadNumber ); - EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( multiProject ); - try - { - rule.execute( helper ); + EvaluateBeanshell rule = new EvaluateBeanshell(); + rule.setCondition( condition ); + rule.setMessage( "Race condition in thread " + threadNumber ); + EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( multiProject ); + try + { + rule.execute( helper ); - } - catch ( EnforcerRuleException e ) - { - throw new RuntimeException( e ); - } + } + catch ( EnforcerRuleException e ) + { + throw new RuntimeException( e ); } } ); - runnables.add( new Runnable() - { - @Override - public void run() + runnables.add( () -> { + final int threadNumber = 1; + MockProject multiProject = new MockProject(); + multiProject.setProperty( "property1", "prop" + threadNumber ); + multiProject.setProperty( "property2", "prop" + threadNumber ); + + EvaluateBeanshell rule = new EvaluateBeanshell(); + rule.setCondition( condition ); + rule.setMessage( "Race condition in thread " + threadNumber ); + EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( multiProject ); + try { - final int threadNumber = 1; - MockProject multiProject = new MockProject(); - multiProject.setProperty( "property1", "prop" + threadNumber ); - multiProject.setProperty( "property2", "prop" + threadNumber ); + rule.execute( helper ); - EvaluateBeanshell rule = new EvaluateBeanshell(); - rule.setCondition( condition ); - rule.setMessage( "Race condition in thread " + threadNumber ); - EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( multiProject ); - try - { - rule.execute( helper ); + } + catch ( EnforcerRuleException e ) + { + throw new RuntimeException( e ); + } - } - catch ( EnforcerRuleException e ) - { - throw new RuntimeException( e ); - } + } ); + runnables.add( () -> { + final int threadNumber = 2; + MockProject multiProject = new MockProject(); + multiProject.setProperty( "property1", "prop" + threadNumber ); + multiProject.setProperty( "property2", "prop" + threadNumber ); + EvaluateBeanshell rule = new EvaluateBeanshell(); + rule.setCondition( condition ); + rule.setMessage( "Race condition in thread " + threadNumber ); + EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( multiProject ); + try + { + rule.execute( helper ); } - } ); - runnables.add( new Runnable() - { - @Override - public void run() + catch ( EnforcerRuleException e ) { - final int threadNumber = 2; - MockProject multiProject = new MockProject(); - multiProject.setProperty( "property1", "prop" + threadNumber ); - multiProject.setProperty( "property2", "prop" + threadNumber ); - - EvaluateBeanshell rule = new EvaluateBeanshell(); - rule.setCondition( condition ); - rule.setMessage( "Race condition in thread " + threadNumber ); - EnforcerRuleHelper helper = EnforcerTestUtils.getHelper( multiProject ); - try - { - rule.execute( helper ); - } - catch ( EnforcerRuleException e ) - { - throw new RuntimeException( e ); - } + throw new RuntimeException( e ); } } ); @@ -248,7 +230,7 @@ public class TestEvaluateBeanshell throws InterruptedException { final int numThreads = runnables.size(); - final List<Throwable> exceptions = Collections.synchronizedList( new ArrayList<Throwable>() ); + final List<Throwable> exceptions = Collections.synchronizedList( new ArrayList<>() ); final ExecutorService threadPool = Executors.newFixedThreadPool( numThreads ); try { @@ -257,24 +239,20 @@ public class TestEvaluateBeanshell final CountDownLatch allDone = new CountDownLatch( numThreads ); for ( final Runnable submittedTestRunnable : runnables ) { - threadPool.submit( new Runnable() - { - public void run() + threadPool.submit( () -> { + allExecutorThreadsReady.countDown(); + try + { + afterInitBlocker.await(); + submittedTestRunnable.run(); + } + catch ( final Throwable e ) + { + exceptions.add( e ); + } + finally { - allExecutorThreadsReady.countDown(); - try - { - afterInitBlocker.await(); - submittedTestRunnable.run(); - } - catch ( final Throwable e ) - { - exceptions.add( e ); - } - finally - { - allDone.countDown(); - } + allDone.countDown(); } } ); } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java index 727f932..81475ca 100755 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireEnvironmentVariable.java @@ -36,11 +36,9 @@ public class TestRequireEnvironmentVariable /** * Test rule. * - * @throws EnforcerRuleException the enforcer rule exception */ @Test public void testRule() - throws EnforcerRuleException { MockProject project = new MockProject(); project.setProperty( "testProp", "This is a test." ); @@ -75,11 +73,9 @@ public class TestRequireEnvironmentVariable /** * Test rule with regex. * - * @throws EnforcerRuleException the enforcer rule exception */ @Test public void testRuleWithRegex() - throws EnforcerRuleException { EnforcerRuleHelper helper = EnforcerTestUtils.getHelper(); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java index 8de7ee4..6b55d3a 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFileChecksum.java @@ -39,7 +39,7 @@ import org.junit.jupiter.api.io.TempDir; public class TestRequireFileChecksum { - private RequireFileChecksum rule = new RequireFileChecksum(); + private final RequireFileChecksum rule = new RequireFileChecksum(); @TempDir public File temporaryFolder; @@ -74,7 +74,6 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5GivenFileDoesNotExistFailure() - throws IOException, EnforcerRuleException { File f = new File( "nonExistent" ); Throwable exception = assertThrows( EnforcerRuleException.class, () -> { @@ -90,7 +89,6 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5GivenFileDoesNotExistFailureWithMessage() - throws IOException, EnforcerRuleException { File f = new File( "nonExistent" ); String configuredMessage = "testMessageFileDoesNotExist"; @@ -108,7 +106,7 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5GivenFileIsNotReadableFailure() - throws IOException, EnforcerRuleException + throws IOException { File t = File.createTempFile( "junit", null, temporaryFolder ); File f = new File( t.getAbsolutePath() ) @@ -134,7 +132,6 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5GivenFileIsADirectoryFailure() - throws IOException, EnforcerRuleException { File f = temporaryFolder; Throwable exception = assertThrows( EnforcerRuleException.class, () -> { @@ -151,7 +148,6 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5NoFileSpecifiedFailure() - throws IOException, EnforcerRuleException { Throwable exception = assertThrows( EnforcerRuleException.class, () -> { @@ -165,7 +161,6 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5NoChecksumSpecifiedFailure() - throws IOException, EnforcerRuleException { Throwable exception = assertThrows( EnforcerRuleException.class, () -> { @@ -181,7 +176,6 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5NoTypeSpecifiedFailure() - throws IOException, EnforcerRuleException { Throwable exception = assertThrows( EnforcerRuleException.class, () -> { @@ -197,7 +191,7 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5ChecksumMismatchFailure() - throws IOException, EnforcerRuleException + throws IOException { File f = File.createTempFile( "junit", null, temporaryFolder ); Throwable exception = assertThrows( EnforcerRuleException.class, () -> { @@ -215,7 +209,6 @@ public class TestRequireFileChecksum @Test public void testFileChecksumMd5ChecksumMismatchFailureWithMessage() - throws IOException, EnforcerRuleException { String configuredMessage = "testMessage"; Throwable exception = assertThrows( EnforcerRuleException.class, () -> { @@ -288,15 +281,4 @@ public class TestRequireFileChecksum rule.execute( EnforcerTestUtils.getHelper() ); } - private static File newFolder( File root, String... subDirs ) - throws IOException - { - String subFolder = String.join( "/", subDirs ); - File result = new File( root, subFolder ); - if ( !result.mkdirs() ) - { - throw new IOException( "Couldn't create folders " + root ); - } - return result; - } } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java index 72dc8c2..3ddd941 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesDontExist.java @@ -38,11 +38,11 @@ public class TestRequireFilesDontExist @TempDir public File temporaryFolder; - private RequireFilesDontExist rule = new RequireFilesDontExist(); + private final RequireFilesDontExist rule = new RequireFilesDontExist(); @Test public void testFileExists() - throws EnforcerRuleException, IOException + throws IOException { File f = File.createTempFile( "junit", null, temporaryFolder ); @@ -62,7 +62,6 @@ public class TestRequireFilesDontExist @Test public void testEmptyFile() - throws EnforcerRuleException, IOException { rule.setFiles( new File[] { null } ); try @@ -78,7 +77,6 @@ public class TestRequireFilesDontExist @Test public void testEmptyFileAllowNull() - throws EnforcerRuleException, IOException { rule.setFiles( new File[] { null } ); rule.setAllowNulls( true ); @@ -94,7 +92,6 @@ public class TestRequireFilesDontExist @Test public void testEmptyFileList() - throws EnforcerRuleException, IOException { rule.setFiles( new File[] {} ); assertEquals( 0, rule.getFiles().length ); @@ -111,7 +108,6 @@ public class TestRequireFilesDontExist @Test public void testEmptyFileListAllowNull() - throws EnforcerRuleException, IOException { rule.setFiles( new File[] {} ); assertEquals( 0, rule.getFiles().length ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java index 453cb87..3a35a73 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesExist.java @@ -37,7 +37,7 @@ public class TestRequireFilesExist @TempDir public File temporaryFolder; - private RequireFilesExist rule = new RequireFilesExist(); + private final RequireFilesExist rule = new RequireFilesExist(); @Test public void testFileExists() @@ -52,7 +52,6 @@ public class TestRequireFilesExist @Test public void testFileOsIndependentExists() - throws Exception { rule.setFiles( new File[] { new File( "POM.xml" ) } ); @@ -64,7 +63,6 @@ public class TestRequireFilesExist @Test public void testEmptyFile() - throws Exception { rule.setFiles( new File[] { null } ); @@ -85,7 +83,6 @@ public class TestRequireFilesExist @Test public void testEmptyFileList() - throws Exception { rule.setFiles( new File[] {} ); assertEquals( 0, rule.getFiles().length ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java index b72eec0..83e9184 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireFilesSize.java @@ -42,7 +42,7 @@ public class TestRequireFilesSize @TempDir public File temporaryFolder; - private RequireFilesSize rule = new RequireFilesSize(); + private final RequireFilesSize rule = new RequireFilesSize(); @Test public void testFileExists() @@ -57,7 +57,6 @@ public class TestRequireFilesSize @Test public void testEmptyFile() - throws EnforcerRuleException, IOException { rule.setFiles( new File[] { null } ); try @@ -73,7 +72,7 @@ public class TestRequireFilesSize @Test public void testEmptyFileAllowNull() - throws EnforcerRuleException, IOException + throws EnforcerRuleException { rule.setFiles( new File[] { null } ); rule.setAllowNulls( true ); @@ -106,7 +105,7 @@ public class TestRequireFilesSize @Test public void testFileDoesNotExist() - throws EnforcerRuleException, IOException + throws IOException { File f = File.createTempFile( "junit", null, temporaryFolder ); f.delete(); @@ -126,7 +125,7 @@ public class TestRequireFilesSize @Test public void testFileTooSmall() - throws EnforcerRuleException, IOException + throws IOException { File f = File.createTempFile( "junit", null, temporaryFolder ); rule.setFiles( new File[] { f } ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVendor.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVendor.java index a0c065f..b005079 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVendor.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVendor.java @@ -62,7 +62,6 @@ public class TestRequireJavaVendor @Test public void nonMatchingInclude() - throws EnforcerRuleException { // Set the included vendor to something irrelevant underTest.setIncludes( Collections.singletonList( NON_MATCHING_VENDOR ) ); @@ -73,7 +72,6 @@ public class TestRequireJavaVendor @Test public void matchingExclude() - throws EnforcerRuleException { // Set the excluded vendor to current vendor name underTest.setExcludes( Collections.singletonList( SystemUtils.JAVA_VENDOR ) ); @@ -95,7 +93,6 @@ public class TestRequireJavaVendor @Test public void matchingIncludeAndMatchingExclude() - throws EnforcerRuleException { underTest.setExcludes( Collections.singletonList( SystemUtils.JAVA_VENDOR ) ); underTest.setIncludes( Collections.singletonList( SystemUtils.JAVA_VENDOR ) ); @@ -106,7 +103,6 @@ public class TestRequireJavaVendor @Test public void matchAnyExclude() - throws EnforcerRuleException { // Set a bunch of excluded vendors underTest.setExcludes( Arrays.asList( SystemUtils.JAVA_VENDOR, SystemUtils.JAVA_VENDOR + "modified" ) ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java index ff5e079..9b09284 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java @@ -90,7 +90,6 @@ public class TestRequireJavaVersion @Test public void excludingTheCurrentJavaVersionViaRangeThisShouldFailWithException() - throws EnforcerRuleException { assertThrows( EnforcerRuleException.class, () -> { String thisVersion = RequireJavaVersion.normalizeJDKVersion( SystemUtils.JAVA_VERSION ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java index 2d446dd..63cd87d 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireNoRepositories.java @@ -148,7 +148,7 @@ public class TestRequireNoRepositories private MavenProject addRepository( MavenProject project, Repository r ) { Model originalModel = project.getOriginalModel(); - List<Repository> repositories = new ArrayList<Repository>(); + List<Repository> repositories = new ArrayList<>(); repositories.add( r ); when( originalModel.getRepositories() ).thenReturn( repositories ); return project; @@ -157,7 +157,7 @@ public class TestRequireNoRepositories private MavenProject addEmptyRepository( MavenProject project ) { Model originalModel = project.getOriginalModel(); - List<Repository> repositories = new ArrayList<Repository>(); + List<Repository> repositories = new ArrayList<>(); when( originalModel.getRepositories() ).thenReturn( repositories ); return project; } @@ -165,7 +165,7 @@ public class TestRequireNoRepositories private MavenProject addPluginRepository( MavenProject project, Repository r ) { Model originalModel = project.getOriginalModel(); - List<Repository> repositories = new ArrayList<Repository>(); + List<Repository> repositories = new ArrayList<>(); repositories.add( r ); when( originalModel.getPluginRepositories() ).thenReturn( repositories ); return project; @@ -174,7 +174,7 @@ public class TestRequireNoRepositories private MavenProject addEmptyPluginRepository( MavenProject project ) { Model originalModel = project.getOriginalModel(); - List<Repository> repositories = new ArrayList<Repository>(); + List<Repository> repositories = new ArrayList<>(); when( originalModel.getPluginRepositories() ).thenReturn( repositories ); return project; } @@ -197,7 +197,6 @@ public class TestRequireNoRepositories */ @Test public void testAllBannedWithRepository() - throws EnforcerRuleException { assertThrows( EnforcerRuleException.class, () -> { MavenProject baseProject = createStandAloneProject(); @@ -213,7 +212,6 @@ public class TestRequireNoRepositories */ @Test public void testAllBannedWithPluginRepository() - throws EnforcerRuleException { assertThrows( EnforcerRuleException.class, () -> { MavenProject baseProject = createStandAloneProject(); @@ -327,7 +325,6 @@ public class TestRequireNoRepositories @Test public void testAllBannedWithSnapshotRepository() - throws EnforcerRuleException { assertThrows( EnforcerRuleException.class, () -> { MavenProject baseProject = createStandAloneProject(); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireOS.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireOS.java index 3986df8..db3a8c8 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireOS.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireOS.java @@ -54,11 +54,11 @@ public class TestRequireOS rule.displayOSInfo( log, true ); Iterator<String> iter = Os.getValidFamilies().iterator(); - String validFamily = null; + String validFamily; String invalidFamily = null; while ( iter.hasNext() ) { - String fam = (String) iter.next(); + String fam = iter.next(); if ( !Os.isFamily( fam ) ) { invalidFamily = fam; @@ -114,7 +114,6 @@ public class TestRequireOS @Test public void testInvalidFamily() - throws Exception { RequireOS rule = new RequireOS(); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java index 469aab8..3f5cbd7 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java @@ -57,7 +57,7 @@ public class TestRequirePluginVersions // searched for versions before giving up. // banLatest/Release will fail if it is found // anywhere in the list. - List<Plugin> plugins = new ArrayList<Plugin>(); + List<Plugin> plugins = new ArrayList<>(); plugins.add( EnforcerTestUtils.newPlugin( "group", "a-artifact", "1.0" ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo", null ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo", "" ) ); @@ -130,7 +130,7 @@ public class TestRequirePluginVersions source.setGroupId( "group" ); // setup the plugins. - List<Plugin> plugins = new ArrayList<Plugin>(); + List<Plugin> plugins = new ArrayList<>(); plugins.add( EnforcerTestUtils.newPlugin( "group", "a-artifact", "1.0-${SNAPSHOT}" ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "b-artifact", "${1.0}" ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "c-artifact", "${LATEST}" ) ); @@ -205,12 +205,12 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - List<String> additional = new ArrayList<String>(); + List<String> additional = new ArrayList<>(); // invalid format (not enough sections) additional.add( "group" ); - Set<Plugin> plugins = new HashSet<Plugin>(); + Set<Plugin> plugins = new HashSet<>(); try { rule.addAdditionalPlugins( plugins, additional ); @@ -245,12 +245,12 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<Plugin> plugins = new HashSet<Plugin>(); + Set<Plugin> plugins = new HashSet<>(); plugins.add( EnforcerTestUtils.newPlugin( "group", "a-artifact", "1.0" ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo", null ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo2", "" ) ); - List<String> additional = new ArrayList<String>(); + List<String> additional = new ArrayList<>(); additional.add( "group:a-artifact" ); additional.add( "group:another-artifact" ); @@ -274,12 +274,12 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<Plugin> plugins = new HashSet<Plugin>(); + Set<Plugin> plugins = new HashSet<>(); plugins.add( EnforcerTestUtils.newPlugin( "group", "a-artifact", "1.0" ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo", null ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo2", "" ) ); - List<String> additional = new ArrayList<String>(); + List<String> additional = new ArrayList<>(); additional.add( "group:a-artifact" ); additional.add( "group:another-artifact" ); @@ -304,12 +304,12 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<Plugin> plugins = new HashSet<Plugin>(); + Set<Plugin> plugins = new HashSet<>(); plugins.add( EnforcerTestUtils.newPlugin( "group", "a-artifact", "1.0" ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo", null ) ); plugins.add( EnforcerTestUtils.newPlugin( "group", "foo2", "" ) ); - List<String> unchecked = new ArrayList<String>(); + List<String> unchecked = new ArrayList<>(); // intentionally inserting spaces to make sure they are handled correctly. unchecked.add( "group : a-artifact" ); @@ -332,7 +332,7 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<String> plugins = new HashSet<String>(); + Set<String> plugins = new HashSet<>(); plugins.add( "group:a-artifact" ); plugins.add( "group:foo" ); plugins.add( "group:foo2" ); @@ -357,7 +357,7 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<String> plugins = new HashSet<String>(); + Set<String> plugins = new HashSet<>(); Collection<String> results = rule.combineUncheckedPlugins( plugins, "group2:a,group3:b" ); // make sure only one new plugin has been added @@ -392,7 +392,7 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<String> plugins = new HashSet<String>(); + Set<String> plugins = new HashSet<>(); plugins.add( "group:a-artifact" ); plugins.add( "group:foo" ); plugins.add( "group:foo2" ); @@ -413,7 +413,7 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<String> plugins = new HashSet<String>(); + Set<String> plugins = new HashSet<>(); plugins.add( "group:a-artifact" ); plugins.add( "group:foo" ); plugins.add( "group:foo2" ); @@ -434,7 +434,7 @@ public class TestRequirePluginVersions { RequirePluginVersions rule = new RequirePluginVersions(); - Set<String> plugins = new HashSet<String>(); + Set<String> plugins = new HashSet<>(); plugins.add( "group:a-artifact" ); plugins.add( "group:foo" ); plugins.add( "group:foo2" ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java index 7cacb7c..2dab0e5 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java @@ -36,11 +36,9 @@ public class TestRequireProperty /** * Test rule. * - * @throws EnforcerRuleException the enforcer rule exception */ @Test public void testRule() - throws EnforcerRuleException { MockProject project = new MockProject(); project.setProperty( "testProp", "This is a test." ); @@ -76,11 +74,9 @@ public class TestRequireProperty /** * Test rule with regex. * - * @throws EnforcerRuleException the enforcer rule exception */ @Test public void testRuleWithRegex() - throws EnforcerRuleException { MockProject project = new MockProject(); project.setProperty( "testProp", "This is a test." ); diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java index adeb7b4..5582d12 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseDeps.java @@ -120,9 +120,8 @@ public class TestRequireReleaseDeps private RequireReleaseDeps newRequireReleaseDeps() { - RequireReleaseDeps rule = new RequireReleaseDeps() + return new RequireReleaseDeps() { - @Override protected Set<Artifact> getDependenciesToCheck( ProjectBuildingRequest buildingRequest ) { @@ -133,6 +132,5 @@ public class TestRequireReleaseDeps return isSearchTransitive() ? project.getArtifacts() : project.getDependencyArtifacts(); } }; - return rule; } } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java index 138e20c..ea42a99 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java @@ -53,7 +53,7 @@ public class TestRequireReleaseVersion project.setArtifact( factory.getReleaseArtifact() ); - EnforcerRule rule = new RequireReleaseVersion(); + RequireReleaseVersion rule = new RequireReleaseVersion(); EnforcerRuleUtilsHelper.execute( rule, helper, false ); @@ -68,10 +68,10 @@ public class TestRequireReleaseVersion project.setParent( parent ); helper = EnforcerTestUtils.getHelper( project ); - ( (RequireReleaseVersion) rule ).setFailWhenParentIsSnapshot( true ); + rule.setFailWhenParentIsSnapshot( true ); EnforcerRuleUtilsHelper.execute( rule, helper, true ); - ( (RequireReleaseVersion) rule ).setFailWhenParentIsSnapshot( false ); + rule.setFailWhenParentIsSnapshot( false ); EnforcerRuleUtilsHelper.execute( rule, helper, false ); } diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireTextFileChecksum.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireTextFileChecksum.java index 0c53f1e..84b970c 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireTextFileChecksum.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireTextFileChecksum.java @@ -37,7 +37,7 @@ import org.junit.jupiter.api.io.TempDir; public class TestRequireTextFileChecksum { - private RequireTextFileChecksum rule = new RequireTextFileChecksum(); + private final RequireTextFileChecksum rule = new RequireTextFileChecksum(); @TempDir public File temporaryFolder; diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtilsHelper.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtilsHelper.java index 4ca2301..3f20176 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtilsHelper.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtilsHelper.java @@ -1,7 +1,5 @@ package org.apache.maven.plugins.enforcer.utils; -import static org.junit.jupiter.api.Assertions.fail; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -25,6 +23,8 @@ import org.apache.maven.enforcer.rule.api.EnforcerRule; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import static org.junit.jupiter.api.Assertions.fail; + /** * The Class TestEnforcerRuleUtils. * diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestArtifactMatcher.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestArtifactMatcher.java index f6c9856..3307076 100644 --- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestArtifactMatcher.java +++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestArtifactMatcher.java @@ -36,11 +36,10 @@ import static org.junit.jupiter.api.Assertions.fail; public class TestArtifactMatcher { - private ArtifactMatcher matcher; - Collection<String> patterns = new ArrayList<String>(); + Collection<String> patterns = new ArrayList<>(); - Collection<String> ignorePatterns = new ArrayList<String>(); + Collection<String> ignorePatterns = new ArrayList<>(); @Test public void testPatternInvalidInput() @@ -51,7 +50,7 @@ public class TestArtifactMatcher new Pattern( null ); fail( "NullPointerException expected." ); } - catch ( NullPointerException e ) + catch ( NullPointerException ignored ) { } @@ -60,7 +59,7 @@ public class TestArtifactMatcher new Pattern( "a:b:c:d:e:f:g" ); fail( "IllegalArgumentException expected." ); } - catch ( IllegalArgumentException e ) + catch ( IllegalArgumentException ignored ) { } @@ -69,7 +68,7 @@ public class TestArtifactMatcher new Pattern( "a::" ); fail( "IllegalArgumentException expected." ); } - catch ( IllegalArgumentException e ) + catch ( IllegalArgumentException ignored ) { } @@ -79,7 +78,7 @@ public class TestArtifactMatcher p.match( null ); fail( "NullPointerException expected." ); } - catch ( NullPointerException e ) + catch ( NullPointerException ignored ) { } } @@ -128,7 +127,7 @@ public class TestArtifactMatcher ignorePatterns.add( "badGroup:*:*:test" ); ignorePatterns.add( "*:anotherArtifact:1.1" ); - matcher = new ArtifactMatcher( patterns, ignorePatterns ); + ArtifactMatcher matcher = new ArtifactMatcher( patterns, ignorePatterns ); executeMatch( matcher, "groupId", "artifactId", "1.0", "", "", true ); diff --git a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java index da0f258..24234d7 100644 --- a/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java +++ b/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java @@ -193,8 +193,7 @@ public class EnforceMojo if ( ignoreCache || shouldExecute( rule ) ) { // execute the rule - // noinspection - // SynchronizationOnLocalVariableOrMethodParameter + // noinspection SynchronizationOnLocalVariableOrMethodParameter synchronized ( rule ) { rule.execute( helper ); diff --git a/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java b/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java index 011f8f7..066ddea 100644 --- a/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java +++ b/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java @@ -1,7 +1,6 @@ package org.apache.maven.plugins.enforcer; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -33,7 +32,7 @@ public class TestDefaultEnforcementRuleHelper { @Test public void testHelper() - throws ComponentLookupException, ExpressionEvaluationException + throws ExpressionEvaluationException { DefaultEnforcementRuleHelper helper = (DefaultEnforcementRuleHelper) EnforcerTestUtils.getHelper();
