From 94049cd8c59a156cfa8a3550a96928fb2e278b08 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Fri, 25 Oct 2024 10:29:16 +0200 Subject: [PATCH] [MNG-8341] Add IT for deadlock during model building (#394) --- .../maven/it/MavenITmng8341DeadlockTest.java | 48 +++++++++++++++++++ .../apache/maven/it/TestSuiteOrdering.java | 1 + .../mng-8341-deadlock/child1/pom.xml | 10 ++++ .../mng-8341-deadlock/child2/pom.xml | 10 ++++ .../mng-8341-deadlock/parent/pom.xml | 13 +++++ .../test/resources/mng-8341-deadlock/pom.xml | 18 +++++++ 6 files changed, 100 insertions(+) create mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java create mode 100644 its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml create mode 100644 its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java new file mode 100644 index 0000000000..d52febe86f --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8341DeadlockTest.java @@ -0,0 +1,48 @@ +/* + * 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.Verifier; +import org.apache.maven.shared.verifier.util.ResourceExtractor; +import org.junit.jupiter.api.Test; + +/** + * This is a test set for MNG-8341. + */ +class MavenITmng8341DeadlockTest extends AbstractMavenIntegrationTestCase { + + MavenITmng8341DeadlockTest() { + super("[4.0.0-beta-6,)"); + } + + /** + * Verify that the build succeeds + */ + @Test + void testDeadlock() throws Exception { + File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-8341-deadlock"); + + Verifier verifier = newVerifier(testDir.getAbsolutePath()); + verifier.addCliArgument("validate"); + verifier.execute(); + verifier.verifyErrorFreeLog(); + } +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 0acda4fdc7..cd917cd2c6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/its/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(MavenITmng8341DeadlockTest.class); suite.addTestSuite(MavenITmng8331VersionedAndUnversionedDependenciesTest.class); suite.addTestSuite(MavenITmng8299CustomLifecycleTest.class); suite.addTestSuite(MavenITmng7982DependencyManagementTransitivityTest.class); diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml new file mode 100644 index 0000000000..ec6599c2ec --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child1/pom.xml @@ -0,0 +1,10 @@ + + + + org.apache.maven.its.mng8341 + parent + 1-SNAPSHOT + + child1 + pom + diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml new file mode 100644 index 0000000000..e2faba1ff9 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/child2/pom.xml @@ -0,0 +1,10 @@ + + + + org.apache.maven.its.mng8341 + parent + 1-SNAPSHOT + + child2 + pom + diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml new file mode 100644 index 0000000000..a656236012 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/parent/pom.xml @@ -0,0 +1,13 @@ + + + + org.apache + apache + 33 + + + org.apache.maven.its.mng8341 + parent + 1-SNAPSHOT + pom + diff --git a/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml b/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml new file mode 100644 index 0000000000..28a7b94a41 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-8341-deadlock/pom.xml @@ -0,0 +1,18 @@ + + + + org.apache.maven.its.mng8341 + parent + 1-SNAPSHOT + + org.apache.maven.its + root + 1-SNAPSHOT + pom + + + parent + child1 + child2 + +