svn commit: r1645008 - /maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

[krosenvold]

Author: krosenvold
Date: Fri Dec 12 18:01:09 2014
New Revision: 1645008

URL: http://svn.apache.org/r1645008
Log:
Fixed test on windows

Modified:
    
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java

Modified: 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java?rev=1645008&r1=1645007&r2=1645008&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
 (original)
+++ 
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileSetAssemblyPhaseTest.java
 Fri Dec 12 18:01:09 2014
@@ -99,7 +99,7 @@ public class FileSetAssemblyPhaseTest
 
         final MavenProject project = new MavenProject( new Model() );
 
-        macLogger.expectWarn( true, true );
+        macLogger.expectError( true, true );
 
         final int dirMode = Integer.parseInt( "777", 8 );
         final int fileMode = Integer.parseInt( "777", 8 );
@@ -157,6 +157,20 @@ public class FileSetAssemblyPhaseTest
             logger.warn( (String) anyObject() );
             EasyMock.expectLastCall().anyTimes();
         }
+        public void expectError( final boolean debugCheck, final boolean 
debugEnabled )
+        {
+            if ( debugCheck )
+            {
+                expect( logger.isDebugEnabled()).andReturn( debugEnabled 
).anyTimes();
+            }
+
+            logger.debug( (String) anyObject() );
+            EasyMock.expectLastCall().anyTimes();
+            logger.warn( (String) anyObject() );
+            EasyMock.expectLastCall().anyTimes();
+            logger.error( (String) anyObject() );
+            EasyMock.expectLastCall().anyTimes();
+        }
 
     }