Test code improvements

slachiewicz · slachiewicz · commit f04a98f6ad44 · 2021-02-06T22:49:21.000+01:00
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrReportTest.java
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/JxrTestReportTest.java
@@ -19,10 +19,9 @@
  * under the License.
  */
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.nio.file.Files;
 
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 
@@ -59,41 +58,18 @@ public void testSourceDir()
         assertTrue( new File( xrefTestDir, "stylesheet.css" ).exists() );
 
         // check if there's a link to the javadoc files
-        String str = readFile( new File( xrefTestDir, "testsourcedir/test/AppSampleTest.html" ) );
-        assertTrue( str.toLowerCase().indexOf( "/apidocs/testsourcedir/test/AppSample.html\"".toLowerCase() ) == -1 );
-
-        str = readFile( new File( xrefTestDir, "testsourcedir/test/AppTest.html" ) );
-        assertTrue( str.toLowerCase().indexOf( "/apidocs/testsourcedir/test/App.html\"".toLowerCase() ) == -1 );
-
-    }
-
-    protected void tearDown()
-        throws Exception
-    {
+        String str = readFile( xrefTestDir, "testsourcedir/test/AppSampleTest.html" );
+        assertFalse( str.toLowerCase().contains( "/apidocs/testsourcedir/test/AppSample.html\"".toLowerCase() ) );
 
+        str = readFile( xrefTestDir, "testsourcedir/test/AppTest.html" );
+        assertFalse( str.toLowerCase().contains( "/apidocs/testsourcedir/test/App.html\"".toLowerCase() ) );
     }
 
     /**
      * Read the contents of the specified file object into a string
-     *
-     * @param file the file to be read
-     * @return a String object that contains the contents of the file
-     * @throws java.io.IOException
      */
-    private String readFile( File file )
-        throws IOException
+    private String readFile( File xrefTestDir, String fileName ) throws IOException
     {
-        String str = "", strTmp = "";
-        
-        try ( BufferedReader in = new BufferedReader( new FileReader( file ) ) )
-        {
-            while ( ( strTmp = in.readLine() ) != null )
-            {
-                str = str + ' ' + strTmp;
-            }
-        }
-
-        return str;
+        return new String( Files.readAllBytes( xrefTestDir.toPath().resolve( fileName ) ) );
     }
-
 }
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/AggregateTestMavenProjectStub.java
@@ -25,7 +25,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 
-import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,11 +44,11 @@ public AggregateTestMavenProjectStub()
 
         try
         {
-            model = pomReader.read( new FileReader( new File(
-                getBasedir() + "/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml" ) ) );
+            model = pomReader.read( new FileReader(
+                getBasedir() + "/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml" ) );
             setModel( model );
         }
