[MSHARED-860] suppress deprecations and clean up test methods

src/test/java/org/apache/maven/shared/utils/io/MatchPatternTest.java

@@ -25,11 +25,11 @@
 /**
  * @author Kristian Rosenvold
  */
+@SuppressWarnings( "deprecation" )
 public class MatchPatternTest
 {
     @Test
     public void matchPath()
-        throws Exception
     {
         MatchPattern mp = MatchPattern.fromString( "ABC*" );
         assertTrue( mp.matchPath( "ABCD", true ) );

src/test/java/org/apache/maven/shared/utils/io/MatchPatternsTest.java

@@ -26,11 +26,11 @@
 /**
  * @author Kristian Rosenvold
  */
+@SuppressWarnings( "deprecation" )
 public class MatchPatternsTest
 {
     @Test
     public void matches()
-        throws Exception
     {
         MatchPatterns from = MatchPatterns.from( "ABC**", "CDE**" );
         assertTrue( from.matches( "ABCDE", true ) );

src/test/java/org/apache/maven/shared/utils/io/SelectorUtilsTest.java

@@ -27,8 +27,8 @@
 
 /**
  * Test the {@link SelectorUtils} class.
- *
  */
+@SuppressWarnings( "deprecation" )
 public class SelectorUtilsTest
 {
 
@@ -67,7 +67,6 @@ public void testAntPatternStrings()
         assertAntDoesNotMatch( "/aaa/", "\\aaa\\bbb" );
     }
 
-
     private void assertAntDoesNotMatch( String pattern, String target )
     {
         assertEquals( false, SelectorUtils.matchPatternStart( wrapWithAntHandler( pattern ), target ) );

src/test/java/org/apache/maven/shared/utils/testhelpers/FileTestHelper.java

@@ -19,20 +19,26 @@
  * under the License.
  */
 
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.junit.rules.TemporaryFolder;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
+import org.apache.commons.io.FileUtils;
 
-import java.io.*;
+import org.junit.rules.TemporaryFolder;
 
 /**
- * A few utility methods for file based tests
+ * A few utility methods for file based tests.
  */
 public final class FileTestHelper
 {
 
     private FileTestHelper()
     {
-        // utility function doesn't need a public ct
+        // utility function doesn't need a public constructor
     }
 
     public static void generateTestData( OutputStream out, long size )
@@ -54,14 +60,12 @@ public static void generateTestFile( File testfile, int size )
             testfile.delete();
         }
 
-        OutputStream os = new FileOutputStream( testfile );
-        generateTestData( os, size );
-        os.flush();
-        os.close();
+        try ( OutputStream os = new FileOutputStream( testfile ) ) {
+            generateTestData( os, size );
+            os.flush();
+        }
     }
 
-
-
     public static void createLineBasedFile( File file, String[] data )
         throws IOException
     {
@@ -70,11 +74,12 @@ public static void createLineBasedFile( File file, String[] data )
             throw new IOException( "Cannot create file " + file + " as the parent directory does not exist" );
         }
 
-        try ( PrintWriter out = new PrintWriter( new OutputStreamWriter( new FileOutputStream( file ), "UTF-8" ) ) )
+        try ( Writer out = new OutputStreamWriter( new FileOutputStream( file ), "UTF-8" ) )
         {
             for ( String aData : data )
             {
-                out.println( aData );
+                out.write( aData );
+                out.write( System.getProperty( "line.separator" ) );
             }
         }
     }
@@ -92,7 +97,7 @@ public static File newFile( TemporaryFolder folder, String filename )
 
         if ( destination.exists() )
         {
-            FileUtils.forceDelete( destination );
+            FileUtils.deleteQuietly( destination );
         }
         return destination;
     }