Reduce noise from passing integration tests (#470)

apache · Nov 17, 2024 · c6528a9 · c6528a9
1 parent c04f223
commit c6528a9
Show file tree

Hide file tree

Showing 27 changed files with 3 additions and 55 deletions.
diff --git a/src/it/projects/copy-and-unpack-with-alternate-local-repo/verify.bsh b/src/it/projects/copy-and-unpack-with-alternate-local-repo/verify.bsh
@@ -22,21 +22,18 @@ import java.io.*;
 
 File file = new File( basedir, "target/dependency/junit-3.8.1.jar" );
 
-System.out.println( "Checking for existence of " + file );
 if ( !file.isFile() )
 {
    throw new Exception( "Missing " + file );
 }
 
 file = new File( basedir, "target/dependency/junit" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isDirectory() )
 {
    throw new Exception( "Missing " + file );
 }
 
 file = new File( basedir, "target/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isFile() )
 {
    throw new Exception( "Missing " + file );

diff --git a/src/it/projects/copy-cli/verify.bsh b/src/it/projects/copy-cli/verify.bsh
@@ -28,7 +28,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( libDir, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/copy-dependencies/verify.bsh b/src/it/projects/copy-dependencies/verify.bsh
@@ -24,7 +24,6 @@ void checkExpected( File dir, String[] expectedFiles )
     for ( String expectedFile : expectedFiles )
     {
         File file = new File( dir, expectedFile );
-        System.out.println( "Checking for existence of " + file );
         if ( !file.isFile() )
         {
             throw new Exception( "Missing file " + file );
@@ -39,7 +38,6 @@ void checkExpected( File dir, String[] expectedFiles, String[] unexpectedFiles )
     for ( String unexpectedFile : unexpectedFiles )
     {
         File file = new File( dir, unexpectedFile );
-        System.out.println( "Checking for inexistence of " + file );
         if ( file.isFile() )
         {
             throw new Exception( "Unexpected file " + file  + " found" );

diff --git a/src/it/projects/copy-from-reactor/verify.bsh b/src/it/projects/copy-from-reactor/verify.bsh
@@ -28,7 +28,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( libDir, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/copy-from-remote-repository/verify.bsh b/src/it/projects/copy-from-remote-repository/verify.bsh
@@ -26,7 +26,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( localRepositoryPath, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/copy-with-prependGroupId/verify.bsh b/src/it/projects/copy-with-prependGroupId/verify.bsh
@@ -28,7 +28,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( libDir, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/copy/verify.bsh b/src/it/projects/copy/verify.bsh
@@ -28,7 +28,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( libDir, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/get-artifact-maven-plugin/verify.bsh b/src/it/projects/get-artifact-maven-plugin/verify.bsh
@@ -27,7 +27,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( localRepositoryPath, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/get-artifact-no-transitive/verify.bsh b/src/it/projects/get-artifact-no-transitive/verify.bsh
@@ -27,7 +27,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( localRepositoryPath, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );
@@ -42,7 +41,6 @@ String[] notExpectedFiles = {
 for ( String notExpectedFile : notExpectedFiles )
 {
     File file = new File( localRepositoryPath, notExpectedFile );
-    System.out.println( "Checking for absence of " + file );
     if ( file.isFile() )
     {
         throw new Exception( "Existing file " + file );

diff --git a/src/it/projects/get-artifact/verify.bsh b/src/it/projects/get-artifact/verify.bsh
@@ -29,7 +29,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( localRepositoryPath, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/get-gav/verify.bsh b/src/it/projects/get-gav/verify.bsh
@@ -29,7 +29,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( localRepositoryPath, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/purge-local-repository-bad-pom/verify.bsh b/src/it/projects/purge-local-repository-bad-pom/verify.bsh
@@ -19,8 +19,6 @@
 
 import java.io.*;
 
-System.out.println( "Checking for presence of purged dependency directories" );
-
 File depJar = new File( localRepositoryPath, "org/apache/maven/its/dependency/purge-local-repository/1.0/purge-local-repository-1.0.jar" );
 
 if ( !depJar.exists() )

diff --git a/src/it/projects/purge-local-repository-multi-module-execution/setup.bsh b/src/it/projects/purge-local-repository-multi-module-execution/setup.bsh
@@ -25,8 +25,6 @@ void createJar( String artifactId )
 
     purgedJar.getParentFile().mkdirs();
     purgedJar.createNewFile();
-
-    System.out.println( "Created dummy JAR " + purgedJar );
 }
 
 createJar( "purged-a" );

diff --git a/src/it/projects/purge-local-repository-multi-module-execution/verify.bsh b/src/it/projects/purge-local-repository-multi-module-execution/verify.bsh
@@ -22,9 +22,7 @@ import java.io.File;
 void checkFilePurged( String artifactId )
 {
     File purgedJar = new File( localRepositoryPath, "org/apache/maven/its/dependency/" + artifactId + "/1.0/" + artifactId + "-1.0.jar" );
-
-    System.out.println( "Checking for absence of dummy JAR " + purgedJar );
-
+
     if ( purgedJar.exists() )
     {
         throw new Exception( "JAR was not purged: " + purgedJar );

diff --git a/src/it/projects/purge-local-repository-multi-module/setup.bsh b/src/it/projects/purge-local-repository-multi-module/setup.bsh
@@ -25,8 +25,6 @@ void createJar( String artifactId )
 
     purgedJar.getParentFile().mkdirs();
     purgedJar.createNewFile();
-
-    System.out.println( "Created dummy JAR " + purgedJar );
 }
 
 createJar( "purged-a" );

diff --git a/src/it/projects/purge-local-repository-non-transitive/verify.bsh b/src/it/projects/purge-local-repository-non-transitive/verify.bsh
@@ -21,8 +21,6 @@ import java.io.*;
 
 File depDir = new File( localRepositoryPath, "org/apache/maven/its/dependency/purge-local-repository/1.0" );
 
-System.out.println( "Checking for absence of purged dependency directory " + depDir );
-
 if ( depDir.exists() )
 {
     throw new Exception( "Directory was not deleted: " + depDir );

diff --git a/src/it/projects/purge-local-repository-reresolve/verify.bsh b/src/it/projects/purge-local-repository-reresolve/verify.bsh
@@ -19,8 +19,6 @@
 
 import java.io.*;
 
-System.out.println( "Checking for presence of purged dependency directories" );
-
 File depJar = new File( localRepositoryPath, "org/apache/maven/its/dependency/purge-local-repository/1.0/purge-local-repository-1.0.jar" );
 
 if ( !depJar.exists() )

diff --git a/src/it/projects/purge-local-repository-snapshots-only/setup.bsh b/src/it/projects/purge-local-repository-snapshots-only/setup.bsh
@@ -24,14 +24,9 @@ File purgedJar = new File( localRepositoryPath, "org/apache/maven/its/dependency
 purgedJar.getParentFile().mkdirs();
 purgedJar.createNewFile();
 
-System.out.println( "Created dummy JAR " + purgedJar );
-
 purgedJar = new File( localRepositoryPath, "org/apache/maven/its/dependency/snap-purged/1.0-SNAPSHOT/snap-purged-1.0-SNAPSHOT.jar" );
 
 purgedJar.getParentFile().mkdirs();
 purgedJar.createNewFile();
 
-System.out.println( "Created dummy JAR " + purgedJar );
-
-
 return true;
diff --git a/src/it/projects/purge-local-repository-snapshots-only/verify.bsh b/src/it/projects/purge-local-repository-snapshots-only/verify.bsh
@@ -21,8 +21,6 @@ import java.io.*;
 
 File nonPurgedJar = new File( localRepositoryPath, "org/apache/maven/its/dependency/purged/1.0/purged-1.0.jar" );
 
-System.out.println( "Checking for presence of dummy JAR " + nonPurgedJar );
-
 if ( !nonPurgedJar.exists() )
 {
     throw new Exception( "JAR was purged: " + nonPurgedJar );
@@ -31,8 +29,6 @@ if ( !nonPurgedJar.exists() )
 
 File purgedJar = new File( localRepositoryPath, "org/apache/maven/its/dependency/snap-purged/1.0-SNAPSHOT/snap-purged-1.0-SNAPSHOT.jar" );
 
-System.out.println( "Checking for absence of dummy JAR " + purgedJar );
-
 if ( purgedJar.exists() )
 {
     throw new Exception( "JAR was not purged: " + purgedJar );

diff --git a/src/it/projects/purge-local-repository-version-range/verify.bsh b/src/it/projects/purge-local-repository-version-range/verify.bsh
@@ -19,8 +19,6 @@
 
 import java.io.*;
 
-System.out.println( "Checking for presence of purged dependency directories" );
-
 File depJar = new File( localRepositoryPath, "org/apache/maven/its/dependency/purge-local-repository/1.0/purge-local-repository-1.0.jar" );
 
 if ( !depJar.exists() )

diff --git a/src/it/projects/purge-local-repository-without-pom/setup.bsh b/src/it/projects/purge-local-repository-without-pom/setup.bsh
@@ -24,6 +24,4 @@ File purgedJar = new File( localRepositoryPath, "org/apache/maven/its/dependency
 purgedJar.getParentFile().mkdirs();
 purgedJar.createNewFile();
 
-System.out.println( "Created dummy JAR " + purgedJar );
-
 return true;
diff --git a/src/it/projects/purge-local-repository/setup.bsh b/src/it/projects/purge-local-repository/setup.bsh
@@ -24,6 +24,4 @@ File purgedJar = new File( localRepositoryPath, "org/apache/maven/its/dependency
 purgedJar.getParentFile().mkdirs();
 purgedJar.createNewFile();
 
-System.out.println( "Created dummy JAR " + purgedJar );
-
 return true;
diff --git a/src/it/projects/purge-local-repository/verify.groovy b/src/it/projects/purge-local-repository/verify.groovy
@@ -20,7 +20,6 @@
 void checkFileAbsence( String path )
 {
   File depJar = new File( localRepositoryPath, path )
-  System.out.println( "Checking for absence of dummy JAR " + depJar )
   if ( depJar.exists() )
   {
     throw new Exception( "Dependency jar was not purged: " + depJar )

diff --git a/src/it/projects/unpack-cli/verify.bsh b/src/it/projects/unpack-cli/verify.bsh
@@ -21,29 +21,25 @@ import java.io.*;
 
 
 File file = new File( basedir, "target/output spaces directory" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isDirectory() )
 {
    throw new Exception( "Missing " + file );
 }
 
 file = new File( file, "qdox-1.5" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isDirectory() )
 {
    throw new Exception( "Missing " + file );
 }
 
 file = new File( file, "build.xml" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isFile() )
 {
    throw new Exception( "Missing " + file );
 }
 
 //until MDEP-242 is fixed, the next test will passed
 file = new File( file.getParent(), "src" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isDirectory() )
 {
    throw new Exception( "Missing " + file );

diff --git a/src/it/projects/unpack-dependencies/verify.groovy b/src/it/projects/unpack-dependencies/verify.groovy
@@ -24,7 +24,7 @@ for (item in expected)
     def file = new File(basedir, 'target/dependency/' + item)
     if (!file.exists())
     {
-       throw new RuntimeException("Missing "+file.name)
+       throw new RuntimeException("Missing " + file.name)
     }
 }
 
@@ -35,7 +35,7 @@ for (item in notExpected)
     def file = new File(basedir, 'target/dependency/' + item)
     if (file.exists())
     {
-       throw new RuntimeException("This file shouldn't be here: "+file.name)
+       throw new RuntimeException("This file shouldn't be here: " + file.name)
     }
 }
 

diff --git a/src/it/projects/unpack-from-remote-repository/verify.bsh b/src/it/projects/unpack-from-remote-repository/verify.bsh
@@ -26,7 +26,6 @@ String[] expectedFiles = {
 for ( String expectedFile : expectedFiles )
 {
     File file = new File( localRepositoryPath, expectedFile );
-    System.out.println( "Checking for existence of " + file );
     if ( !file.isFile() )
     {
         throw new Exception( "Missing file " + file );

diff --git a/src/it/projects/unpack/verify.bsh b/src/it/projects/unpack/verify.bsh
@@ -21,29 +21,25 @@ import java.io.*;
 
 
 File file = new File( basedir, "target/output spaces directory" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isDirectory() )
 {
    throw new Exception( "Missing " + file );
 }
 
 file = new File( file, "qdox-1.5" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isDirectory() )
 {
    throw new Exception( "Missing " + file );
 }
 
 file = new File( file, "build.xml" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isFile() )
 {
    throw new Exception( "Missing " + file );
 }
 
 //until MDEP-242 is fixed, the next test will passed
 file = new File( file.getParent(), "src" );
-System.out.println( "Checking for existence of " + file );
 if ( !file.isDirectory() )
 {
    throw new Exception( "Missing " + file );