[MNG-6261] refactor code review

apache · Nov 24, 2018 · ca5d156 · ca5d156
1 parent e50878f
commit ca5d156
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
@@ -89,7 +89,7 @@ public boolean equals( Object obj )
             return true;
         }
 
-        if ( ( obj == null ) || !( obj instanceof FileModelSource ) ) 
+        if ( !( obj instanceof FileModelSource ) ) 
         {
             return false;
         }
@@ -100,7 +100,7 @@ public boolean equals( Object obj )
     @Override
     public int hashCode() 
     {
-        return super.hashCode(); 
+        return getFile().hashCode(); 
     }
 
 }
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
@@ -19,34 +19,28 @@
  * under the License.
  */
 import java.io.File;
-import junit.framework.TestCase;
+import java.io.IOException;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertTrue;
 import org.apache.commons.lang3.SystemUtils;
 import static org.junit.Assume.assumeTrue;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 
 /**
+ * Test that validate the solution of MNG-6261 issue
  *
- * @author fabiano
  */
 public class FileModelSourceTest
 {
 
-    @Rule
-    public TemporaryFolder folder = new TemporaryFolder();
-
     /**
      * Test of equals method, of class FileModelSource.
      */
     @Test
     public void testEquals()
             throws Exception 
     {
-        File tempFile = File.createTempFile( "pomTest-", ".xml" );
-        tempFile.deleteOnExit();
+        File tempFile = createTempFile( "pomTest" );
         FileModelSource instance = new FileModelSource( tempFile );
 
         assertFalse( instance.equals( null ) );
@@ -61,14 +55,21 @@ public void testWindowsPaths()
     {
         assumeTrue( SystemUtils.IS_OS_WINDOWS );
 
-        File upperCaseFolder = folder.newFolder( "TESTE" );
-        String absolutePath = upperCaseFolder.getAbsolutePath();
-        File lowerCaseFolder = new File( absolutePath.toLowerCase() );
+        File upperCaseFile = createTempFile( "TESTE" );
+        String absolutePath = upperCaseFile.getAbsolutePath();
+        File lowerCaseFile = new File( absolutePath.toLowerCase() );
 
-        FileModelSource upperCaseFolderSouce = new FileModelSource( upperCaseFolder );
-        FileModelSource lowerCaseFolderSouce = new FileModelSource( lowerCaseFolder );
+        FileModelSource upperCaseFileSouce = new FileModelSource( upperCaseFile );
+        FileModelSource lowerCaseFileSouce = new FileModelSource( lowerCaseFile );
+
+        assertTrue( upperCaseFileSouce.equals( lowerCaseFileSouce ) );        
+    }
 
-        assertTrue( upperCaseFolderSouce.equals( lowerCaseFolderSouce ) );        
+    private File createTempFile( String name ) throws IOException
+    {
+        File tempFile = File.createTempFile( name, ".xml" );
+        tempFile.deleteOnExit();
+        return tempFile;
     }
 
 }