[MDEPLOY-319] Cleanup of test code

Author: slawekjaranowski

src/it/3rd-party-jar-with-extras/pom.xml

@@ -22,7 +22,7 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.maven.its.deploy.tpjwop</groupId>
+  <groupId>org.apache.maven.its.deploy.tpjwop1</groupId>
   <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>

src/it/skip/setup.bsh …t/3rd-party-jar-with-extras/setup.groovysrc/it/skip/setup.bsh renamed to src/it/3rd-party-jar-with-extras/setup.groovy src/it/skip/setup.bsh renamed to src/it/3rd-party-jar-with-extras/setup.groovy

@@ -17,13 +17,4 @@
  * under the License.
  */
 
-import java.io.*;
-import java.util.*;
-
-import org.codehaus.plexus.util.*;
-
-File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/skip" );
-System.out.println( "Deleting " + file );
-FileUtils.deleteDirectory( file );
-
-return true;
+assert new File(localRepositoryPath, 'org/apache/maven/its/deploy/tpjwop1').deleteDir()

src/it/3rd-party-jar-with-extras/test.properties

@@ -17,7 +17,7 @@
 
 file = test-0.1.jar
 url = file:target/repo
-groupId = org.apache.maven.its.deploy.tpjwop
+groupId = org.apache.maven.its.deploy.tpjwop1
 artifactId = test
 version = 1.0
 packaging = jar

src/it/3rd-party-jar-with-extras/verify.bsh

@@ -22,11 +22,11 @@ import java.util.*;
 
 String[] paths =
 {
-    "org/apache/maven/its/deploy/tpjwop/test/maven-metadata.xml",
-    "org/apache/maven/its/deploy/tpjwop/test/1.0/test-1.0.jar",
-    "org/apache/maven/its/deploy/tpjwop/test/1.0/test-1.0.zip",
-    "org/apache/maven/its/deploy/tpjwop/test/1.0/test-1.0-src.tar.gz",
-    "org/apache/maven/its/deploy/tpjwop/test/1.0/test-1.0.tar.gz",
+    "org/apache/maven/its/deploy/tpjwop1/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.jar",
+    "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.zip",
+    "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0-src.tar.gz",
+    "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.tar.gz",
 };
 
 for ( String path : paths )
@@ -41,7 +41,7 @@ for ( String path : paths )
 
 String[] missing =
 {
-    "org/apache/maven/its/deploy/tpjwop/test/1.0/test-1.0.pom",
+    "org/apache/maven/its/deploy/tpjwop1/test/1.0/test-1.0.pom",
 };
 
 for ( String path : missing )

src/it/3rd-party-jar-without-pom/pom.xml

@@ -22,7 +22,7 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.maven.its.deploy.tpjwop</groupId>
+  <groupId>org.apache.maven.its.deploy.tpjwop2</groupId>
   <artifactId>test</artifactId>
   <version>1.0</version>
   <packaging>jar</packaging>

src/it/3rd-party-jar-without-pom/setup.bsh

@@ -17,17 +17,4 @@
  * under the License.
  */
 
-import java.io.*;
-import java.util.*;
-
-import org.codehaus.plexus.util.*;
-
-File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/45" );
-System.out.println( "Deleting " + file );
-FileUtils.deleteDirectory( file );
-
-file = new File( basedir, "target/repo" );
-System.out.println( "Deleting " + file );
-FileUtils.deleteDirectory( file );
-
-return true;
+assert new File(localRepositoryPath, 'org/apache/maven/its/deploy/tpjwop2').deleteDir()

src/it/mdeploy-45-test/setup.bsh …t/3rd-party-jar-without-pom/setup.groovysrc/it/mdeploy-45-test/setup.bsh renamed to src/it/3rd-party-jar-without-pom/setup.groovy src/it/mdeploy-45-test/setup.bsh renamed to src/it/3rd-party-jar-without-pom/setup.groovy

@@ -17,7 +17,7 @@
 
 file = test-0.1.jar
 url = file:target/repo
-groupId = org.apache.maven.its.deploy.tpjwop
+groupId = org.apache.maven.its.deploy.tpjwop2
 artifactId = test
 version = 1.0
 packaging = jar

src/it/3rd-party-jar-without-pom/test.properties

@@ -22,8 +22,8 @@ import java.util.*;
 
 String[] paths =
 {
-    "org/apache/maven/its/deploy/tpjwop/test/maven-metadata.xml",
-    "org/apache/maven/its/deploy/tpjwop/test/1.0/test-1.0.jar",
+    "org/apache/maven/its/deploy/tpjwop2/test/maven-metadata.xml",
+    "org/apache/maven/its/deploy/tpjwop2/test/1.0/test-1.0.jar",
 };
 
 for ( String path : paths )
@@ -38,7 +38,7 @@ for ( String path : paths )
 
 String[] missing =
 {
-    "org/apache/maven/its/deploy/tpjwop/test/1.0/test-1.0.pom",
+    "org/apache/maven/its/deploy/tpjwop2/test/1.0/test-1.0.pom",
 };
 
 for ( String path : missing )

src/it/3rd-party-jar-without-pom/verify.bsh

@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = clean jar:jar deploy:deploy