You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/05/30 14:00:14 UTC
svn commit: r1682598 -
/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
Author: rfscholte
Date: Sat May 30 12:00:14 2015
New Revision: 1682598
URL: http://svn.apache.org/r1682598
Log:
Fix unittests for Windows
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
Modified: maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java?rev=1682598&r1=1682597&r2=1682598&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java (original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/test/java/org/apache/maven/plugin/assembly/archive/phase/FileItemAssemblyPhaseTest.java Sat May 30 12:00:14 2015
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.assembly
import junit.framework.Assert;
import junit.framework.TestCase;
+
import org.apache.maven.model.Model;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugin.assembly.archive.ArchiveCreationException;
@@ -30,6 +31,7 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.testutils.TestFileManager;
import org.apache.maven.plugin.assembly.utils.TypeConversionUtils;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.Os;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
@@ -198,7 +200,15 @@ public class FileItemAssemblyPhaseTest
macCS.expectInterpolators();
final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- macLogger.logger.warn( (String)anyObject() );
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+ {
+ macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific "
+ + "root-relative-reference (starting with slash) /" );
+ }
+ else
+ {
+ macLogger.logger.warn( (String)anyObject() );
+ }
final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );
@@ -274,8 +284,15 @@ public class FileItemAssemblyPhaseTest
final MockAndControlForLogger macLogger = new MockAndControlForLogger( mm );
- macLogger.logger.warn( (String)anyObject() );
-
+ if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
+ {
+ macLogger.logger.error( "OS=Windows and the assembly descriptor contains a *nix-specific "
+ + "root-relative-reference (starting with slash) /" );
+ }
+ else
+ {
+ macLogger.logger.warn( (String)anyObject() );
+ }
final MockAndControlForArchiver macArchiver = new MockAndControlForArchiver( mm );