summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-web-common
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-01-29 10:52:46 +0000
committerOlivier Lamy <olamy@apache.org>2013-01-29 10:52:46 +0000
commitca47bd3b997dc2bffe612c81121955928ac4212d (patch)
treef697a4dc67a6c2b5b6bded3ea27390c9f6c230ba /archiva-modules/archiva-web/archiva-web-common
parent9de15a459f5d08ce13e7d3f4f5945c25d71a32cd (diff)
downloadarchiva-ca47bd3b997dc2bffe612c81121955928ac4212d.tar.gz
archiva-ca47bd3b997dc2bffe612c81121955928ac4212d.zip
more compact with fest-assert
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1439826 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-web-common')
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/pom.xml5
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java8
2 files changed, 10 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 728443c9f..c58e972b2 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -396,6 +396,11 @@
<version>${tomcat7Version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.easytesting</groupId>
+ <artifactId>fest-assert-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
index 3d24a30df..f342ee149 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
@@ -32,6 +32,7 @@ import org.apache.archiva.rest.api.services.SearchService;
import org.apache.commons.io.FileUtils;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
import org.apache.archiva.redback.rest.services.FakeCreateAdminService;
+import org.fest.assertions.api.Assertions;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -41,12 +42,13 @@ import org.junit.runner.RunWith;
import java.io.File;
import java.util.Arrays;
import java.util.List;
+
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
/**
* @author Olivier Lamy
*/
-@RunWith( ArchivaBlockJUnit4ClassRunner.class )
+@RunWith(ArchivaBlockJUnit4ClassRunner.class)
public class DownloadMergedIndexTest
extends AbstractDownloadTest
{
@@ -177,7 +179,7 @@ public class DownloadMergedIndexTest
request.setGroupId( "org.apache.felix" );
List<Artifact> artifacts = searchService.searchArtifacts( request );
- assertFalse( artifacts.isEmpty() );
- assertEquals( 1, artifacts.size() );
+ Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
+
}
}