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/12/04 13:09:32 UTC
svn commit: r1547781 - in /archiva/trunk: ./
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/
archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/
Author: olamy
Date: Wed Dec 4 12:09:31 2013
New Revision: 1547781
URL: http://svn.apache.org/r1547781
Log:
upgrade fest assert version
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java?rev=1547781&r1=1547780&r2=1547781&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java Wed Dec 4 12:09:31 2013
@@ -322,11 +322,11 @@ public class RepositoryServletRepository
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 )
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java?rev=1547781&r1=1547780&r2=1547781&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java Wed Dec 4 12:09:31 2013
@@ -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" );
}
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1547781&r1=1547780&r2=1547781&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed Dec 4 12:09:31 2013
@@ -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>