Clean up integration tests

elharo · elharo · commit 87371f0901ed · 2024-11-22T17:01:16.000-05:00
diff --git a/src/it/announcement-generate-custom-template/verify.bsh b/src/it/announcement-generate-custom-template/verify.bsh
@@ -19,21 +19,26 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 
 try
 {
     File report = new File( basedir, "target/announcement/test-announce.vm" );
-    if ( !report.exists() || report.isDirectory() )
+    if ( !report.exists() )
     {
-        System.err.println( "report file is missing or a directory." );
+        System.err.println( "report file is missing." );
         return false;
     }
-    String reportContent = FileUtils.fileRead( report );
+    if ( report.isDirectory() )
+    {
+        System.err.println( "report file is a directory." );
+        return false;
+    }
+    String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");
 
     int indexOf = reportContent.indexOf( "maven-changes-plugin-test-1.1 release" );
     if ( indexOf < 0 )
diff --git a/src/it/report-changes-generation/verify.bsh b/src/it/report-changes-generation/verify.bsh
@@ -19,33 +19,38 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 
 try
 {
     File report = new File( basedir, "target/site/changes-report.html" );
-    if ( !report.exists() || report.isDirectory() )
+    if ( !report.exists() )
     {
-        System.err.println( "report file is missing or a directory." );
+        System.err.println( "report file is missing." );
         return false;
     }
-    String reportContent = FileUtils.fileRead( report );
+    if ( report.isDirectory() )
+    {
+        System.err.println( "report is directory." );
+        return false;
+    }
+    String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");
 
     int indexOf = reportContent.indexOf( "Changes" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains Changes title" );
+      System.err.println( "changes-report.html doesn't contain Changes title" );
       return false;
     }
 
     indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains jira issue link" );
+      System.err.println( "changes-report.html doesn't contain jira issue link" );
       return false;
     }
 
@@ -61,7 +66,7 @@ try
     indexOf = reportContent.indexOf( "bug-12345" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains issue text for issue specified with <fixes> element" );
+      System.err.println( "changes-report.html doesn't contain issue text for issue specified with <fixes> element" );
       return false;
     }
     indexOf = reportContent.indexOf( "Fixes ." );
diff --git a/src/it/report-changes-interpolation/verify.bsh b/src/it/report-changes-interpolation/verify.bsh
@@ -19,34 +19,40 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.text.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
+import java.nio.file.*;
 
 boolean result = true;
 
 try
 {
     File report = new File( basedir, "target/site/changes-report.html" );
-    if ( !report.exists() || report.isDirectory() )
+    if ( !report.exists() )
     {
-        System.err.println( "report file is missing or a directory." );
+        System.err.println( "report file is missing." );
         return false;
     }
-    String reportContent = FileUtils.fileRead( report );
+    if ( report.isDirectory() )
+    {
+        System.err.println( "report file is a directory." );
+        return false;
+    }
+    String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");
 
     int indexOf = reportContent.indexOf( "Changes" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains Changes title" );
+      System.err.println( "changes-report.html doesn't contain Changes title" );
       return false;
     }
 
     indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains jira issue link" );
+      System.err.println( "changes-report.html doesn't contain jira issue link" );
       return false;
     }
 
@@ -62,7 +68,7 @@ try
     indexOf = reportContent.indexOf( "bug-12345" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains issue text for issue specified with <fixes> element" );
+      System.err.println( "changes-report.html doesn't contain issue text for issue specified with <fixes> element" );
       return false;
     }
     indexOf = reportContent.indexOf( "Fixes ." );
@@ -75,7 +81,7 @@ try
     indexOf = reportContent.indexOf( "<a href=\"#a99.0\">" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains version from pom" );
+      System.err.println( "changes-report.html doesn't contain version from pom" );
       return false;
     }
 
@@ -86,7 +92,7 @@ try
     indexOf = reportContent.indexOf( formattedDate );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't publishDate" );
+      System.err.println( "changes-report.html doesn't contain publishDate" );
       return false;
     }
 
