This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch MNG-8644 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 25171d831d721f188fa085b338a83060ab4abf96 Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Mon Mar 24 18:41:08 2025 -0400 Reenable many old style tests --- .../maven/artifact/resolver/ArtifactResolverTest.java | 1 + .../src/test/java/org/apache/maven/model/BuildTest.java | 1 + .../java/org/apache/maven/model/IssueManagementTest.java | 1 + .../src/test/java/org/apache/maven/model/LicenseTest.java | 4 +++- .../test/java/org/apache/maven/model/MailingListTest.java | 1 + .../test/java/org/apache/maven/model/OrganizationTest.java | 4 ++++ .../src/test/java/org/apache/maven/model/ScmTest.java | 2 +- .../maven/project/DefaultMavenProjectBuilderTest.java | 13 +++++++------ .../java/org/apache/maven/project/PomConstructionTest.java | 14 ++++---------- 9 files changed, 23 insertions(+), 18 deletions(-) diff --git a/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java index d2f204d8ea..b1d5c9468e 100644 --- a/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java +++ b/compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java @@ -174,6 +174,7 @@ void testResolutionOfAnArtifactWhereOneRemoteRepositoryIsBadButOneIsGood() throw assertLocalArtifactPresent(l); } + @Test public void testReadRepoFromModel() throws Exception { Artifact m = createArtifact(TestMavenWorkspaceReader.ARTIFACT_ID, TestMavenWorkspaceReader.VERSION); ArtifactMetadataSource source = getContainer().lookup(ArtifactMetadataSource.class, "maven"); diff --git a/compat/maven-model/src/test/java/org/apache/maven/model/BuildTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/BuildTest.java index 3fd3b5fa0a..bd78314954 100644 --- a/compat/maven-model/src/test/java/org/apache/maven/model/BuildTest.java +++ b/compat/maven-model/src/test/java/org/apache/maven/model/BuildTest.java @@ -53,6 +53,7 @@ void testToStringNullSafe() { assertNotNull(new Build().toString()); } + @Test public void testToStringNotNonsense() { Build build = new Build(); diff --git a/compat/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java index 16bd8a06b2..a6905a28be 100644 --- a/compat/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java +++ b/compat/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java @@ -53,6 +53,7 @@ void testToStringNullSafe() { assertNotNull(new IssueManagement().toString()); } + @Test public void testToStringNotNonsense() { IssueManagement im = new IssueManagement(); im.setSystem("Velociraptor"); diff --git a/compat/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java index c333a972a9..019b8f61d0 100644 --- a/compat/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java +++ b/compat/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java @@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -53,6 +54,7 @@ void testToStringNullSafe() { assertNotNull(new License().toString()); } + @Test public void testToStringNotNonsense() { License license = new License(); license.setName("Unlicense"); @@ -60,6 +62,6 @@ public void testToStringNotNonsense() { String s = license.toString(); - assert "License {name=Unlicense, url=http://lic.localdomain}".equals(s) : s; + assertEquals("License {name=Unlicense, url=http://lic.localdomain}";, s) } } diff --git a/compat/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java index 7e12221b97..c758c7e76e 100644 --- a/compat/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java +++ b/compat/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java @@ -54,6 +54,7 @@ void testToStringNullSafe() { assertNotNull(new MailingList().toString()); } + @Test public void testToStringNotNonsense() { MailingList list = new MailingList(); list.setName("modello-dev"); diff --git a/compat/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java index a001599bc0..62e51a1608 100644 --- a/compat/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java +++ b/compat/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java @@ -54,6 +54,7 @@ void testToStringNullSafe() { assertNotNull(new Organization().toString()); } + @Test public void testToStringNotNonsense11() { Organization org = new Organization(); org.setName("Testing Maven Unit"); @@ -62,6 +63,7 @@ public void testToStringNotNonsense11() { assertEquals("Organization {name=Testing Maven Unit, url=https://maven.localdomain}";, org.toString()); } + @Test public void testToStringNotNonsense10() { Organization org = new Organization(); org.setName("Testing Maven Unit"); @@ -69,6 +71,7 @@ public void testToStringNotNonsense10() { assertEquals("Organization {name=Testing Maven Unit, url=null}", org.toString()); } + @Test public void testToStringNotNonsense01() { Organization org = new Organization(); org.setUrl("https://maven.localdomain";); @@ -76,6 +79,7 @@ public void testToStringNotNonsense01() { assertEquals("Organization {name=null, url=https://maven.localdomain}";, org.toString()); } + @Test public void testToStringNotNonsense00() { Organization org = new Organization(); diff --git a/compat/maven-model/src/test/java/org/apache/maven/model/ScmTest.java b/compat/maven-model/src/test/java/org/apache/maven/model/ScmTest.java index 6927e6e883..0dde84e4a9 100644 --- a/compat/maven-model/src/test/java/org/apache/maven/model/ScmTest.java +++ b/compat/maven-model/src/test/java/org/apache/maven/model/ScmTest.java @@ -27,7 +27,6 @@ /** * Tests {@code Scm}. - * */ class ScmTest { @@ -54,6 +53,7 @@ void testToStringNullSafe() { assertNotNull(new Scm().toString()); } + @Test public void testToStringNotNonsense() { Scm scm = new Scm(); scm.setConnection("scm:git:git://git.localdomain/model"); diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java index ec97bfe3f3..98704c3b2e 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java @@ -238,6 +238,7 @@ void testBuildParentVersionRangeLocallyWithChildProjectVersionExpression() throw * * @throws Exception */ + @Test public void testBuildParentVersionRangeLocallyWithChildProjectParentVersionExpression() throws Exception { File f1 = getTestFile( "src/test/resources/projects/parent-version-range-local-child-project-parent-version-expression/child/pom.xml"); @@ -256,6 +257,7 @@ public void testBuildParentVersionRangeLocallyWithChildProjectParentVersionExpre * * @throws Exception */ + @Test public void testBuildParentVersionRangeLocallyWithChildRevisionExpression() throws Exception { File f1 = getTestFile( "src/test/resources/projects/parent-version-range-local-child-revision-expression/child/pom.xml"); @@ -480,6 +482,7 @@ void testActivatedProfileByDefaultIsResolved() throws Exception { * * @throws Exception */ + @Test public void testBuildParentVersionRangeExternallyWithChildPomVersionExpression() throws Exception { File f1 = getTestFile( "src/test/resources/projects/parent-version-range-external-child-pom-version-expression/pom.xml"); @@ -495,9 +498,8 @@ public void testBuildParentVersionRangeExternallyWithChildPomVersionExpression() /** * Tests whether external version range parent references are build correctly. - * - * @throws Exception */ + @Test public void testBuildParentVersionRangeExternallyWithChildPomParentVersionExpression() throws Exception { File f1 = getTestFile( "src/test/resources/projects/parent-version-range-external-child-pom-parent-version-expression/pom.xml"); @@ -508,14 +510,14 @@ public void testBuildParentVersionRangeExternallyWithChildPomParentVersionExpres } catch (final ProjectBuildingException e) { assertNotNull(e.getMessage()); assertThat(e.getMessage(), containsString("Version must be a constant")); + assertThat(e.getMessage(), containsString("Version must be a constant")); } } /** * Tests whether external version range parent references are build correctly. - * - * @throws Exception */ + @Test public void testBuildParentVersionRangeExternallyWithChildProjectParentVersionExpression() throws Exception { File f1 = getTestFile( "src/test/resources/projects/parent-version-range-external-child-project-parent-version-expression/pom.xml"); @@ -531,9 +533,8 @@ public void testBuildParentVersionRangeExternallyWithChildProjectParentVersionEx /** * Tests whether external version range parent references are build correctly. - * - * @throws Exception */ + @Test public void testBuildParentVersionRangeExternallyWithChildRevisionExpression() throws Exception { File f1 = getTestFile( "src/test/resources/projects/parent-version-range-external-child-revision-expression/pom.xml"); diff --git a/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 8bc67afee7..48935d2d12 100644 --- a/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/impl/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -352,27 +352,20 @@ void testReportingPluginInterpolation() throws Exception { // them into a resolver, create the expression to extract the data to validate the Model, and the URI // to validate the properties. We also need a way to navigate from the Tex specification documents to // the test in question and vice versa. A little Eclipse plugin would do the trick. + @Test public void testThatExecutionsWithoutIdsAreMergedAndTheChildWins() throws Exception { PomTestWrapper tester = buildPom("micromailer"); assertModelEquals(tester, "child-descriptor", "build/plugins[1]/executions[1]/goals[1]"); } - /*MNG- - public void testDependencyScope() - throws Exception - { - PomTestWrapper pom = buildPom( "dependency-scope/sub" ); - - }*/ - - /*MNG- 4010*/ + /*MNG-4010*/ @Test void testDuplicateExclusionsDependency() throws Exception { PomTestWrapper pom = buildPom("duplicate-exclusions-dependency/sub"); assertEquals(1, ((List<?>) pom.getValue("dependencies[1]/exclusions")).size()); } - /*MNG- 4008*/ + /*MNG-4008*/ @Test void testMultipleFilters() throws Exception { PomTestWrapper pom = buildPom("multiple-filters"); @@ -1608,6 +1601,7 @@ void testDependencyScope() throws Exception { } // This will fail on a validation error if incorrect + @Test public void testDependencyManagementWithInterpolation() throws Exception { buildPom("dependency-management-with-interpolation/sub"); }