-        catch ( Exception e )
+        catch ( Exception ignored )
         {
 
         }
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/DefaultConfigurationMavenProjectStub.java
@@ -25,7 +25,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 
-import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,11 +44,11 @@ public DefaultConfigurationMavenProjectStub()
 
         try
         {
-            model = pomReader.read( new FileReader( new File( getBasedir() +
-                "/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ) ) );
+            model = pomReader.read( new FileReader( getBasedir() +
+                "/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ) );
             setModel( model );
         }
-        catch ( Exception e )
+        catch ( Exception ignored )
         {
 
         }
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/ExcludeConfigurationMavenProjectStub.java
@@ -25,7 +25,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 
-import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,11 +43,11 @@ public ExcludeConfigurationMavenProjectStub()
 
         try
         {
-            model = pomReader.read( new FileReader( new File( getBasedir() +
-                "/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml" ) ) );
+            model = pomReader.read( new FileReader( getBasedir() +
+                "/src/test/resources/unit/exclude-configuration/exclude-configuration-plugin-config.xml" ) );
             setModel( model );
         }
-        catch ( Exception e )
+        catch ( Exception ignored )
         {
 
         }
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/IncludeConfigurationMavenProjectStub.java
@@ -25,7 +25,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 
-import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,11 +43,11 @@ public IncludeConfigurationMavenProjectStub()
 
         try
         {
-            model = pomReader.read( new FileReader( new File( getBasedir() +
-                "/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml" ) ) );
+            model = pomReader.read( new FileReader( getBasedir() +
+                "/src/test/resources/unit/include-configuration/include-configuration-plugin-config.xml" ) );
             setModel( model );
         }
-        catch ( Exception e )
+        catch ( Exception ignored )
         {
 
         }
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocDirMavenProjectStub.java
@@ -25,7 +25,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 
-import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +35,7 @@
 public class NoJavadocDirMavenProjectStub
     extends MavenProjectStub
 {
-    private List<ReportPlugin> reportPlugins = new ArrayList<>();
+    private List<ReportPlugin> reportPlugins;
 
     public NoJavadocDirMavenProjectStub()
     {
@@ -45,11 +44,11 @@ public NoJavadocDirMavenProjectStub()
 
         try
         {
-            model = pomReader.read( new FileReader( new File(
-                getBasedir() + "/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml" ) ) );
+            model = pomReader.read( new FileReader(
+                getBasedir() + "/src/test/resources/unit/nojavadocdir-test/nojavadocdir-test-plugin-config.xml" ) );
             setModel( model );
         }
-        catch ( Exception e )
+        catch ( Exception ignored )
         {
 
         }
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/NoJavadocLinkConfigurationMavenProjectStub.java
@@ -36,7 +36,7 @@
 public class NoJavadocLinkConfigurationMavenProjectStub
     extends MavenProjectStub
 {
-    List<ReportPlugin> reportPlugins = new ArrayList<>();
+    List<ReportPlugin> reportPlugins;
 
     public NoJavadocLinkConfigurationMavenProjectStub()
     {
@@ -45,11 +45,11 @@ public NoJavadocLinkConfigurationMavenProjectStub()
 
         try
         {
-            model = pomReader.read( new FileReader( new File( getBasedir() +
-                "/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml" ) ) );
+            model = pomReader.read( new FileReader( getBasedir() +
+                "/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml" ) );
             setModel( model );
         }
-        catch ( Exception e )
+        catch ( Exception ignored )
         {
 
         }
@@ -61,7 +61,7 @@ public NoJavadocLinkConfigurationMavenProjectStub()
         setInceptionYear( model.getInceptionYear() );
 
         String basedir = getBasedir().getAbsolutePath();
-        List<String> compileSourceRoots = new ArrayList<String>();
+        List<String> compileSourceRoots = new ArrayList<>();
         compileSourceRoots.add(
             basedir + "/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink/configuration" );
         setCompileSourceRoots( compileSourceRoots );
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/PomMavenProjectStub.java
@@ -40,7 +40,7 @@ public class PomMavenProjectStub
     public PomMavenProjectStub()
     {
         MavenXpp3Reader pomReader = new MavenXpp3Reader();
-        Model model = null;
+        Model model;
 
         try
         {
diff --git a/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java b/maven-jxr-plugin/src/test/java/org/apache/maven/plugin/jxr/stubs/TestSourceDirMavenProjectStub.java
@@ -24,7 +24,6 @@
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
 
-import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -43,11 +42,11 @@ public TestSourceDirMavenProjectStub()
 
         try
         {
-            model = pomReader.read( new FileReader( new File(
-                getBasedir() + "/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml" ) ) );
+            model = pomReader.read( new FileReader(
+                getBasedir() + "/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml" ) );
             setModel( model );
         }
-        catch ( Exception e )
+        catch ( Exception ignored )
         {
 
         }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`import org.apache.maven.model.io.xpp3.MavenXpp3Reader;`
`26`	`26`	`import org.apache.maven.plugin.testing.stubs.MavenProjectStub;`
`27`	`27`
`28`		`-import java.io.File;`
`29`	`28`	`import java.io.FileReader;`
`30`	`29`	`import java.util.ArrayList;`
`31`	`30`	`import java.util.List;`
`@@ -45,11 +44,11 @@ public AggregateTestMavenProjectStub()`
`45`	`44`
`46`	`45`	`try`
`47`	`46`	`{`
`48`		`- model = pomReader.read( new FileReader( new File(`
`49`		`- getBasedir() + "/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml" ) ) );`
	`47`	`+ model = pomReader.read( new FileReader(`
	`48`	`+ getBasedir() + "/src/test/resources/unit/aggregate-test/aggregate-test-plugin-config.xml" ) );`
`50`	`49`	`setModel( model );`
`51`	`50`	`}`
`52`		`- catch ( Exception e )`
	`51`	`+ catch ( Exception ignored )`
`53`	`52`	`{`
`54`	`53`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`public class NoJavadocLinkConfigurationMavenProjectStub`
`37`	`37`	`extends MavenProjectStub`
`38`	`38`	`{`
`39`		`- List<ReportPlugin> reportPlugins = new ArrayList<>();`
	`39`	`+ List<ReportPlugin> reportPlugins;`
`40`	`40`
`41`	`41`	`public NoJavadocLinkConfigurationMavenProjectStub()`
`42`	`42`	`{`
`@@ -45,11 +45,11 @@ public NoJavadocLinkConfigurationMavenProjectStub()`
`45`	`45`
`46`	`46`	`try`
`47`	`47`	`{`
`48`		`- model = pomReader.read( new FileReader( new File( getBasedir() +`
`49`		`- "/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml" ) ) );`
	`48`	`+ model = pomReader.read( new FileReader( getBasedir() +`
	`49`	`+ "/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink-configuration-plugin-config.xml" ) );`
`50`	`50`	`setModel( model );`
`51`	`51`	`}`
`52`		`- catch ( Exception e )`
	`52`	`+ catch ( Exception ignored )`
`53`	`53`	`{`
`54`	`54`
`55`	`55`	`}`
`@@ -61,7 +61,7 @@ public NoJavadocLinkConfigurationMavenProjectStub()`
`61`	`61`	`setInceptionYear( model.getInceptionYear() );`
`62`	`62`
`63`	`63`	`String basedir = getBasedir().getAbsolutePath();`
`64`		`- List<String> compileSourceRoots = new ArrayList<String>();`
	`64`	`+ List<String> compileSourceRoots = new ArrayList<>();`
`65`	`65`	`compileSourceRoots.add(`
`66`	`66`	`basedir + "/src/test/resources/unit/nojavadoclink-configuration/nojavadoclink/configuration" );`
`67`	`67`	`setCompileSourceRoots( compileSourceRoots );`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class PomMavenProjectStub`
`40`	`40`	`public PomMavenProjectStub()`
`41`	`41`	`{`
`42`	`42`	`MavenXpp3Reader pomReader = new MavenXpp3Reader();`
`43`		`- Model model = null;`
	`43`	`+ Model model;`
`44`	`44`
`45`	`45`	`try`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`import org.apache.maven.model.io.xpp3.MavenXpp3Reader;`
`25`	`25`	`import org.apache.maven.plugin.testing.stubs.MavenProjectStub;`
`26`	`26`
`27`		`-import java.io.File;`
`28`	`27`	`import java.io.FileReader;`
`29`	`28`	`import java.util.ArrayList;`
`30`	`29`	`import java.util.List;`
`@@ -43,11 +42,11 @@ public TestSourceDirMavenProjectStub()`
`43`	`42`
`44`	`43`	`try`
`45`	`44`	`{`
`46`		`- model = pomReader.read( new FileReader( new File(`
`47`		`- getBasedir() + "/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml" ) ) );`
	`45`	`+ model = pomReader.read( new FileReader(`
	`46`	`+ getBasedir() + "/src/test/resources/unit/testsourcedir-test/testsourcedir-test-plugin-config.xml" ) );`
`48`	`47`	`setModel( model );`
`49`	`48`	`}`
`50`		`- catch ( Exception e )`
	`49`	`+ catch ( Exception ignored )`
`51`	`50`	`{`
`52`	`51`
`53`	`52`	`}`