You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/09/17 13:58:43 UTC

svn commit: r1523995 - /archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java

Author: olamy
Date: Tue Sep 17 11:58:42 2013
New Revision: 1523995

URL: http://svn.apache.org/r1523995
Log:
take care of symlink on ci servers

Modified:
    archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java

Modified: archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
URL: http://svn.apache.org/viewvc/archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java?rev=1523995&r1=1523994&r2=1523995&view=diff
==============================================================================
--- archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java (original)
+++ archiva/branches/archiva-1.3.x/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java Tue Sep 17 11:58:42 2013
@@ -409,6 +409,7 @@ public class EditManagedRepositoryAction
 
     private void assertRepositoryEquals( ManagedRepositoryConfiguration expectedRepository,
                                          ManagedRepositoryConfiguration actualRepository )
+        throws IOException
     {
         assertEquals( expectedRepository.getDaysOlder(), actualRepository.getDaysOlder() );
         assertEquals( expectedRepository.getId(), actualRepository.getId() );
@@ -416,7 +417,7 @@ public class EditManagedRepositoryAction
         assertEquals( expectedRepository.getLayout(), actualRepository.getLayout() );
         assertEquals(
             "expected: '" + expectedRepository.getLocation() + "' found '" + actualRepository.getLocation() + "'",
-            expectedRepository.getLocation(), actualRepository.getLocation() );
+            new File( expectedRepository.getLocation()).getCanonicalPath(), new File(actualRepository.getLocation()).getCanonicalPath() );
         assertEquals( expectedRepository.getName(), actualRepository.getName() );
         assertEquals( expectedRepository.getRefreshCronExpression(), actualRepository.getRefreshCronExpression() );
         assertEquals( expectedRepository.getRetentionCount(), actualRepository.getRetentionCount() );