From a6824a7123208a619ebe5fd413666842044d1d5f Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 4 Dec 2013 12:09:31 +0000 Subject: [PATCH] upgrade fest assert version git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1547781 13f79535-47bb-0310-9956-ffa450edef68 --- .../webdav/RepositoryServletRepositoryGroupTest.java | 8 ++++---- .../archiva/webdav/util/RepositoryPathUtilTest.java | 5 +++-- pom.xml | 2 +- 3 files changed, 8 insertions(+), 7 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" ); } diff --git a/pom.xml b/pom.xml index a41ad9e73..75377b70e 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ org.easytesting fest-assert-core - 2.0M8 + 2.0M9 test -- 2.39.5