Author: olamy
Date: Tue Mar 25 06:29:30 2014
New Revision: 1581256
URL: http://svn.apache.org/r1581256
Log:
use assertj as fest-assert is not maintained anymore
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/MergeRepositoriesServiceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
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/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
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/RepositoryServletTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/util/RepositoryPathUtilTest.java
archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
Tue Mar 25 06:29:30 2014
@@ -160,8 +160,8 @@
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTaskTest.java
Tue Mar 25 06:29:30 2014
@@ -35,7 +35,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -139,7 +139,7 @@ public class DownloadRemoteIndexTaskTest
FlatSearchResponse response = nexusIndexer.searchFlat( rq );
log.info( "returned hit count:{}", response.getReturnedHitsCount() );
- Assertions.assertThat( response.getReturnedHitsCount() ).isEqualTo( 8
);
+ assertThat( response.getReturnedHitsCount() ).isEqualTo( 8 );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Tue Mar 25 06:29:30 2014
@@ -366,8 +366,8 @@
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/ArtifactContentEntriesTests.java
Tue Mar 25 06:29:30 2014
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.List;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Olivier Lamy
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/BrowseServiceTest.java
Tue Mar 25 06:29:30 2014
@@ -28,7 +28,8 @@ import org.apache.archiva.rest.api.model
import org.apache.archiva.rest.api.model.VersionsList;
import org.apache.archiva.rest.api.services.BrowseService;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.fest.assertions.data.MapEntry;
+
+import org.assertj.core.data.MapEntry;
import org.junit.Test;
import javax.ws.rs.core.MediaType;
@@ -37,7 +38,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Olivier Lamy
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/MergeRepositoriesServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/MergeRepositoriesServiceTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/MergeRepositoriesServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/MergeRepositoriesServiceTest.java
Tue Mar 25 06:29:30 2014
@@ -21,7 +21,7 @@ package org.apache.archiva.rest.services
import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.rest.api.services.MergeRepositoriesService;
import org.apache.commons.io.FileUtils;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -80,7 +80,7 @@ public class MergeRepositoriesServiceTes
log.info( "conflicts: {}", artifactMetadatas );
- Assertions.assertThat( artifactMetadatas
).isNotNull().isNotEmpty().hasSize( 8 );
+ assertThat( artifactMetadatas ).isNotNull().isNotEmpty().hasSize(
8 );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RedbackRuntimeConfigurationServiceTest.java
Tue Mar 25 06:29:30 2014
@@ -22,7 +22,7 @@ import org.apache.archiva.admin.model.be
import org.apache.archiva.rest.api.model.RBACManagerImplementationInformation;
import org.apache.archiva.rest.api.model.UserManagerImplementationInformation;
import org.apache.archiva.rest.api.services.RedbackRuntimeConfigurationService;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import java.util.Arrays;
@@ -67,7 +67,7 @@ public class RedbackRuntimeConfiguration
{
RedbackRuntimeConfigurationService service =
getRedbackRuntimeConfigurationService();
List<UserManagerImplementationInformation> infos =
service.getUserManagerImplementationInformations();
- Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains(
+ assertThat( infos ).isNotNull().isNotEmpty().contains(
new UserManagerImplementationInformation( "jdo", null, false ) );
}
@@ -78,7 +78,7 @@ public class RedbackRuntimeConfiguration
{
RedbackRuntimeConfigurationService service =
getRedbackRuntimeConfigurationService();
List<RBACManagerImplementationInformation> infos =
service.getRbacManagerImplementationInformations();
- Assertions.assertThat( infos ).isNotNull().isNotEmpty().contains(
+ assertThat( infos ).isNotNull().isNotEmpty().contains(
new RBACManagerImplementationInformation( "jdo", null, false ) );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/RepositoriesServiceTest.java
Tue Mar 25 06:29:30 2014
@@ -30,7 +30,7 @@ import org.apache.archiva.rest.api.servi
import org.apache.archiva.rest.api.services.RepositoriesService;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.ServerWebApplicationException;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import java.io.File;
@@ -148,12 +148,12 @@ public class RepositoriesServiceTest
log.info( "artifacts: {}", artifacts );
- Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 2
);
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 2 );
VersionsList versionsList =
browseService.getVersionsList( "org.apache.karaf.features",
"org.apache.karaf.features.core",
SOURCE_REPO_ID );
- Assertions.assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 2 );
+ assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 2 );
log.info( "artifacts.size: {}", artifacts.size() );
@@ -180,12 +180,12 @@ public class RepositoriesServiceTest
browseService.getArtifactDownloadInfos(
"org.apache.karaf.features", "org.apache.karaf.features.core",
"2.2.2",
SOURCE_REPO_ID );
- Assertions.assertThat( artifacts ).isNotNull().isEmpty();
+ assertThat( artifacts ).isNotNull().isEmpty();
versionsList = browseService.getVersionsList(
"org.apache.karaf.features", "org.apache.karaf.features.core",
SOURCE_REPO_ID );
- Assertions.assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 1 );
+ assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 1 );
}
finally
@@ -209,12 +209,12 @@ public class RepositoriesServiceTest
log.info( "artifacts: {}", artifacts );
- Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 2
);
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 2 );
VersionsList versionsList =
browseService.getVersionsList( "org.apache.karaf.features",
"org.apache.karaf.features.core",
SOURCE_REPO_ID );
- Assertions.assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 2 );
+ assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 2 );
log.info( "artifacts.size: {}", artifacts.size() );
@@ -242,12 +242,12 @@ public class RepositoriesServiceTest
browseService.getArtifactDownloadInfos(
"org.apache.karaf.features", "org.apache.karaf.features.core",
"2.2.2",
SOURCE_REPO_ID );
- Assertions.assertThat( artifacts ).isNotNull().isEmpty();
+ assertThat( artifacts ).isNotNull().isEmpty();
versionsList = browseService.getVersionsList(
"org.apache.karaf.features", "org.apache.karaf.features.core",
SOURCE_REPO_ID );
- Assertions.assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 1 );
+ assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 1 );
}
finally
@@ -267,11 +267,11 @@ public class RepositoriesServiceTest
List<Artifact> artifacts =
browseService.getArtifactDownloadInfos( "commons-logging",
"commons-logging", "1.0.1", SOURCE_REPO_ID );
- Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 3
);
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 3 );
VersionsList versionsList =
browseService.getVersionsList( "commons-logging",
"commons-logging", SOURCE_REPO_ID );
- Assertions.assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 6 );
+ assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 6 );
log.info( "artifacts.size: {}", artifacts.size() );
@@ -312,13 +312,13 @@ public class RepositoriesServiceTest
log.info( "artifact: {}", artifacts );
- Assertions.assertThat( artifacts
).isNotNull().isNotEmpty().hasSize( 2 );
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 2 );
versionsList = browseService.getVersionsList( "commons-logging",
"commons-logging", SOURCE_REPO_ID );
log.info( "versionsList: {}", versionsList );
- Assertions.assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 6 );
+ assertThat( versionsList.getVersions()
).isNotNull().isNotEmpty().hasSize( 6 );
}
finally
@@ -343,7 +343,7 @@ public class RepositoriesServiceTest
log.info( "browseResult: {}", browseResult );
- Assertions.assertThat( browseResult.getBrowseResultEntries()
).isNotNull().isNotEmpty().contains(
+ assertThat( browseResult.getBrowseResultEntries()
).isNotNull().isNotEmpty().contains(
new BrowseResultEntry(
"org.apache.karaf.features.org.apache.karaf.features.command", true ),
new BrowseResultEntry(
"org.apache.karaf.features.org.apache.karaf.features.core", true ) );
@@ -361,13 +361,13 @@ public class RepositoriesServiceTest
assertNotNull( browseResult );
- Assertions.assertThat( browseResult.getBrowseResultEntries()
).isNotNull().isEmpty();
+ assertThat( browseResult.getBrowseResultEntries()
).isNotNull().isEmpty();
browseResult = browseService.browseGroupId( "org.apache.karaf",
SOURCE_REPO_ID );
assertNotNull( browseResult );
- Assertions.assertThat( browseResult.getBrowseResultEntries()
).isNotNull().isEmpty();
+ assertThat( browseResult.getBrowseResultEntries()
).isNotNull().isEmpty();
log.info( "browseResult empty: {}", browseResult );
}
@@ -441,7 +441,7 @@ public class RepositoriesServiceTest
log.info( "artifacts: {}", artifacts );
- Assertions.assertThat( artifacts
).isNotNull().isNotEmpty().hasSize( 10 );
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 10 );
File artifactFile = new File( targetRepo,
"org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.jar"
);
@@ -452,9 +452,9 @@ public class RepositoriesServiceTest
File artifactFilepom = new File( targetRepo,
"org/apache/archiva/redback/components/spring-quartz/2.0-SNAPSHOT/spring-quartz-2.0-20120618.214127-1.pom"
);
- Assertions.assertThat( artifactFile ).exists();
- Assertions.assertThat( artifactFilemd5 ).exists();
- Assertions.assertThat( artifactFilepom ).exists();
+ assertThat( artifactFile ).exists();
+ assertThat( artifactFilemd5 ).exists();
+ assertThat( artifactFilepom ).exists();
// we delete only one snapshot
Artifact artifact =
@@ -471,11 +471,11 @@ public class RepositoriesServiceTest
log.info( "artifacts: {}", artifacts );
- Assertions.assertThat( artifacts
).isNotNull().isNotEmpty().hasSize( 8 );
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 8 );
- Assertions.assertThat( artifactFile ).doesNotExist();
- Assertions.assertThat( artifactFilemd5 ).doesNotExist();
- Assertions.assertThat( artifactFilepom ).doesNotExist();
+ assertThat( artifactFile ).doesNotExist();
+ assertThat( artifactFilemd5 ).doesNotExist();
+ assertThat( artifactFilepom ).doesNotExist();
}
catch ( Exception e )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/SearchServiceTest.java
Tue Mar 25 06:29:30 2014
@@ -22,7 +22,7 @@ import org.apache.archiva.admin.model.be
import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.rest.api.model.SearchRequest;
import org.apache.archiva.rest.api.services.SearchService;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import java.util.Arrays;
@@ -227,7 +227,7 @@ public class SearchServiceTest
List<Artifact> artifacts = searchService.searchArtifacts(
searchRequest );
- Assertions.assertThat( artifacts ).isNotNull().hasSize( 2 );
+ assertThat( artifacts ).isNotNull().hasSize( 2 );
for ( Artifact artifact : artifacts )
{
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=1581256&r1=1581255&r2=1581256&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
Mar 25 06:29:30 2014
@@ -393,8 +393,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexNonDefaultPathTest.java
Tue Mar 25 06:29:30 2014
@@ -33,7 +33,7 @@ import org.apache.archiva.rest.api.servi
import org.apache.archiva.rest.api.services.SearchService;
import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -196,7 +196,7 @@ public class DownloadMergedIndexNonDefau
request.setGroupId( "org.apache.felix" );
List<Artifact> artifacts = searchService.searchArtifacts( request );
- Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1
);
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadMergedIndexTest.java
Tue Mar 25 06:29:30 2014
@@ -32,7 +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 static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -190,7 +190,7 @@ public class DownloadMergedIndexTest
request.setGroupId( "org.apache.felix" );
List<Artifact> artifacts = searchService.searchArtifacts( request );
- Assertions.assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1
);
+ assertThat( artifacts ).isNotNull().isNotEmpty().hasSize( 1 );
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/RemoteRepositoryConnectivityCheckTest.java
Tue Mar 25 06:29:30 2014
@@ -21,28 +21,22 @@ package org.apache.archiva.remotedownloa
import com.google.common.io.Files;
import org.apache.archiva.admin.model.beans.RemoteRepository;
-import org.apache.archiva.remotedownload.AbstractDownloadTest;
import org.apache.archiva.rest.api.services.RemoteRepositoriesService;
-import org.apache.catalina.startup.Tomcat;
import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.WebClient;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.fest.assertions.api.Assertions;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* @author Olivier Lamy
*/
@@ -93,7 +87,7 @@ public class RemoteRepositoryConnectivit
service.addRemoteRepository( repo );
- Assertions.assertThat( service.checkRemoteConnectivity(
repo.getId() ) ).isTrue();
+ assertThat( service.checkRemoteConnectivity( repo.getId() )
).isTrue();
}
finally
{
@@ -126,7 +120,7 @@ public class RemoteRepositoryConnectivit
service.addRemoteRepository( repo );
- Assertions.assertThat( service.checkRemoteConnectivity(
repo.getId() ) ).isTrue();
+ assertThat( service.checkRemoteConnectivity( repo.getId() )
).isTrue();
}
finally
{
@@ -154,7 +148,7 @@ public class RemoteRepositoryConnectivit
service.addRemoteRepository( repo );
- Assertions.assertThat( service.checkRemoteConnectivity(
repo.getId() ) ).isFalse();
+ assertThat( service.checkRemoteConnectivity( repo.getId() )
).isFalse();
}
finally
{
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Tue
Mar 25 06:29:30 2014
@@ -130,8 +130,8 @@
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
Tue Mar 25 06:29:30 2014
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUt
import org.fluentlenium.adapter.FluentTest;
import org.fluentlenium.core.domain.FluentList;
import org.fluentlenium.core.domain.FluentWebElement;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Tue Mar 25
06:29:30 2014
@@ -238,8 +238,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/AbstractRepositoryServletProxiedTestCase.java
Tue Mar 25 06:29:30 2014
@@ -36,7 +36,7 @@ import org.eclipse.jetty.server.handler.
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
@@ -167,7 +167,7 @@ public abstract class AbstractRepository
WebClient client = newClient();
int status = client.getPage( remoteRepo.url
).getWebResponse().getStatusCode();
- Assertions.assertThat( status ).isEqualTo( HttpServletResponse.SC_OK );
+ assertThat( status ).isEqualTo( HttpServletResponse.SC_OK );
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletBrowseTest.java
Tue Mar 25 06:29:30 2014
@@ -22,7 +22,7 @@ package org.apache.archiva.webdav;
import com.gargoylesoftware.htmlunit.WebRequest;
import com.gargoylesoftware.htmlunit.WebResponse;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -119,7 +119,7 @@ public class RepositoryServletBrowseTest
private void assertLinks( List<String> expectedLinks, Elements actualLinks
)
{
- Assertions.assertThat( actualLinks ).hasSize( expectedLinks.size() );
+ assertThat( actualLinks ).hasSize( expectedLinks.size() );
for ( int i = 0; i < actualLinks.size(); i++ )
{
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=1581256&r1=1581255&r2=1581256&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
Tue Mar 25 06:29:30 2014
@@ -28,7 +28,7 @@ import org.apache.archiva.configuration.
import org.apache.archiva.maven2.metadata.MavenMetadataReader;
import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.commons.io.FileUtils;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -157,8 +157,7 @@ public class RepositoryServletRepository
WebResponse response = getServletUnitClient().getResponse( request );
assertResponseOK( response );
- Assertions.assertThat( response.getContentAsString() ).isEqualTo(
"first" );
- //assertEquals( "Expected file contents", "first",
response.getContentAsString() );
+ assertThat( response.getContentAsString() ).isEqualTo( "first" );
}
/*
@@ -179,8 +178,8 @@ public class RepositoryServletRepository
WebResponse response = getServletUnitClient().getResponse( request );
assertResponseOK( response );
- //assertEquals( "Expected file contents", "last",
response.getContentAsString() );
- Assertions.assertThat( response.getContentAsString() ).isEqualTo(
"last" );
+
+ assertThat( response.getContentAsString() ).isEqualTo( "last" );
}
/*
@@ -268,15 +267,8 @@ public class RepositoryServletRepository
ArchivaRepositoryMetadata metadata = MavenMetadataReader.read(
returnedMetadata );
assertResponseOK( response );
- /*
- assertEquals( "Versions list size", 4,
metadata.getAvailableVersions().size() );
- assertTrue( "Versions list contains version 1.0",
metadata.getAvailableVersions().contains( "1.0" ) );
- assertTrue( "Versions list contains version 1.5",
metadata.getAvailableVersions().contains( "1.5" ) );
- assertTrue( "Versions list contains version 2.0",
metadata.getAvailableVersions().contains( "2.0" ) );
- assertTrue( "Versions list contains version 2.5",
metadata.getAvailableVersions().contains( "2.5" ) );
- */
- Assertions.assertThat( metadata.getAvailableVersions() ).isNotNull()
+ assertThat( metadata.getAvailableVersions() ).isNotNull()
.hasSize( 4 ).contains( "1.0", "1.5", "2.0", "2.5" );
@@ -295,10 +287,8 @@ public class RepositoryServletRepository
response = getServletUnitClient().getResource( request );
assertResponseOK( response );
- //assertEquals( "add113b0d7f8c6adb92a5015a7a3701081edf998
maven-metadata-group-with-valid-repos.xml",
- // response.getContentAsString() );
- Assertions.assertThat( response.getContentAsString() )
+ assertThat( response.getContentAsString() )
.isEqualTo( "add113b0d7f8c6adb92a5015a7a3701081edf998
maven-metadata-group-with-valid-repos.xml" );
// request the md5 checksum of the metadata
@@ -307,10 +297,8 @@ public class RepositoryServletRepository
response = getServletUnitClient().getResource( request );
assertResponseOK( response );
- //assertEquals( "5b85ea4aa5f52bb76760041a52f98de8
maven-metadata-group-with-valid-repos.xml",
- // response.getContentAsString().trim() );
- Assertions.assertThat( response.getContentAsString() )
+ assertThat( response.getContentAsString() )
.isEqualTo( "5b85ea4aa5f52bb76760041a52f98de8
maven-metadata-group-with-valid-repos.xml" );
}
@@ -337,7 +325,7 @@ public class RepositoryServletRepository
assertResponseOK( response );
- Assertions.assertThat( response.getContentAsString() ).contains(
"Collection" )
+ assertThat( response.getContentAsString() ).contains( "Collection" )
.contains( "dummy/dummy-artifact" )
.contains( "1.0" )
.contains( "2.0" );
@@ -346,11 +334,10 @@ public class RepositoryServletRepository
protected void assertResponseMethodNotAllowed( WebResponse response )
{
- //assertNotNull( "Should have recieved a response", response );
- Assertions.assertThat( response ).isNotNull();
- //assertEquals( "Should have been an 405/Method Not Allowed response
code.",
- // HttpServletResponse.SC_METHOD_NOT_ALLOWED,
response.getResponseCode() );
- Assertions.assertThat( response.getStatusCode() ).isEqualTo(
HttpServletResponse.SC_METHOD_NOT_ALLOWED );
+
+ assertThat( response ).isNotNull();
+
+ assertThat( response.getStatusCode() ).isEqualTo(
HttpServletResponse.SC_METHOD_NOT_ALLOWED );
}
protected RepositoryGroupConfiguration createRepositoryGroup( String id,
List<String> repositories )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletTest.java
Tue Mar 25 06:29:30 2014
@@ -25,12 +25,13 @@ import org.apache.archiva.admin.model.be
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
-import org.fest.assertions.api.Assertions;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
+import static org.assertj.core.api.Assertions.assertThat;
+
/**
* RepositoryServletTest
*/
@@ -133,7 +134,7 @@ public class RepositoryServletTest
WebRequest request = new GetMethodWebRequest( path );
WebResponse response = getServletUnitClient().getResponse( request );
assertResponseNotFound( response );
- Assertions.assertThat( response.getContentAsString() ).contains(
+ assertThat( response.getContentAsString() ).contains(
"Invalid path to Artifact: legacy paths should have an expected
type ending in [s] in the second part of the path." );
}
}
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=1581256&r1=1581255&r2=1581256&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
Tue Mar 25 06:29:30 2014
@@ -21,9 +21,9 @@ 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;
+import static org.assertj.core.api.Assertions.assertThat;
/**
*/
@@ -35,10 +35,10 @@ public class RepositoryPathUtilTest
public void testGetRepositoryId()
{
String href = "/path/to/my/resource";
- Assertions.assertThat( RepositoryPathUtil.getRepositoryName( href )
).isEqualTo( "to" );
+ assertThat( RepositoryPathUtil.getRepositoryName( href ) ).isEqualTo(
"to" );
href = "path/to/my/resource";
- Assertions.assertThat( RepositoryPathUtil.getRepositoryName( href )
).isEqualTo( "to" );
+ assertThat( RepositoryPathUtil.getRepositoryName( href ) ).isEqualTo(
"to" );
}
Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml
(original)
+++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml Tue
Mar 25 06:29:30 2014
@@ -63,8 +63,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
(original)
+++
archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
Tue Mar 25 06:29:30 2014
@@ -33,7 +33,7 @@ import org.apache.archiva.metadata.model
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.model.Scm;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.fest.util.Sets;
+import org.assertj.core.util.Sets;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -54,7 +54,7 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
@RunWith(ArchivaSpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = { "classpath*:/META-INF/spring-context.xml",
"classpath*:/spring-context.xml" })
@@ -379,8 +379,9 @@ public abstract class AbstractMetadataRe
Collection<String> repositories = repository.getRepositories();
- assertEquals( "repository.getRepositories() -> " + repositories,
- Sets.newLinkedHashSet( TEST_REPO_ID, OTHER_REPO_ID ),
new LinkedHashSet<String>( repositories ) );
+ assertEquals( "repository.getRepositories() -> " + repositories, //
+ Sets.newLinkedHashSet( TEST_REPO_ID, OTHER_REPO_ID ), //
+ new LinkedHashSet<String>( repositories ) ); //
}
@Test
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Tue Mar 25
06:29:30 2014
@@ -181,11 +181,10 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTestMaven3.java
Tue Mar 25 06:29:30 2014
@@ -27,7 +27,7 @@ import org.apache.archiva.configuration.
import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.maven2.model.TreeEntry;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -100,10 +100,10 @@ public class DependencyTreeBuilderTestMa
builder.buildDependencyTree( Collections.singletonList(
TEST_REPO_ID ), TEST_GROUP_ID, TEST_ARTIFACT_ID,
TEST_VERSION );
- Assertions.assertThat( treeEntries ).isNotNull().isNotEmpty().contains(
+ assertThat( treeEntries ).isNotNull().isNotEmpty().contains(
new TreeEntry( new Artifact( TEST_GROUP_ID, TEST_ARTIFACT_ID,
TEST_VERSION, "", "" ) ) );
- Assertions.assertThat( treeEntries.get( 0 ).getChilds()
).isNotNull().isNotEmpty().contains(
+ assertThat( treeEntries.get( 0 ).getChilds()
).isNotNull().isNotEmpty().contains(
new TreeEntry( new Artifact( "commons-lang", "commons-lang",
"2.2", "compile", "" ) ) );
}
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml
(original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/pom.xml Tue
Mar 25 06:29:30 2014
@@ -140,8 +140,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
Tue Mar 25 06:29:30 2014
@@ -23,7 +23,7 @@ import org.apache.archiva.metadata.model
import org.apache.archiva.metadata.repository.cassandra.model.Namespace;
import org.apache.archiva.metadata.repository.cassandra.model.Repository;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.core.api.Assertions.assertThat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -88,26 +88,26 @@ public class RepositoriesNamespaceTest
r = cmr.getRepository( "release" );
- Assertions.assertThat( r ).isNotNull();
+ assertThat( r ).isNotNull();
- Assertions.assertThat( cmr.getRepositories()
).isNotEmpty().hasSize( 1 );
- Assertions.assertThat( cmr.getNamespaces( "release" )
).isNotEmpty().hasSize( 1 );
+ assertThat( cmr.getRepositories() ).isNotEmpty().hasSize( 1 );
+ assertThat( cmr.getNamespaces( "release" ) ).isNotEmpty().hasSize(
1 );
n = cmr.getNamespace( "release", "org" );
- Assertions.assertThat( n ).isNotNull();
- Assertions.assertThat( n.getRepository() ).isNotNull();
+ assertThat( n ).isNotNull();
+ assertThat( n.getRepository() ).isNotNull();
cmr.updateNamespace( "release", "org.apache" );
r = cmr.getRepository( "release" );
- Assertions.assertThat( r ).isNotNull();
- Assertions.assertThat( cmr.getNamespaces( "release" )
).isNotEmpty().hasSize( 2 );
+ assertThat( r ).isNotNull();
+ assertThat( cmr.getNamespaces( "release" ) ).isNotEmpty().hasSize(
2 );
cmr.removeNamespace( "release", "org.apache" );
- Assertions.assertThat( cmr.getNamespaces( "release" )
).isNotEmpty().hasSize( 1 );
- Assertions.assertThat( cmr.getNamespaces( "release" )
).containsExactly( "org" );
+ assertThat( cmr.getNamespaces( "release" ) ).isNotEmpty().hasSize(
1 );
+ assertThat( cmr.getNamespaces( "release" ) ).containsExactly(
"org" );
ProjectMetadata projectMetadata = new ProjectMetadata();
projectMetadata.setId( "theproject" );
@@ -115,18 +115,18 @@ public class RepositoriesNamespaceTest
cmr.updateProject( "release", projectMetadata );
- Assertions.assertThat( cmr.getProjects( "release", "org" )
).isNotEmpty().hasSize( 1 ).containsExactly(
+ assertThat( cmr.getProjects( "release", "org" )
).isNotEmpty().hasSize( 1 ).containsExactly(
"theproject" );
cmr.removeProject( "release", "org", "theproject" );
- Assertions.assertThat( cmr.getProjects( "release", "org" )
).isEmpty();
+ assertThat( cmr.getProjects( "release", "org" ) ).isEmpty();
cmr.removeRepository( "release" );
r = cmr.getRepository( "release" );
- Assertions.assertThat( r ).isNull();
+ assertThat( r ).isNull();
}
catch ( Exception e )
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-file/pom.xml Tue Mar
25 06:29:30 2014
@@ -77,8 +77,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml Tue Mar 25
06:29:30 2014
@@ -79,8 +79,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1581256&r1=1581255&r2=1581256&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Mar 25 06:29:30 2014
@@ -121,9 +121,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
- <version>2.0M9</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>1.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
