You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/11/04 21:56:50 UTC

svn commit: r1712647 - in /maven/shared/trunk/file-management: pom.xml src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java

Author: khmarbaise
Date: Wed Nov  4 20:56:50 2015
New Revision: 1712647

URL: http://svn.apache.org/viewvc?rev=1712647&view=rev
Log:
[MSHARED-462] Upgrade JUnit Test Cases to new style (JUnit 4.11)

Modified:
    maven/shared/trunk/file-management/pom.xml
    maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java

Modified: maven/shared/trunk/file-management/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/pom.xml?rev=1712647&r1=1712646&r2=1712647&view=diff
==============================================================================
--- maven/shared/trunk/file-management/pom.xml (original)
+++ maven/shared/trunk/file-management/pom.xml Wed Nov  4 20:56:50 2015
@@ -85,7 +85,7 @@ under the License.
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java?rev=1712647&r1=1712646&r2=1712647&view=diff
==============================================================================
--- maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java (original)
+++ maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java Wed Nov  4 20:56:50 2015
@@ -19,9 +19,13 @@ package org.apache.maven.shared.model.fi
  * under the License.
  */
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 import org.apache.maven.shared.model.fileset.Mapper;
+import org.junit.Test;
 
 /**
  * A test-case for the MapperUtil.
@@ -29,12 +33,39 @@ import org.apache.maven.shared.model.fil
  * @version $Id$
  */
 public class MapperUtilTest
-    extends TestCase
 {
 
-	/**
-	 * Test
-	 */
+    @Test
+    public void getFileNameMapperShouldReturnNull()
+        throws MapperException
+    {
+        assertNull( MapperUtil.getFileNameMapper( null ) );
+    }
+
+    @Test
+    public void getFileNameMapperShouldReturnIdentityMapper()
+        throws MapperException
+    {
+        Mapper mapper = new Mapper();
+        FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper( mapper );
+        assertNotNull( fileNameMapper );
+        assertEquals( "/var/some-file.text", fileNameMapper.mapFileName( "/var/some-file.text" ) );
+    }
+
+    @Test
+    public void getFileNameMapperShouldFileNameMapperType() throws MapperException
+    {
+        // check with FileNameMapper type
+        Mapper mapper = new Mapper();
+        mapper.setType( "glob" );
+        mapper.setFrom( "*.java" );
+        mapper.setTo( "*.class" );
+        FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper( mapper );
+        assertNotNull( fileNameMapper );
+        assertEquals( "/var/SomeClasses.class", fileNameMapper.mapFileName( "/var/SomeClasses.java" ) );
+    }
+
+    @Test
     public void testGetFileNameMapper()
     {
         Mapper mapper = null;