diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5102MixinsTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5102MixinsTest.java new file mode 100644 index 000000000..da00f2574 --- /dev/null +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5102MixinsTest.java @@ -0,0 +1,81 @@ +/* + * 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-5135. + * + * @author Benjamin Bentmann + */ +public class MavenITmng5102MixinsTest extends AbstractMavenIntegrationTestCase { + + public MavenITmng5102MixinsTest() { + super("(4.0.0-alpha-7,)"); + } + + /** + * Verify that mixins can be loaded from the file system. + * + * @throws Exception in case of failure + */ + @Test + public void testWithPath() throws Exception { + File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5102-mixins/path"); + + Verifier verifier = newVerifier(testDir.getAbsolutePath()); + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.deleteArtifacts("org.apache.maven.its.mng5102"); + verifier.addCliArgument("install"); + verifier.execute(); + verifier.verifyErrorFreeLog(); + } + + /** + * Verify that mixins can be loaded from the repositories. + * + * @throws Exception in case of failure + */ + @Test + public void testWithGav() throws Exception { + File testDir = ResourceExtractor.simpleExtractResources(getClass(), "/mng-5102-mixins/gav"); + + Verifier verifier = newVerifier(new File(testDir, "mixin-2").getAbsolutePath()); + + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.deleteArtifacts("org.apache.maven.its.mng5102"); + verifier.addCliArgument("install"); + verifier.execute(); + verifier.verifyErrorFreeLog(); + + verifier = newVerifier(new File(testDir, "project").getAbsolutePath()); + verifier.setAutoclean(false); + verifier.deleteDirectory("target"); + verifier.addCliArgument("install"); + 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 c31262692..c4facd6d4 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 TestSuiteOrdering() { * the tests are to finishing. Newer tests are also more likely to fail, so this is * a fail fast technique as well. */ + suite.addTestSuite(MavenITmng5102MixinsTest.class); suite.addTestSuite(MavenITmng7836AlternativePomSyntaxTest.class); suite.addTestSuite(MavenITmng5659ProjectSettingsTest.class); suite.addTestSuite(MavenITmng7228LeakyModelTest.class); diff --git a/core-it-suite/src/test/resources/mng-5102-mixins/gav/mixin-2/pom.xml b/core-it-suite/src/test/resources/mng-5102-mixins/gav/mixin-2/pom.xml new file mode 100644 index 000000000..9385cc732 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5102-mixins/gav/mixin-2/pom.xml @@ -0,0 +1,32 @@ + + + + 4.0.0 + + org.apache.maven.its.mng5102 + mixin-2 + 0.1 + pom + + + true + + + diff --git a/core-it-suite/src/test/resources/mng-5102-mixins/gav/project/pom.xml b/core-it-suite/src/test/resources/mng-5102-mixins/gav/project/pom.xml new file mode 100644 index 000000000..621b37a66 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5102-mixins/gav/project/pom.xml @@ -0,0 +1,39 @@ + + + + 4.0.0 + + org.apache.maven.its.mng5102 + gav + 0.1 + pom + + Maven Integration Test :: MNG-5102 + Mixins tests. + + + + org.apache.maven.its.mng5102 + mixin-2 + 0.1 + + + + diff --git a/core-it-suite/src/test/resources/mng-5102-mixins/path/child/pom.xml b/core-it-suite/src/test/resources/mng-5102-mixins/path/child/pom.xml new file mode 100644 index 000000000..3d5c21c52 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5102-mixins/path/child/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + + org.apache.maven.its.mng5102 + path + 0.1 + + + child + jar + + Maven Integration Test :: MNG-5102 :: Child + Mixins tests. + + + + ../mixins/mixin-3.xml + + + + diff --git a/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-1.xml b/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-1.xml new file mode 100644 index 000000000..fc327b142 --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-1.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + org.apache.maven.its.mng5102 + mixin-1 + 0.1 + pom + + + true + + diff --git a/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-3.xml b/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-3.xml new file mode 100644 index 000000000..b9f7424ee --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5102-mixins/path/mixins/mixin-3.xml @@ -0,0 +1,31 @@ + + + + 4.0.0 + + org.apache.maven.its.mng5102 + mixin-3 + 0.1 + pom + + + true + + diff --git a/core-it-suite/src/test/resources/mng-5102-mixins/path/pom.xml b/core-it-suite/src/test/resources/mng-5102-mixins/path/pom.xml new file mode 100644 index 000000000..aa1ebc5fb --- /dev/null +++ b/core-it-suite/src/test/resources/mng-5102-mixins/path/pom.xml @@ -0,0 +1,41 @@ + + + + 4.0.0 + + org.apache.maven.its.mng5102 + path + 0.1 + pom + + Maven Integration Test :: MNG-5102 + Mixins tests. + + + child + + + + + mixins/mixin-1.xml + + + +