From 9562268dbf7b93d860bd26424c7b870068215a6f Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Mon, 17 Nov 2008 18:39:51 +0000 Subject: [PATCH] o Deleted IT mng-3134 which is now superceded by the more complete test mng-2006 git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@718319 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/it/IntegrationTestSuite.java | 1 - ...4DistMgmtSiteUrlParentCalculationTest.java | 61 ------------------- .../test/resources/mng-3134/parent/pom.xml | 40 ------------ .../src/test/resources/mng-3134/pom.xml | 18 ------ .../src/test/resources/mng-3134/sub1/pom.xml | 58 ------------------ 5 files changed, 178 deletions(-) delete mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java delete mode 100644 its/core-it-suite/src/test/resources/mng-3134/parent/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/mng-3134/pom.xml delete mode 100644 its/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java index 30ac6e697d..c19eafefcc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java @@ -151,7 +151,6 @@ public class IntegrationTestSuite suite.addTestSuite( MavenITmng3268MultipleDashPCommandLineTest.class ); suite.addTestSuite( MavenITmng3259DepsDroppedInMultiModuleBuildTest.class ); suite.addTestSuite( MavenITmng3220ImportScopeTest.class ); - suite.addTestSuite( MavenITmng3134DistMgmtSiteUrlParentCalculationTest.class ); suite.addTestSuite( MavenITmng3106ProfileMultipleActivatorsTest.class ); suite.addTestSuite( MavenITmng3099SettingsProfilesWithNoPomTest.class ); suite.addTestSuite( MavenITmng3052DepRepoAggregationTest.class ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java deleted file mode 100644 index 9a8ade61f9..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3134DistMgmtSiteUrlParentCalculationTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.apache.maven.it; - -/* - * 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. - */ - -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; -import java.util.Properties; - -/** - * This is a test set for MNG-3134. - * - * @author John Casey - * @version $Id$ - */ -public class MavenITmng3134DistMgmtSiteUrlParentCalculationTest - extends AbstractMavenIntegrationTestCase -{ - - public MavenITmng3134DistMgmtSiteUrlParentCalculationTest() - { - super( "(2.0.7,)" ); - } - - /** - * Test DistributionManagement Site-URL calculation when modules are in sibling dirs of parent. - */ - public void testitMNG3134() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3134" ); - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.setAutoclean( false ); - verifier.deleteDirectory( "sub1/target" ); - verifier.executeGoal( "validate" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - Properties props = verifier.loadProperties( "sub1/target/site.properties" ); - assertEquals( "scp://host/path/sub1", props.getProperty( "project.distributionManagement.site.url" ) ); - } - -} diff --git a/its/core-it-suite/src/test/resources/mng-3134/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-3134/parent/pom.xml deleted file mode 100644 index ad84a1ea0d..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3134/parent/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - 4.0.0 - - org.apache.maven.its.mng3134 - parent - 1 - pom - - - - website - scp://host/path/parent - - - - - ../sub1 - - diff --git a/its/core-it-suite/src/test/resources/mng-3134/pom.xml b/its/core-it-suite/src/test/resources/mng-3134/pom.xml deleted file mode 100644 index f8fd28fc58..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3134/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - 4.0.0 - Maven Integration Test :: it0095 - org.apache.maven.its.it0095 - maven-it-it0128 - Test DistributionManagement/Site URL calculation when modules are sibling dirs of parent. (MNG-3134) - 1 - - pom - - - parent - - - - integration-test - - diff --git a/its/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml b/its/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml deleted file mode 100644 index 5e054efb65..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3134/sub1/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.mng3134 - parent - 1 - ../parent - - - sub1 - - - - - org.apache.maven.its.plugins - maven-it-plugin-expression - 2.1-SNAPSHOT - - ${project.build.directory}/site.properties - - project/distributionManagement/site/url - - - - - test - validate - - eval - - - - - - -