diff --git a/src/it/report-changes-system-noissuemanagement/verify.bsh b/src/it/report-changes-system-noissuemanagement/verify.bsh
@@ -19,51 +19,56 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 
 try
 {
     File report = new File( basedir, "target/site/changes-report.html" );
-    if ( !report.exists() || report.isDirectory() )
+    if ( !report.exists() )
     {
-        System.err.println( "report file is missing or a directory." );
+        System.err.println( "report file is missing." );
         return false;
     }
-    String reportContent = FileUtils.fileRead( report );
+    if ( report.isDirectory() )
+    {
+        System.err.println( "report file is a directory." );
+        return false;
+    }
+    String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");
 
     int indexOf = reportContent.indexOf( "Changes" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains Changes title" );
+      System.err.println( "changes-report.html doesn't contain Changes title" );
       return false;
     }
 
     indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains jira issue link" );
+      System.err.println( "changes-report.html doesn't contain jira issue link" );
       return false;
     }
     indexOf = reportContent.indexOf( "href=\"http://localhost/1212\"" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains qc issue link" );
+      System.err.println( "changes-report.html doesn't contain qc issue link" );
       return false;
     }
     indexOf = reportContent.indexOf( "href=\"http://www.redmine.org/show/issue/88\"" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains redmine issue link" );
+      System.err.println( "changes-report.html doesn't contain redmine issue link" );
       return false;
     }
     indexOf = reportContent.indexOf( "2008-01-01" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains date 2008-01-01" );
+      System.err.println( "changes-report.html doesn't contain date 2008-01-01" );
       return false;
     }
 
diff --git a/src/it/report-changes-system/verify.bsh b/src/it/report-changes-system/verify.bsh
@@ -19,45 +19,50 @@
  */
 
 import java.io.*;
+import java.nio.file.*;
 import java.util.*;
 import java.util.jar.*;
