diff options
author | Olivier Lamy <olamy@apache.org> | 2013-12-04 12:09:31 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2013-12-04 12:09:31 +0000 |
commit | a6824a7123208a619ebe5fd413666842044d1d5f (patch) | |
tree | 0c33c2a7dc639ba636c7245c2a9fe2b4d289740e /archiva-modules/archiva-web/archiva-webdav | |
parent | 44dd185dade958e4c24014d84db71f870c714fcb (diff) | |
download | archiva-a6824a7123208a619ebe5fd413666842044d1d5f.tar.gz archiva-a6824a7123208a619ebe5fd413666842044d1d5f.zip |
upgrade fest assert version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1547781 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webdav')
2 files changed, 7 insertions, 6 deletions
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 65afb1da1..1c1475d19 100644 --- 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 e069b700a..735aa4549 100644 --- 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" ); } |