upgrade fest assert version

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1547781 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java
index 65afb1da1d0cc95bacfa87276de249891fb27d2a..1c1475d19313b4feebcf4f2660ade38231b68ebf 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java
@@ -322,11 +322,11 @@ public class RepositoryServletRepositoryGroupTest
         WebResponse response = getServletUnitClient().getResource( request );
 
         assertResponseOK( response );
-        assertTrue( StringUtils.contains( response.getText(), "Collection" ) );
-        assertTrue( StringUtils.contains( response.getText(), "dummy/dummy-artifact" ) );
-        assertTrue( StringUtils.contains( response.getText(), "1.0" ) );
+        Assertions.assertThat( response.getText() ).contains( "Collection" );
+        Assertions.assertThat( response.getText() ).contains( "dummy/dummy-artifact" );
+        Assertions.assertThat( response.getText() ).contains( "1.0" );
         Assertions.assertThat( response.getText() ).contains( "2.0" );
-        //assertTrue( StringUtils.contains( response.getText(), "2.0" ) );
+
     }
 
     protected void assertResponseMethodNotAllowed( WebResponse response )

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
index e069b700a01410ab07052bf72d93e12584130609..735aa454976aa260ae2c0e99463f3f28c91f6eeb 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
@@ -21,6 +21,7 @@ package org.apache.archiva.webdav.util;
 
 import junit.framework.TestCase;
 import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
+import org.fest.assertions.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -34,10 +35,10 @@ public class RepositoryPathUtilTest
     public void testGetRepositoryId()
     {
         String href = "/path/to/my/resource";
-        assertEquals( "to", RepositoryPathUtil.getRepositoryName( href ) );
+        Assertions.assertThat( RepositoryPathUtil.getRepositoryName( href ) ).equals( "to" );
 
         href = "path/to/my/resource";
-        assertEquals( "to", RepositoryPathUtil.getRepositoryName( href ) );
+        Assertions.assertThat( RepositoryPathUtil.getRepositoryName( href ) ).equals( "to" );
 
     }
 

diff --git a/pom.xml b/pom.xml
index a41ad9e730657559f4aa90caf4a079b21beffb0a..75377b70eef4cfb99a667de6769c6dc42be33bb1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
       <dependency>
         <groupId>org.easytesting</groupId>
         <artifactId>fest-assert-core</artifactId>
-        <version>2.0M8</version>
+        <version>2.0M9</version>
         <scope>test</scope>
       </dependency>
       <dependency>