You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/10/09 11:07:26 UTC
(maven-integration-testing) branch master updated: [MNG-8294] Consistency checks when loading parent (#383)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
The following commit(s) were added to refs/heads/master by this push:
new 57dee650a [MNG-8294] Consistency checks when loading parent (#383)
57dee650a is described below
commit 57dee650a98905d6ce287f24d77394d90a366dd9
Author: Guillaume Nodet <gn...@apache.org>
AuthorDate: Wed Oct 9 13:07:21 2024 +0200
[MNG-8294] Consistency checks when loading parent (#383)
---
.../maven/it/MavenITmng8294ParentChecksTest.java | 116 +++++++++++++++++++++
.../org/apache/maven/it/TestSuiteOrdering.java | 1 +
.../bad-mismatch/child/pom.xml | 11 ++
.../mng-8294-parent-checks/bad-mismatch/pom.xml | 7 ++
.../bad-non-resolvable/pom.xml | 9 ++
.../mng-8294-parent-checks/bad-wrong-path/pom.xml | 9 ++
.../ok-using-empty/child/pom.xml | 5 +
.../mng-8294-parent-checks/ok-using-empty/pom.xml | 7 ++
.../ok-using-gav/child/pom.xml | 10 ++
.../mng-8294-parent-checks/ok-using-gav/pom.xml | 7 ++
.../ok-using-path/child/pom.xml | 8 ++
.../mng-8294-parent-checks/ok-using-path/pom.xml | 7 ++
12 files changed, 197 insertions(+)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8294ParentChecksTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8294ParentChecksTest.java
new file mode 100644
index 000000000..1e5238835
--- /dev/null
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8294ParentChecksTest.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.it;
+
+import java.io.File;
+
+import org.apache.maven.shared.verifier.VerificationException;
+import org.apache.maven.shared.verifier.Verifier;
+import org.apache.maven.shared.verifier.util.ResourceExtractor;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+/**
+ * This is a test set for <a href="https://issues.apache.org/jira/browse/MNG-8288">MNG-8288</a>.
+ */
+class MavenITmng8294ParentChecksTest extends AbstractMavenIntegrationTestCase {
+
+ MavenITmng8294ParentChecksTest() {
+ super("[4.0.0-beta-5,)");
+ }
+
+ /**
+ * Verify error when mismatch between GAV and relativePath
+ */
+ @Test
+ void testitbadMismatch() throws Exception {
+ File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8294-parent-checks");
+
+ Verifier verifier = newVerifier(new File(testDir, "bad-mismatch").getAbsolutePath());
+ verifier.addCliArgument("validate");
+ assertThrows(VerificationException.class, verifier::execute);
+ verifier.verifyTextInLog(
+ "at org.apache.maven.its.mng8294:parent instead of org.apache.maven.its.mng8294:bad-parent");
+ }
+
+ /**
+ * Verify error when the parent is not resolvable
+ */
+ @Test
+ void testitbadNonResolvable() throws Exception {
+ File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8294-parent-checks");
+
+ Verifier verifier = newVerifier(new File(testDir, "bad-non-resolvable").getAbsolutePath());
+ verifier.addCliArgument("validate");
+ assertThrows(VerificationException.class, verifier::execute);
+ verifier.verifyTextInLog(
+ "The following artifacts could not be resolved: org.apache.maven.its.mng8294:parent:pom:0.1-SNAPSHOT");
+ }
+
+ /**
+ * Verify error when a wrong path
+ */
+ @Test
+ void testitbadWrongPath() throws Exception {
+ File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8294-parent-checks");
+
+ Verifier verifier = newVerifier(new File(testDir, "bad-wrong-path").getAbsolutePath());
+ verifier.addCliArgument("validate");
+ assertThrows(VerificationException.class, verifier::execute);
+ verifier.verifyTextInLog("points at '../foo' but no POM could be found");
+ }
+
+ /**
+ * Verify error when a wrong path
+ */
+ @Test
+ void testitokUsingEmpty() throws Exception {
+ File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8294-parent-checks");
+
+ Verifier verifier = newVerifier(new File(testDir, "ok-using-empty").getAbsolutePath());
+ verifier.addCliArgument("validate");
+ verifier.execute();
+ verifier.verifyErrorFreeLog();
+ }
+ /**
+ * Verify error when a wrong path
+ */
+ @Test
+ void testitokUsingGav() throws Exception {
+ File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8294-parent-checks");
+
+ Verifier verifier = newVerifier(new File(testDir, "ok-using-gav").getAbsolutePath());
+ verifier.addCliArgument("validate");
+ verifier.execute();
+ verifier.verifyErrorFreeLog();
+ }
+ /**
+ * Verify error when a wrong path
+ */
+ @Test
+ void testitokUsingPath() throws Exception {
+ File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8294-parent-checks");
+
+ Verifier verifier = newVerifier(new File(testDir, "ok-using-path").getAbsolutePath());
+ verifier.addCliArgument("validate");
+ verifier.execute();
+ verifier.verifyErrorFreeLog();
+ }
+}
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
index d923f8a5f..021521519 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java
@@ -120,6 +120,7 @@ public class TestSuiteOrdering implements ClassOrderer {
* the tests are to finishing. Newer tests are also more likely to fail, so this is
* a fail fast technique as well.
*/
+ suite.addTestSuite(MavenITmng8294ParentChecksTest.class);
suite.addTestSuite(MavenITmng8293BomImportFromReactor.class);
suite.addTestSuite(MavenITmng8288NoRootPomTest.class);
suite.addTestSuite(MavenITmng8133RootDirectoryInParentTest.class);
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml
new file mode 100644
index 000000000..f7dc05cb2
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/child/pom.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0">
+ <parent>
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>bad-parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>myArtifact</artifactId>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml
new file mode 100644
index 000000000..754d2e57a
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-mismatch/pom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0" root="true">
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml
new file mode 100644
index 000000000..2422200ed
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-non-resolvable/pom.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0" root="true">
+ <parent>
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>myArtifact</artifactId>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml
new file mode 100644
index 000000000..0917a0eb4
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/bad-wrong-path/pom.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0" root="true">
+ <parent>
+ <relativePath>../foo</relativePath>
+ </parent>
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml
new file mode 100644
index 000000000..6cc57c22a
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/child/pom.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0">
+ <parent />
+ <artifactId>myArtifact</artifactId>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml
new file mode 100644
index 000000000..754d2e57a
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-empty/pom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0" root="true">
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml
new file mode 100644
index 000000000..bdd71eb2f
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/child/pom.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0">
+ <parent>
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>myArtifact</artifactId>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml
new file mode 100644
index 000000000..754d2e57a
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-gav/pom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0" root="true">
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml
new file mode 100644
index 000000000..4106bae8b
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/child/pom.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0">
+ <parent>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>myArtifact</artifactId>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml
new file mode 100644
index 000000000..754d2e57a
--- /dev/null
+++ b/core-it-suite/src/test/resources/mng-8294-parent-checks/ok-using-path/pom.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0" root="true">
+ <groupId>org.apache.maven.its.mng8294</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+</project>