svn commit: r606320 - /incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java

[sisbell]

Author: sisbell
Date: Fri Dec 21 13:19:02 2007
New Revision: 606320

URL: http://svn.apache.org/viewvc?rev=606320&view=rev
Log:
NMaven-100: Fixed last broken unit test.

Modified:
    
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java

Modified: 
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java?rev=606320&r1=606319&r2=606320&view=diff
==============================================================================
--- 
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
 (original)
+++ 
incubator/nmaven/trunk/components/maven-dotnet-compiler/src/test/java/org/apache/maven/dotnet/compiler/impl/DotnetCompilerContextImplTest.java
 Fri Dec 21 13:19:02 2007
@@ -169,9 +169,9 @@
     public void testInit_WithGacGenericAndNovellAndPath()
         throws InitializationException, IOException
     {
-        String monoRoot =  Vendor.getDefaultVendorForOS().equals( 
Vendor.NOVELL ) ? "/Mono" : "C:\\Program Files\\Mono";
+        String monoRoot = Vendor.getDefaultVendorForOS().equals( Vendor.NOVELL 
) ? "/Mono" : "C:\\Program Files\\Mono";
 
-        System.setProperty( "PATH", monoRoot + File.separator + "bin");
+        System.setProperty( "PATH", monoRoot + File.separator + "bin" );
         DotnetCompilerContextImpl ctx = new DotnetCompilerContextImpl();
         MavenProject project = new MavenProject();
 
@@ -196,14 +196,15 @@
         Set<Artifact> libraries = ctx.getLibraryDependencies();
         assertThat( libraries.size(), equalTo( 1 ) );
         assertThat( ( (Artifact) libraries.toArray()[0] 
).getFile().getAbsolutePath(), equalTo(
-            monoRoot + 
replaceFileSeparator("\\lib\\mono\\gac\\artifactId\\1.0__dsfajkdsfajdfs\\artifactId.dll"
 )) );
+            monoRoot + replaceFileSeparator( 
"\\lib\\mono\\gac\\artifactId\\1.0__dsfajkdsfajdfs\\artifactId.dll" ) ) );
     }
 
-    //  @Test
+    @Test
     public void testInit_WithGacGenericAndNovellAndMonoRoot()
         throws InitializationException, IOException
     {
-        System.setProperty( "MONO_ROOT", "/Program Files/Mono/bin" );
+        String monoRoot = Vendor.getDefaultVendorForOS().equals( Vendor.NOVELL 
) ? "/Mono" : "C:\\Program Files\\Mono";
+        System.setProperty( "MONO_ROOT", monoRoot );
         DotnetCompilerContextImpl ctx = new DotnetCompilerContextImpl();
         MavenProject project = new MavenProject();
 
@@ -228,7 +229,7 @@
         Set<Artifact> libraries = ctx.getLibraryDependencies();
         assertThat( libraries.size(), equalTo( 1 ) );
         assertThat( ( (Artifact) libraries.toArray()[0] 
).getFile().getAbsolutePath(), equalTo(
-            "C:\\Program 
Files\\Mono\\lib\\mono\\gac\\artifactId\\1.0__dsfajkdsfajdfs\\artifactId.dll" ) 
);
+            monoRoot + replaceFileSeparator( 
"\\lib\\mono\\gac\\artifactId\\1.0__dsfajkdsfajdfs\\artifactId.dll" ) ) );
     }
 
 //    @Test
@@ -266,8 +267,8 @@
         return config;
     }
 
-        private static String replaceFileSeparator(String value)
+    private static String replaceFileSeparator( String value )
     {
-        return value.replaceAll( "[/\\\\]+", "\\" + File.separator);
+        return value.replaceAll( "[/\\\\]+", "\\" + File.separator );
     }
 }