Author: bentmann
Date: Wed Aug  6 17:26:21 2008
New Revision: 683453

URL: http://svn.apache.org/viewvc?rev=683453&view=rev
Log:
o Made test pass on Windows

Modified:
    
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java

Modified: 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
URL: 
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java?rev=683453&r1=683452&r2=683453&view=diff
==============================================================================
--- 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
 (original)
+++ 
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/update/SvnUpdateCommandTest.java
 Wed Aug  6 17:26:21 2008
@@ -110,11 +110,17 @@
         if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
         {
             SvnUtil.setSettingsDirectory( getTestFile( 
"src/test/resources/svn/update/cygwin" ) );
-            assertTrue( SvnUtil.getSettings().isUseCygwinPath() );
-            testCommandLine( "scm:svn:http://foo.com/svn/trunk";, null,
-                             "svn --non-interactive update 
/mnt/c/my_working_directory",
-                             new File( "C:\\my_working_directory" ) );
-            SvnUtil.setSettingsDirectory( SvnUtil.DEFAULT_SETTINGS_DIRECTORY );
+            try
+            {
+                assertTrue( SvnUtil.getSettings().isUseCygwinPath() );
+                testCommandLine( "scm:svn:http://foo.com/svn/trunk";, null,
+                                 "svn --non-interactive update 
/mnt/c/my_working_directory",
+                                 new File( "c:\\my_working_directory" ) );
+            }
+            finally
+            {
+                SvnUtil.setSettingsDirectory( 
SvnUtil.DEFAULT_SETTINGS_DIRECTORY );
+            }
         }
     }
 


Reply via email to