Author: olamy
Date: Tue Jan 29 10:52:46 2013
New Revision: 1439826
URL: http://svn.apache.org/viewvc?rev=1439826&view=rev
Log:
more compact with fest-assert
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1439826&r1=1439825&r2=1439826&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml Tue
Jan 29 10:52:46 2013
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java?rev=1439826&r1=1439825&r2=1439826&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java
Tue Jan 29 10:52:46 2013
@@ -32,6 +32,7 @@ import org.apache.archiva.rest.api.servi
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
);
+
}
}