-import org.codehaus.plexus.util.*;
 
 boolean result = true;
 
 try
 {
     File report = new File( basedir, "target/site/en/changes-report.html" );
-    if ( !report.exists() || report.isDirectory() )
+    if ( !report.exists() )
     {
-        System.err.println( "report file is missing or a directory." );
+        System.err.println( "report file is missing." );
         return false;
     }
-    String reportContent = FileUtils.fileRead( report );
+    if ( report.isDirectory() )
+    {
+        System.err.println( "report file is a directory." );
+        return false;
+    }
+    String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");
 
     int indexOf = reportContent.indexOf( "Changes" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains Changes title" );
+      System.err.println( "changes-report.html doesn't contain Changes title" );
       return false;
     }
 
     indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains jira issue link" );
+      System.err.println( "changes-report.html doesn't contain jira issue link" );
       return false;
     }
     indexOf = reportContent.indexOf( "href=\"http://localhost/1212\"" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains qc issue link" );
+      System.err.println( "changes-report.html doesn't contain qc issue link" );
       return false;
     }
     indexOf = reportContent.indexOf( "2008-01-01" );
     if ( indexOf < 0 )
     {
-      System.err.println( "changes-report.html doesn't contains date 2008-01-01" );
+      System.err.println( "changes-report.html doesn't contain date 2008-01-01" );
       return false;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,33 +19,38 @@`
`19`	`19`	`*/`
`20`	`20`
`21`	`21`	`import java.io.*;`
	`22`	`+import java.nio.file.*;`
`22`	`23`	`import java.util.*;`
`23`	`24`	`import java.util.jar.*;`
`24`		`-import org.codehaus.plexus.util.*;`
`25`	`25`
`26`	`26`	`boolean result = true;`
`27`	`27`
`28`	`28`	`try`
`29`	`29`	`{`
`30`	`30`	`File report = new File( basedir, "target/site/changes-report.html" );`
`31`		`- if ( !report.exists() \|\| report.isDirectory() )`
	`31`	`+ if ( !report.exists() )`
`32`	`32`	`{`
`33`		`- System.err.println( "report file is missing or a directory." );`
	`33`	`+ System.err.println( "report file is missing." );`
`34`	`34`	`return false;`
`35`	`35`	`}`
`36`		`- String reportContent = FileUtils.fileRead( report );`
	`36`	`+ if ( report.isDirectory() )`
	`37`	`+ {`
	`38`	`+ System.err.println( "report is directory." );`
	`39`	`+ return false;`
	`40`	`+ }`
	`41`	`+ String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");`
`37`	`42`
`38`	`43`	`int indexOf = reportContent.indexOf( "Changes" );`
`39`	`44`	`if ( indexOf < 0 )`
`40`	`45`	`{`
`41`		`- System.err.println( "changes-report.html doesn't contains Changes title" );`
	`46`	`+ System.err.println( "changes-report.html doesn't contain Changes title" );`
`42`	`47`	`return false;`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );`
`46`	`51`	`if ( indexOf < 0 )`
`47`	`52`	`{`
`48`		`- System.err.println( "changes-report.html doesn't contains jira issue link" );`
	`53`	`+ System.err.println( "changes-report.html doesn't contain jira issue link" );`
`49`	`54`	`return false;`
`50`	`55`	`}`
`51`	`56`
`@@ -61,7 +66,7 @@ try`
`61`	`66`	`indexOf = reportContent.indexOf( "bug-12345" );`
`62`	`67`	`if ( indexOf < 0 )`
`63`	`68`	`{`
`64`		`- System.err.println( "changes-report.html doesn't contains issue text for issue specified with <fixes> element" );`
	`69`	`+ System.err.println( "changes-report.html doesn't contain issue text for issue specified with <fixes> element" );`
`65`	`70`	`return false;`
`66`	`71`	`}`
`67`	`72`	`indexOf = reportContent.indexOf( "Fixes ." );`
Original file line number	Diff line number	Diff line change
`@@ -19,34 +19,40 @@`
`19`	`19`	`*/`
`20`	`20`
`21`	`21`	`import java.io.*;`
	`22`	`+import java.nio.file.*;`
`22`	`23`	`import java.text.*;`
`23`	`24`	`import java.util.*;`
`24`	`25`	`import java.util.jar.*;`
`25`		`-import org.codehaus.plexus.util.*;`
	`26`	`+import java.nio.file.*;`
`26`	`27`
`27`	`28`	`boolean result = true;`
`28`	`29`
`29`	`30`	`try`
`30`	`31`	`{`
`31`	`32`	`File report = new File( basedir, "target/site/changes-report.html" );`
`32`		`- if ( !report.exists() \|\| report.isDirectory() )`
	`33`	`+ if ( !report.exists() )`
`33`	`34`	`{`
`34`		`- System.err.println( "report file is missing or a directory." );`
	`35`	`+ System.err.println( "report file is missing." );`
`35`	`36`	`return false;`
`36`	`37`	`}`
`37`		`- String reportContent = FileUtils.fileRead( report );`
	`38`	`+ if ( report.isDirectory() )`
	`39`	`+ {`
	`40`	`+ System.err.println( "report file is a directory." );`
	`41`	`+ return false;`
	`42`	`+ }`
	`43`	`+ String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");`
`38`	`44`
`39`	`45`	`int indexOf = reportContent.indexOf( "Changes" );`
`40`	`46`	`if ( indexOf < 0 )`
`41`	`47`	`{`
`42`		`- System.err.println( "changes-report.html doesn't contains Changes title" );`
	`48`	`+ System.err.println( "changes-report.html doesn't contain Changes title" );`
`43`	`49`	`return false;`
`44`	`50`	`}`
`45`	`51`
`46`	`52`	`indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );`
`47`	`53`	`if ( indexOf < 0 )`
`48`	`54`	`{`
`49`		`- System.err.println( "changes-report.html doesn't contains jira issue link" );`
	`55`	`+ System.err.println( "changes-report.html doesn't contain jira issue link" );`
`50`	`56`	`return false;`
`51`	`57`	`}`
`52`	`58`
`@@ -62,7 +68,7 @@ try`
`62`	`68`	`indexOf = reportContent.indexOf( "bug-12345" );`
`63`	`69`	`if ( indexOf < 0 )`
`64`	`70`	`{`
`65`		`- System.err.println( "changes-report.html doesn't contains issue text for issue specified with <fixes> element" );`
	`71`	`+ System.err.println( "changes-report.html doesn't contain issue text for issue specified with <fixes> element" );`
`66`	`72`	`return false;`
`67`	`73`	`}`
`68`	`74`	`indexOf = reportContent.indexOf( "Fixes ." );`
`@@ -75,7 +81,7 @@ try`
`75`	`81`	`indexOf = reportContent.indexOf( "<a href=\"#a99.0\">" );`
`76`	`82`	`if ( indexOf < 0 )`
`77`	`83`	`{`
`78`		`- System.err.println( "changes-report.html doesn't contains version from pom" );`
	`84`	`+ System.err.println( "changes-report.html doesn't contain version from pom" );`
`79`	`85`	`return false;`
`80`	`86`	`}`
`81`	`87`
`@@ -86,7 +92,7 @@ try`
`86`	`92`	`indexOf = reportContent.indexOf( formattedDate );`
`87`	`93`	`if ( indexOf < 0 )`
`88`	`94`	`{`
`89`		`- System.err.println( "changes-report.html doesn't publishDate" );`
	`95`	`+ System.err.println( "changes-report.html doesn't contain publishDate" );`
`90`	`96`	`return false;`
`91`	`97`	`}`
`92`	`98`
Original file line number	Diff line number	Diff line change
`@@ -19,51 +19,56 @@`
`19`	`19`	`*/`
`20`	`20`
`21`	`21`	`import java.io.*;`
	`22`	`+import java.nio.file.*;`
`22`	`23`	`import java.util.*;`
`23`	`24`	`import java.util.jar.*;`
`24`		`-import org.codehaus.plexus.util.*;`
`25`	`25`
`26`	`26`	`boolean result = true;`
`27`	`27`
`28`	`28`	`try`
`29`	`29`	`{`
`30`	`30`	`File report = new File( basedir, "target/site/changes-report.html" );`
`31`		`- if ( !report.exists() \|\| report.isDirectory() )`
	`31`	`+ if ( !report.exists() )`
`32`	`32`	`{`
`33`		`- System.err.println( "report file is missing or a directory." );`
	`33`	`+ System.err.println( "report file is missing." );`
`34`	`34`	`return false;`
`35`	`35`	`}`
`36`		`- String reportContent = FileUtils.fileRead( report );`
	`36`	`+ if ( report.isDirectory() )`
	`37`	`+ {`
	`38`	`+ System.err.println( "report file is a directory." );`
	`39`	`+ return false;`
	`40`	`+ }`
	`41`	`+ String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");`
`37`	`42`
`38`	`43`	`int indexOf = reportContent.indexOf( "Changes" );`
`39`	`44`	`if ( indexOf < 0 )`
`40`	`45`	`{`
`41`		`- System.err.println( "changes-report.html doesn't contains Changes title" );`
	`46`	`+ System.err.println( "changes-report.html doesn't contain Changes title" );`
`42`	`47`	`return false;`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );`
`46`	`51`	`if ( indexOf < 0 )`
`47`	`52`	`{`
`48`		`- System.err.println( "changes-report.html doesn't contains jira issue link" );`
	`53`	`+ System.err.println( "changes-report.html doesn't contain jira issue link" );`
`49`	`54`	`return false;`
`50`	`55`	`}`
`51`	`56`	`indexOf = reportContent.indexOf( "href=\"http://localhost/1212\"" );`
`52`	`57`	`if ( indexOf < 0 )`
`53`	`58`	`{`
`54`		`- System.err.println( "changes-report.html doesn't contains qc issue link" );`
	`59`	`+ System.err.println( "changes-report.html doesn't contain qc issue link" );`
`55`	`60`	`return false;`
`56`	`61`	`}`
`57`	`62`	`indexOf = reportContent.indexOf( "href=\"http://www.redmine.org/show/issue/88\"" );`
`58`	`63`	`if ( indexOf < 0 )`
`59`	`64`	`{`
`60`		`- System.err.println( "changes-report.html doesn't contains redmine issue link" );`
	`65`	`+ System.err.println( "changes-report.html doesn't contain redmine issue link" );`
`61`	`66`	`return false;`
`62`	`67`	`}`
`63`	`68`	`indexOf = reportContent.indexOf( "2008-01-01" );`
`64`	`69`	`if ( indexOf < 0 )`
`65`	`70`	`{`
`66`		`- System.err.println( "changes-report.html doesn't contains date 2008-01-01" );`
	`71`	`+ System.err.println( "changes-report.html doesn't contain date 2008-01-01" );`
`67`	`72`	`return false;`
`68`	`73`	`}`
`69`	`74`
Original file line number	Diff line number	Diff line change
`@@ -19,45 +19,50 @@`
`19`	`19`	`*/`
`20`	`20`
`21`	`21`	`import java.io.*;`
	`22`	`+import java.nio.file.*;`
`22`	`23`	`import java.util.*;`
`23`	`24`	`import java.util.jar.*;`
`24`		`-import org.codehaus.plexus.util.*;`
`25`	`25`
`26`	`26`	`boolean result = true;`
`27`	`27`
`28`	`28`	`try`
`29`	`29`	`{`
`30`	`30`	`File report = new File( basedir, "target/site/en/changes-report.html" );`
`31`		`- if ( !report.exists() \|\| report.isDirectory() )`
	`31`	`+ if ( !report.exists() )`
`32`	`32`	`{`
`33`		`- System.err.println( "report file is missing or a directory." );`
	`33`	`+ System.err.println( "report file is missing." );`
`34`	`34`	`return false;`
`35`	`35`	`}`
`36`		`- String reportContent = FileUtils.fileRead( report );`
	`36`	`+ if ( report.isDirectory() )`
	`37`	`+ {`
	`38`	`+ System.err.println( "report file is a directory." );`
	`39`	`+ return false;`
	`40`	`+ }`
	`41`	`+ String reportContent = new String(Files.readAllBytes( report.toPath() ), "UTF-8");`
`37`	`42`
`38`	`43`	`int indexOf = reportContent.indexOf( "Changes" );`
`39`	`44`	`if ( indexOf < 0 )`
`40`	`45`	`{`
`41`		`- System.err.println( "changes-report.html doesn't contains Changes title" );`
	`46`	`+ System.err.println( "changes-report.html doesn't contain Changes title" );`
`42`	`47`	`return false;`
`43`	`48`	`}`
`44`	`49`
`45`	`50`	`indexOf = reportContent.indexOf( "href=\"http://myjira/browse/MCHANGES-88\"" );`
`46`	`51`	`if ( indexOf < 0 )`
`47`	`52`	`{`
`48`		`- System.err.println( "changes-report.html doesn't contains jira issue link" );`
	`53`	`+ System.err.println( "changes-report.html doesn't contain jira issue link" );`
`49`	`54`	`return false;`
`50`	`55`	`}`
`51`	`56`	`indexOf = reportContent.indexOf( "href=\"http://localhost/1212\"" );`
`52`	`57`	`if ( indexOf < 0 )`
`53`	`58`	`{`
`54`		`- System.err.println( "changes-report.html doesn't contains qc issue link" );`
	`59`	`+ System.err.println( "changes-report.html doesn't contain qc issue link" );`
`55`	`60`	`return false;`
`56`	`61`	`}`
`57`	`62`	`indexOf = reportContent.indexOf( "2008-01-01" );`
`58`	`63`	`if ( indexOf < 0 )`
`59`	`64`	`{`
`60`		`- System.err.println( "changes-report.html doesn't contains date 2008-01-01" );`
	`65`	`+ System.err.println( "changes-report.html doesn't contain date 2008-01-01" );`
`61`	`66`	`return false;`
`62`	`67`	`}`
`63`	`68`	`}`