From 41704269d186e20f616e91055ae37e3344b8ebb2 Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Fri, 5 Jun 2009 23:13:53 +0000 Subject: [PATCH] [MNG-4167] Removing until we decide how to implement this (probably in Maven 3). Also, limit mng-3057 to 2.1.0 only, since it was withdrawn for 2.2.0 release. git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@782164 13f79535-47bb-0310-9956-ffa450edef68 --- ...mng3057VersionExprTransformationsTest.java | 2 +- ...enITmng4167PluginAndCoordXFormPOMTest.java | 84 ------------------- .../src/test/resources/mng-4167/pom.xml | 37 -------- 3 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4167PluginAndCoordXFormPOMTest.java delete mode 100644 its/core-it-suite/src/test/resources/mng-4167/pom.xml diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java index 17f8557fb5..363565ee72 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java @@ -47,7 +47,7 @@ public class MavenITmng3057VersionExprTransformationsTest public MavenITmng3057VersionExprTransformationsTest() { // TODO: port to 3.x - super( "[2.1.0,)" ); // only test in 2.1.0+ + super( "[2.1.0,2.1.1)" ); // only test in 2.1.0 } public void testitMNG3057 () diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4167PluginAndCoordXFormPOMTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4167PluginAndCoordXFormPOMTest.java deleted file mode 100644 index 04651e7409..0000000000 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4167PluginAndCoordXFormPOMTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * 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 org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; -import java.util.Collections; -import java.util.List; - -/** - * This is a test set for MNG-4167. - * - * @todo Fill in a better description of what this test verifies! - * - * @author Brian Fox - * @author jdcasey - * - */ -public class MavenITmng4167PluginAndCoordXFormPOMTest - extends AbstractMavenIntegrationTestCase -{ - public MavenITmng4167PluginAndCoordXFormPOMTest() - throws InvalidVersionSpecificationException - { - super( "[2.2.0,)" ); - } - - public void testIt () - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4167" ); - - Verifier verifier; - - verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.deleteArtifact( "org.apache.maven.its.mng4167", "mng-4167", "1", "pom" ); - - String specVersion = System.getProperty( "java.specification.version" ); - - verifier.deleteArtifact( "org.apache.maven.its.mng4167." + specVersion, "mng-4167-" + specVersion, "1-" - + specVersion, "pom" ); - - verifier.setCliOptions( Collections.singletonList( "-X" ) ); - - verifier.executeGoal( "install" ); - - List originalPomLines = verifier.loadFile( new File( testDir, "pom.xml" ), false ); - - List derivedPomLines = verifier.loadFile( new File( testDir, "target/pom-copy.xml" ), false ); - - assertFalse( derivedPomLines.equals( originalPomLines ) ); - - File repoPomPath = - new File( verifier.getArtifactPath( "org.apache.maven.its.mng4167." + specVersion, "mng-4167-" - + specVersion, "1-" + specVersion, "pom" ) ); - - List repoPomLines = verifier.loadFile( repoPomPath, false ); - - assertEquals( repoPomLines, derivedPomLines ); - - verifier.verifyErrorFreeLog(); - - verifier.resetStreams(); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-4167/pom.xml b/its/core-it-suite/src/test/resources/mng-4167/pom.xml deleted file mode 100644 index 3e62ecc1a6..0000000000 --- a/its/core-it-suite/src/test/resources/mng-4167/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - org.apache.maven.its.mng4167.${java.specification.version} - mng-4167-${java.specification.version} - pom - 1-${java.specification.version} - - - - - some.group.id.${java.specification.version} - some-artifact-id-${java.specification.version} - 1-${java.specification.version} - cls-${java.specification.version} - jni-${java.specification.version} - - - - - - - - org.apache.maven.its.plugins - maven-it-plugin-touch - 2.1-SNAPSHOT - - - copy-pom - - copy-pom - - - - - - -