You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2022/07/25 09:19:24 UTC
[maven] 02/02: WIP: Continued.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-7451
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 643195b69b4593f6713d7cbbc2624f8c1193bebf
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Apr 1 21:05:12 2022 +0200
WIP: Continued.
---
.../org/apache/maven/project/ModelUtilsTest.java | 2 +-
.../model/building/DefaultModelBuilderTest.java | 6 +-
.../maven/model/building/FileModelSourceTest.java | 6 +-
.../model/building/FileToRawModelMergerTest.java | 4 +-
.../DefaultInheritanceAssemblerTest.java | 22 ++--
.../interpolation/MavenBuildTimestampTest.java | 4 +-
.../maven/model/merge/MavenModelMergerTest.java | 10 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 16 +--
.../activation/FileProfileActivatorTest.java | 9 +-
.../activation/JdkVersionProfileActivatorTest.java | 17 ++-
.../activation/PropertyProfileActivatorTest.java | 23 ++--
.../validation/DefaultModelValidatorTest.java | 130 ++++++++++-----------
.../apache/maven/model/merge/ModelMergerTest.java | 50 ++++----
13 files changed, 148 insertions(+), 151 deletions(-)
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
index a24dab20d..a8dda80c5 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
@@ -206,7 +206,7 @@ class ModelUtilsTest
}
@Test
- public void testShouldMergeInheritedPluginHavingExecutionWithLocalPlugin()
+ void testShouldMergeInheritedPluginHavingExecutionWithLocalPlugin()
{
Plugin parent = new Plugin();
parent.setArtifactId( "testArtifact" );
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
index 767f5fb5e..b4e686049 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
/**
* @author Guillaume Nodet
*/
-public class DefaultModelBuilderTest
+class DefaultModelBuilderTest
{
private static final String BASE1_ID = "thegroup:base1:pom";
@@ -82,7 +82,7 @@ public class DefaultModelBuilderTest
"</project>\n";
@Test
- public void testCycleInImports()
+ void testCycleInImports()
throws Exception
{
ModelBuilder builder = new DefaultModelBuilderFactory().newInstance();
@@ -148,7 +148,7 @@ public class DefaultModelBuilderTest
}
@Test
- public void testBuildRawModel()
+ void testBuildRawModel()
throws Exception
{
ModelBuilder builder = new DefaultModelBuilderFactory().newInstance();
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
index 8206cee97..066afcae2 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
@@ -34,14 +34,14 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
* Test that validate the solution of MNG-6261 issue
*
*/
-public class FileModelSourceTest
+class FileModelSourceTest
{
/**
* Test of equals method, of class FileModelSource.
*/
@Test
- public void testEquals()
+ void testEquals()
throws Exception
{
File tempFile = createTempFile( "pomTest" );
@@ -54,7 +54,7 @@ public class FileModelSourceTest
}
@Test
- public void testWindowsPaths()
+ void testWindowsPaths()
throws Exception
{
assumeTrue( Os.isFamily( "Windows" ) );
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
index 286664ce1..b515bb409 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileToRawModelMergerTest.java
@@ -32,14 +32,14 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasItems;
-public class FileToRawModelMergerTest
+class FileToRawModelMergerTest
{
/**
* Ensures that all list-merge methods are overridden
*/
@Test
- public void testOverriddenMergeMethods()
+ void testOverriddenMergeMethods()
{
List<String> methodNames =
Stream.of( ModelMerger.class.getDeclaredMethods() )
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index b573ad19b..015563371 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author Hervé Boutemy
*/
-public class DefaultInheritanceAssemblerTest
+class DefaultInheritanceAssemblerTest
{
private DefaultModelReader reader;
@@ -52,7 +52,7 @@ public class DefaultInheritanceAssemblerTest
private InheritanceAssembler assembler;
@BeforeEach
- public void setUp()
+ void setUp()
throws Exception
{
reader = new DefaultModelReader( new AbstractModelSourceTransformer()
@@ -80,7 +80,7 @@ public class DefaultInheritanceAssemblerTest
}
@Test
- public void testPluginConfiguration()
+ void testPluginConfiguration()
throws Exception
{
testInheritance( "plugin-configuration" );
@@ -92,7 +92,7 @@ public class DefaultInheritanceAssemblerTest
* @throws IOException Model read problem
*/
@Test
- public void testUrls()
+ void testUrls()
throws Exception
{
testInheritance( "urls" );
@@ -103,7 +103,7 @@ public class DefaultInheritanceAssemblerTest
* @throws IOException Model read problem
*/
@Test
- public void testFlatUrls()
+ void testFlatUrls()
throws IOException
{
testInheritance( "flat-urls" );
@@ -114,7 +114,7 @@ public class DefaultInheritanceAssemblerTest
* @throws Exception
*/
@Test
- public void testNoAppendUrls()
+ void testNoAppendUrls()
throws Exception
{
testInheritance( "no-append-urls" );
@@ -125,7 +125,7 @@ public class DefaultInheritanceAssemblerTest
* @throws Exception
*/
@Test
- public void testNoAppendUrls2()
+ void testNoAppendUrls2()
throws Exception
{
testInheritance( "no-append-urls2" );
@@ -136,7 +136,7 @@ public class DefaultInheritanceAssemblerTest
* @throws Exception
*/
@Test
- public void testNoAppendUrls3()
+ void testNoAppendUrls3()
throws Exception
{
testInheritance( "no-append-urls3" );
@@ -149,7 +149,7 @@ public class DefaultInheritanceAssemblerTest
* @throws IOException Model read problem
*/
@Test
- public void testFlatTrickyUrls()
+ void testFlatTrickyUrls()
throws IOException
{
// parent references child with artifactId (which is not directory name)
@@ -187,7 +187,7 @@ public class DefaultInheritanceAssemblerTest
}
@Test
- public void testWithEmptyUrl()
+ void testWithEmptyUrl()
throws IOException
{
testInheritance( "empty-urls", false );
@@ -231,7 +231,7 @@ public class DefaultInheritanceAssemblerTest
}
@Test
- public void testModulePathNotArtifactId()
+ void testModulePathNotArtifactId()
throws IOException
{
Model parent = getModel( "module-path-not-artifactId-parent" );
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java
index 73ea3996b..3d7b6178a 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/MavenBuildTimestampTest.java
@@ -26,10 +26,10 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class MavenBuildTimestampTest
+class MavenBuildTimestampTest
{
@Test
- public void testMavenBuildTimestampUsesUTC()
+ void testMavenBuildTimestampUsesUTC()
{
Properties interpolationProperties = new Properties();
interpolationProperties.setProperty( "maven.build.timestamp.format", "yyyyMMdd'T'HHmm'Z'" );
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java
index 636f3fb57..9009e8921 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java
@@ -30,13 +30,13 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
-public class MavenModelMergerTest
+class MavenModelMergerTest
{
private MavenModelMerger modelMerger = new MavenModelMerger();
// modelVersion is neither inherited nor injected
@Test
- public void testMergeModel_ModelVersion()
+ void testMergeModel_ModelVersion()
{
Model parent = new Model();
parent.setModelVersion( "4.0.0" );
@@ -51,7 +51,7 @@ public class MavenModelMergerTest
// ArtifactId is neither inherited nor injected
@Test
- public void testMergeModel_ArtifactId()
+ void testMergeModel_ArtifactId()
{
Model parent = new Model();
parent.setArtifactId( "PARENT" );
@@ -66,7 +66,7 @@ public class MavenModelMergerTest
// Prerequisites are neither inherited nor injected
@Test
- public void testMergeModel_Prerequisites()
+ void testMergeModel_Prerequisites()
{
Model parent = new Model();
parent.setPrerequisites( new Prerequisites() );
@@ -83,7 +83,7 @@ public class MavenModelMergerTest
// Profiles are neither inherited nor injected
@Test
- public void testMergeModel_Profiles()
+ void testMergeModel_Profiles()
{
Model parent = new Model();
parent.setProfiles( Collections.singletonList( new Profile() ) );;
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java
index 010abe01b..290560681 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/path/DefaultUrlNormalizerTest.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
/**
* @author Benjamin Bentmann
*/
-public class DefaultUrlNormalizerTest
+class DefaultUrlNormalizerTest
{
private UrlNormalizer normalizer = new DefaultUrlNormalizer();
@@ -38,13 +38,13 @@ public class DefaultUrlNormalizerTest
}
@Test
- public void testNullSafe()
+ void testNullSafe()
{
assertNull( normalize( null ) );
}
@Test
- public void testTrailingSlash()
+ void testTrailingSlash()
{
assertEquals( "", normalize( "" ) );
assertEquals( "http://server.org/dir", normalize( "http://server.org/dir" ) );
@@ -52,7 +52,7 @@ public class DefaultUrlNormalizerTest
}
@Test
- public void testRemovalOfParentRefs()
+ void testRemovalOfParentRefs()
{
assertEquals( "http://server.org/child", normalize( "http://server.org/parent/../child" ) );
assertEquals( "http://server.org/child", normalize( "http://server.org/grand/parent/../../child" ) );
@@ -62,7 +62,7 @@ public class DefaultUrlNormalizerTest
}
@Test
- public void testPreservationOfDoubleSlashes()
+ void testPreservationOfDoubleSlashes()
{
assertEquals( "scm:hg:ssh://localhost//home/user", normalize( "scm:hg:ssh://localhost//home/user" ) );
assertEquals( "file:////UNC/server", normalize( "file:////UNC/server" ) );
@@ -71,19 +71,19 @@ public class DefaultUrlNormalizerTest
}
@Test
- public void absolutePathTraversalPastRootIsOmitted()
+ void absolutePathTraversalPastRootIsOmitted()
{
assertEquals( "/", normalize("/../" ) );
}
@Test
- public void parentDirectoryRemovedFromRelativeUriReference()
+ void parentDirectoryRemovedFromRelativeUriReference()
{
assertEquals( "", normalize( "a/../" ) );
}
@Test
- public void leadingParentDirectoryNotRemovedFromRelativeUriReference()
+ void leadingParentDirectoryNotRemovedFromRelativeUriReference()
{
assertEquals( "../", normalize( "../" ) );
}
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java
index 300fc1353..8c5fdc085 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java
@@ -40,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*
* @author Ravil Galeyev
*/
-public class FileProfileActivatorTest extends AbstractProfileActivatorTest<FileProfileActivator>
+class FileProfileActivatorTest extends AbstractProfileActivatorTest<FileProfileActivator>
{
@TempDir
@@ -49,7 +49,6 @@ public class FileProfileActivatorTest extends AbstractProfileActivatorTest<FileP
private final DefaultProfileActivationContext context = new DefaultProfileActivationContext();
@BeforeEach
- @Override
void setUp() throws Exception
{
activator = new FileProfileActivator( new ProfileActivationFilePathInterpolator( new DefaultPathTranslator() ) );
@@ -64,7 +63,7 @@ public class FileProfileActivatorTest extends AbstractProfileActivatorTest<FileP
}
@Test
- public void testIsActiveNoFile()
+ void testIsActiveNoFile()
{
assertActivation( false, newExistsProfile( null ), context );
assertActivation( false, newExistsProfile( "someFile.txt" ), context );
@@ -76,7 +75,7 @@ public class FileProfileActivatorTest extends AbstractProfileActivatorTest<FileP
}
@Test
- public void testIsActiveExistsFileExists()
+ void testIsActiveExistsFileExists()
{
assertActivation( true, newExistsProfile( "file.txt" ), context );
assertActivation( true, newExistsProfile( "${basedir}" ), context );
@@ -88,7 +87,7 @@ public class FileProfileActivatorTest extends AbstractProfileActivatorTest<FileP
}
@Test
- public void testIsActiveExistsLeavesFileUnchanged()
+ void testIsActiveExistsLeavesFileUnchanged()
{
Profile profile = newExistsProfile( "file.txt" );
assertEquals( "file.txt", profile.getActivation().getFile().getExists() );
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
index ce57bf0da..da5b3e807 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/JdkVersionProfileActivatorTest.java
@@ -31,11 +31,10 @@ import org.junit.jupiter.api.Test;
*
* @author Benjamin Bentmann
*/
-public class JdkVersionProfileActivatorTest
+class JdkVersionProfileActivatorTest
extends AbstractProfileActivatorTest<JdkVersionProfileActivator>
{
- @Override
@BeforeEach
void setUp() throws Exception
{
@@ -61,7 +60,7 @@ public class JdkVersionProfileActivatorTest
}
@Test
- public void testNullSafe()
+ void testNullSafe()
throws Exception
{
Profile p = new Profile();
@@ -74,7 +73,7 @@ public class JdkVersionProfileActivatorTest
}
@Test
- public void testPrefix()
+ void testPrefix()
throws Exception
{
Profile profile = newProfile( "1.4" );
@@ -90,7 +89,7 @@ public class JdkVersionProfileActivatorTest
}
@Test
- public void testPrefixNegated()
+ void testPrefixNegated()
throws Exception
{
Profile profile = newProfile( "!1.4" );
@@ -106,7 +105,7 @@ public class JdkVersionProfileActivatorTest
}
@Test
- public void testVersionRangeInclusiveBounds()
+ void testVersionRangeInclusiveBounds()
throws Exception
{
Profile profile = newProfile( "[1.5,1.6]" );
@@ -129,7 +128,7 @@ public class JdkVersionProfileActivatorTest
}
@Test
- public void testVersionRangeExclusiveBounds()
+ void testVersionRangeExclusiveBounds()
throws Exception
{
Profile profile = newProfile( "(1.3,1.6)" );
@@ -153,7 +152,7 @@ public class JdkVersionProfileActivatorTest
}
@Test
- public void testVersionRangeInclusiveLowerBound()
+ void testVersionRangeInclusiveLowerBound()
throws Exception
{
Profile profile = newProfile( "[1.5,)" );
@@ -176,7 +175,7 @@ public class JdkVersionProfileActivatorTest
}
@Test
- public void testVersionRangeExclusiveUpperBound()
+ void testVersionRangeExclusiveUpperBound()
throws Exception
{
Profile profile = newProfile( "(,1.6)" );
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
index 72a677562..4757f1e5f 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/PropertyProfileActivatorTest.java
@@ -32,12 +32,11 @@ import org.junit.jupiter.api.Test;
*
* @author Benjamin Bentmann
*/
-public class PropertyProfileActivatorTest
+class PropertyProfileActivatorTest
extends AbstractProfileActivatorTest<PropertyProfileActivator>
{
@BeforeEach
- @Override
void setUp() throws Exception
{
activator = new PropertyProfileActivator();
@@ -66,7 +65,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testNullSafe()
+ void testNullSafe()
throws Exception
{
Profile p = new Profile();
@@ -79,7 +78,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithNameOnly_UserProperty()
+ void testWithNameOnly_UserProperty()
throws Exception
{
Profile profile = newProfile( "prop", null );
@@ -92,7 +91,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithNameOnly_SystemProperty()
+ void testWithNameOnly_SystemProperty()
throws Exception
{
Profile profile = newProfile( "prop", null );
@@ -105,7 +104,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithNegatedNameOnly_UserProperty()
+ void testWithNegatedNameOnly_UserProperty()
throws Exception
{
Profile profile = newProfile( "!prop", null );
@@ -118,7 +117,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithNegatedNameOnly_SystemProperty()
+ void testWithNegatedNameOnly_SystemProperty()
throws Exception
{
Profile profile = newProfile( "!prop", null );
@@ -131,7 +130,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithValue_UserProperty()
+ void testWithValue_UserProperty()
throws Exception
{
Profile profile = newProfile( "prop", "value" );
@@ -144,7 +143,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithValue_SystemProperty()
+ void testWithValue_SystemProperty()
throws Exception
{
Profile profile = newProfile( "prop", "value" );
@@ -157,7 +156,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithNegatedValue_UserProperty()
+ void testWithNegatedValue_UserProperty()
throws Exception
{
Profile profile = newProfile( "prop", "!value" );
@@ -170,7 +169,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithNegatedValue_SystemProperty()
+ void testWithNegatedValue_SystemProperty()
throws Exception
{
Profile profile = newProfile( "prop", "!value" );
@@ -183,7 +182,7 @@ public class PropertyProfileActivatorTest
}
@Test
- public void testWithValue_UserPropertyDominantOverSystemProperty()
+ void testWithValue_UserPropertyDominantOverSystemProperty()
throws Exception
{
Profile profile = newProfile( "prop", "value" );
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index 57dae7ccb..caa478132 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -39,7 +39,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*/
-public class DefaultModelValidatorTest
+class DefaultModelValidatorTest
{
private ModelValidator validator;
@@ -101,14 +101,14 @@ public class DefaultModelValidatorTest
}
@BeforeEach
- public void setUp()
+ void setUp()
throws Exception
{
validator = new DefaultModelValidator( new DefaultModelVersionProcessor() );
}
@AfterEach
- public void tearDown()
+ void tearDown()
throws Exception
{
this.validator = null;
@@ -122,7 +122,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingModelVersion()
+ void testMissingModelVersion()
throws Exception
{
SimpleProblemCollector result = validate( "missing-modelVersion-pom.xml" );
@@ -133,7 +133,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadModelVersion()
+ void testBadModelVersion()
throws Exception
{
SimpleProblemCollector result =
@@ -145,7 +145,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingArtifactId()
+ void testMissingArtifactId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-artifactId-pom.xml" );
@@ -156,7 +156,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingGroupId()
+ void testMissingGroupId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-groupId-pom.xml" );
@@ -167,7 +167,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testInvalidCoordinateIds()
+ void testInvalidCoordinateIds()
throws Exception
{
SimpleProblemCollector result = validate( "invalid-coordinate-ids-pom.xml" );
@@ -182,7 +182,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingType()
+ void testMissingType()
throws Exception
{
SimpleProblemCollector result = validate( "missing-type-pom.xml" );
@@ -193,7 +193,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingVersion()
+ void testMissingVersion()
throws Exception
{
SimpleProblemCollector result = validate( "missing-version-pom.xml" );
@@ -204,7 +204,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testInvalidAggregatorPackaging()
+ void testInvalidAggregatorPackaging()
throws Exception
{
SimpleProblemCollector result = validate( "invalid-aggregator-packaging-pom.xml" );
@@ -215,7 +215,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingDependencyArtifactId()
+ void testMissingDependencyArtifactId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-dependency-artifactId-pom.xml" );
@@ -226,7 +226,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingDependencyGroupId()
+ void testMissingDependencyGroupId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-dependency-groupId-pom.xml" );
@@ -237,7 +237,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingDependencyVersion()
+ void testMissingDependencyVersion()
throws Exception
{
SimpleProblemCollector result = validate( "missing-dependency-version-pom.xml" );
@@ -248,7 +248,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingDependencyManagementArtifactId()
+ void testMissingDependencyManagementArtifactId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-dependency-mgmt-artifactId-pom.xml" );
@@ -259,7 +259,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingDependencyManagementGroupId()
+ void testMissingDependencyManagementGroupId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-dependency-mgmt-groupId-pom.xml" );
@@ -270,7 +270,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingAll()
+ void testMissingAll()
throws Exception
{
SimpleProblemCollector result = validate( "missing-1-pom.xml" );
@@ -287,7 +287,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingPluginArtifactId()
+ void testMissingPluginArtifactId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-plugin-artifactId-pom.xml" );
@@ -298,7 +298,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testEmptyPluginVersion()
+ void testEmptyPluginVersion()
throws Exception
{
SimpleProblemCollector result = validate( "empty-plugin-version.xml" );
@@ -310,7 +310,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingRepositoryId()
+ void testMissingRepositoryId()
throws Exception
{
SimpleProblemCollector result =
@@ -328,7 +328,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingResourceDirectory()
+ void testMissingResourceDirectory()
throws Exception
{
SimpleProblemCollector result = validate( "missing-resource-directory-pom.xml" );
@@ -341,7 +341,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadPluginDependencyScope()
+ void testBadPluginDependencyScope()
throws Exception
{
SimpleProblemCollector result = validate( "bad-plugin-dependency-scope.xml" );
@@ -356,7 +356,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadDependencyScope()
+ void testBadDependencyScope()
throws Exception
{
SimpleProblemCollector result = validate( "bad-dependency-scope.xml" );
@@ -369,7 +369,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadDependencyManagementScope()
+ void testBadDependencyManagementScope()
throws Exception
{
SimpleProblemCollector result = validate( "bad-dependency-management-scope.xml" );
@@ -380,7 +380,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadDependencyVersion()
+ void testBadDependencyVersion()
throws Exception
{
SimpleProblemCollector result = validate( "bad-dependency-version.xml" );
@@ -394,7 +394,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testDuplicateModule()
+ void testDuplicateModule()
throws Exception
{
SimpleProblemCollector result = validateRaw( "duplicate-module.xml" );
@@ -405,7 +405,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testInvalidProfileId()
+ void testInvalidProfileId()
throws Exception
{
SimpleProblemCollector result = validateRaw( "invalid-profile-ids.xml" );
@@ -429,7 +429,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadPluginVersion()
+ void testBadPluginVersion()
throws Exception
{
SimpleProblemCollector result = validate( "bad-plugin-version.xml" );
@@ -447,7 +447,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testDistributionManagementStatus()
+ void testDistributionManagementStatus()
throws Exception
{
SimpleProblemCollector result = validate( "distribution-management-status.xml" );
@@ -458,7 +458,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testIncompleteParent()
+ void testIncompleteParent()
throws Exception
{
SimpleProblemCollector result = validateRaw( "incomplete-parent.xml" );
@@ -470,7 +470,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testHardCodedSystemPath()
+ void testHardCodedSystemPath()
throws Exception
{
SimpleProblemCollector result = validateRaw( "hard-coded-system-path.xml" );
@@ -487,7 +487,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testEmptyModule()
+ void testEmptyModule()
throws Exception
{
SimpleProblemCollector result = validate( "empty-module.xml" );
@@ -498,7 +498,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testDuplicatePlugin()
+ void testDuplicatePlugin()
throws Exception
{
SimpleProblemCollector result = validateRaw( "duplicate-plugin.xml" );
@@ -512,7 +512,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testDuplicatePluginExecution()
+ void testDuplicatePluginExecution()
throws Exception
{
SimpleProblemCollector result = validateRaw( "duplicate-plugin-execution.xml" );
@@ -526,7 +526,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testReservedRepositoryId()
+ void testReservedRepositoryId()
throws Exception
{
SimpleProblemCollector result = validate( "reserved-repository-id.xml" );
@@ -541,7 +541,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingPluginDependencyGroupId()
+ void testMissingPluginDependencyGroupId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-plugin-dependency-groupId.xml" );
@@ -552,7 +552,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingPluginDependencyArtifactId()
+ void testMissingPluginDependencyArtifactId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-plugin-dependency-artifactId.xml" );
@@ -563,7 +563,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingPluginDependencyVersion()
+ void testMissingPluginDependencyVersion()
throws Exception
{
SimpleProblemCollector result = validate( "missing-plugin-dependency-version.xml" );
@@ -574,7 +574,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadPluginDependencyVersion()
+ void testBadPluginDependencyVersion()
throws Exception
{
SimpleProblemCollector result = validate( "bad-plugin-dependency-version.xml" );
@@ -585,7 +585,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadVersion()
+ void testBadVersion()
throws Exception
{
SimpleProblemCollector result = validate( "bad-version.xml" );
@@ -596,7 +596,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadSnapshotVersion()
+ void testBadSnapshotVersion()
throws Exception
{
SimpleProblemCollector result = validate( "bad-snapshot-version.xml" );
@@ -607,7 +607,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadRepositoryId()
+ void testBadRepositoryId()
throws Exception
{
SimpleProblemCollector result = validate( "bad-repository-id.xml" );
@@ -625,7 +625,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadDependencyExclusionId()
+ void testBadDependencyExclusionId()
throws Exception
{
SimpleProblemCollector result =
@@ -647,7 +647,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingDependencyExclusionId()
+ void testMissingDependencyExclusionId()
throws Exception
{
SimpleProblemCollector result = validate( "missing-dependency-exclusion-id.xml" );
@@ -661,7 +661,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadImportScopeType()
+ void testBadImportScopeType()
throws Exception
{
SimpleProblemCollector result = validateRaw( "bad-import-scope-type.xml" );
@@ -673,7 +673,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testBadImportScopeClassifier()
+ void testBadImportScopeClassifier()
throws Exception
{
SimpleProblemCollector result = validateRaw( "bad-import-scope-classifier.xml" );
@@ -685,7 +685,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testSystemPathRefersToProjectBasedir()
+ void testSystemPathRefersToProjectBasedir()
throws Exception
{
SimpleProblemCollector result = validateRaw( "basedir-system-path.xml" );
@@ -703,7 +703,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testInvalidVersionInPluginManagement()
+ void testInvalidVersionInPluginManagement()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/missing-plugin-version-pluginManagement.xml" );
@@ -716,7 +716,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testInvalidGroupIdInPluginManagement()
+ void testInvalidGroupIdInPluginManagement()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/missing-groupId-pluginManagement.xml" );
@@ -729,7 +729,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testInvalidArtifactIdInPluginManagement()
+ void testInvalidArtifactIdInPluginManagement()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/missing-artifactId-pluginManagement.xml" );
@@ -742,7 +742,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testInvalidGroupAndArtifactIdInPluginManagement()
+ void testInvalidGroupAndArtifactIdInPluginManagement()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/missing-ga-pluginManagement.xml" );
@@ -758,7 +758,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testMissingReportPluginVersion()
+ void testMissingReportPluginVersion()
throws Exception
{
SimpleProblemCollector result = validate( "missing-report-version-pom.xml" );
@@ -767,7 +767,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testDeprecatedDependencyMetaversionsLatestAndRelease()
+ void testDeprecatedDependencyMetaversionsLatestAndRelease()
throws Exception
{
SimpleProblemCollector result = validateRaw( "deprecated-dependency-metaversions-latest-and-release.xml" );
@@ -781,7 +781,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testSelfReferencingDependencyInRawModel()
+ void testSelfReferencingDependencyInRawModel()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/self-referencing.xml" );
@@ -794,7 +794,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testSelfReferencingDependencyWithClassifierInRawModel() throws Exception
+ void testSelfReferencingDependencyWithClassifierInRawModel() throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/self-referencing-classifier.xml" );
@@ -802,7 +802,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testCiFriendlySha1()
+ void testCiFriendlySha1()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/ok-ci-friendly-sha1.xml" );
@@ -818,7 +818,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testCiFriendlyChangeList()
+ void testCiFriendlyChangeList()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/ok-ci-friendly-changelist.xml" );
@@ -826,7 +826,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testCiFriendlyAllExpressions()
+ void testCiFriendlyAllExpressions()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/ok-ci-friendly-all-expressions.xml" );
@@ -834,7 +834,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testCiFriendlyBad()
+ void testCiFriendlyBad()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/bad-ci-friendly.xml" );
@@ -843,7 +843,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testCiFriendlyBadSha1Plus()
+ void testCiFriendlyBadSha1Plus()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/bad-ci-friendly-sha1plus.xml" );
@@ -852,7 +852,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testCiFriendlyBadSha1Plus2()
+ void testCiFriendlyBadSha1Plus2()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/bad-ci-friendly-sha1plus2.xml" );
@@ -861,7 +861,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testParentVersionLATEST()
+ void testParentVersionLATEST()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/bad-parent-version-latest.xml" );
@@ -870,7 +870,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void testParentVersionRELEASE()
+ void testParentVersionRELEASE()
throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/bad-parent-version-release.xml" );
@@ -879,7 +879,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void repositoryWithExpression() throws Exception
+ void repositoryWithExpression() throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/repository-with-expression.xml" );
assertViolations( result, 0, 1, 0 );
@@ -887,7 +887,7 @@ public class DefaultModelValidatorTest
}
@Test
- public void repositoryWithBasedirExpression() throws Exception
+ void repositoryWithBasedirExpression() throws Exception
{
SimpleProblemCollector result = validateRaw( "raw-model/repository-with-basedir-expression.xml" );
assertViolations( result, 0, 0, 0 );
diff --git a/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java b/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
index f1aad049f..45c90d10e 100644
--- a/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
+++ b/maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
@@ -53,7 +53,7 @@ public class ModelMergerTest
private ModelMerger modelMerger = new ModelMerger();
@Test
- public void mergeArtifactId()
+ void mergeArtifactId()
{
Model target = new Model();
target.setArtifactId( "TARGET" );
@@ -70,7 +70,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameContributors()
+ void mergeSameContributors()
{
Contributor contributor = new Contributor();
contributor.setEmail( "contributor@maven.apache.org" );
@@ -87,7 +87,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameDependencies()
+ void mergeSameDependencies()
{
Dependency dependency = new Dependency();
dependency.setGroupId( "groupId" );
@@ -106,7 +106,7 @@ public class ModelMergerTest
}
@Test
- public void mergeDescription()
+ void mergeDescription()
{
Model target = new Model();
target.setDescription( "TARGET" );
@@ -123,7 +123,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameDevelopers()
+ void mergeSameDevelopers()
{
Developer developer = new Developer();
developer.setId( "devid" );
@@ -140,7 +140,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameExcludes()
+ void mergeSameExcludes()
{
PatternSet target = new PatternSet();
target.setExcludes( Arrays.asList( "first", "second", "third" ) );
@@ -153,7 +153,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameFilters()
+ void mergeSameFilters()
{
Build target = new Build();
target.setFilters( Arrays.asList( "first", "second", "third" ) );
@@ -166,7 +166,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameGoals()
+ void mergeSameGoals()
{
PluginExecution target = new PluginExecution();
target.setGoals( Arrays.asList( "first", "second", "third" ) );
@@ -179,7 +179,7 @@ public class ModelMergerTest
}
@Test
- public void mergeGroupId()
+ void mergeGroupId()
{
Model target = new Model();
target.setGroupId( "TARGET" );
@@ -196,7 +196,7 @@ public class ModelMergerTest
}
@Test
- public void mergeInceptionYear()
+ void mergeInceptionYear()
{
Model target = new Model();
target.setInceptionYear( "TARGET" );
@@ -213,7 +213,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameIncludes()
+ void mergeSameIncludes()
{
PatternSet target = new PatternSet();
target.setIncludes( Arrays.asList( "first", "second", "third" ) );
@@ -226,7 +226,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameMailingLists()
+ void mergeSameMailingLists()
{
MailingList mailingList = new MailingList();
mailingList.setName( "name" );
@@ -243,7 +243,7 @@ public class ModelMergerTest
}
@Test
- public void mergeModelVersion()
+ void mergeModelVersion()
{
Model target = new Model();
target.setModelVersion( "TARGET" );
@@ -260,7 +260,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameModules()
+ void mergeSameModules()
{
Model target = new Model();
target.setModules( Arrays.asList( "first", "second", "third" ) );
@@ -273,7 +273,7 @@ public class ModelMergerTest
}
@Test
- public void mergeName()
+ void mergeName()
{
Model target = new Model();
target.setName( "TARGET" );
@@ -290,7 +290,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameOtherArchives()
+ void mergeSameOtherArchives()
{
MailingList target = new MailingList();
target.setOtherArchives( Arrays.asList( "first", "second", "third" ) );
@@ -303,7 +303,7 @@ public class ModelMergerTest
}
@Test
- public void mergePackaging()
+ void mergePackaging()
{
Model target = new Model();
target.setPackaging( "TARGET" );
@@ -320,7 +320,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSamePluginRepositories()
+ void mergeSamePluginRepositories()
{
Repository repository = new Repository();
repository.setId( "repository" );
@@ -337,7 +337,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameProfiles()
+ void mergeSameProfiles()
{
Profile profile = new Profile();
profile.setId( "profile" );
@@ -354,7 +354,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameReports()
+ void mergeSameReports()
{
ReportSet target = new ReportSet();
target.setReports( Arrays.asList( "first", "second", "third" ) );
@@ -367,7 +367,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameRepositories()
+ void mergeSameRepositories()
{
Repository repository = new Repository();
repository.setId( "repository" );
@@ -384,7 +384,7 @@ public class ModelMergerTest
}
@Test
- public void mergeSameRoles()
+ void mergeSameRoles()
{
Contributor target = new Contributor();
target.setRoles( Arrays.asList( "first", "second", "third" ) );
@@ -397,7 +397,7 @@ public class ModelMergerTest
}
@Test
- public void mergeUrl()
+ void mergeUrl()
{
Model target = new Model();
target.setUrl( "TARGET" );;
@@ -414,7 +414,7 @@ public class ModelMergerTest
}
@Test
- public void mergeVersion()
+ void mergeVersion()
{
Model target = new Model();
target.setVersion( "TARGET" );;
@@ -431,7 +431,7 @@ public class ModelMergerTest
}
@Test
- public void testMergedModelSerialization() throws Exception {
+ void testMergedModelSerialization() throws Exception {
Model target = new Model();
Model source = new Model();
target.setLicenses(new ArrayList<License>());