You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/02/11 12:34:24 UTC
[2/2] archiva git commit: format
format
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/28dae86b
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/28dae86b
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/28dae86b
Branch: refs/heads/master
Commit: 28dae86beaf01bc0646a65e2fe31738d7c5727cd
Parents: 4374c55
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed Feb 11 22:34:16 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Feb 11 22:34:16 2015 +1100
----------------------------------------------------------------------
.../DownloadArtifactFromQueryTest.java | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/28dae86b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
index c108af3..cedd46a 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/remotedownload/DownloadArtifactFromQueryTest.java
@@ -52,8 +52,7 @@ public class DownloadArtifactFromQueryTest
previousAppServerBase = System.getProperty( "appserver.base" );
System.setProperty( "appserver.base",
new File( System.getProperty( "java.io.tmpdir" ) ).getCanonicalPath() + "/target/"
- + DownloadArtifactFromQueryTest.class.getName()
- );
+ + DownloadArtifactFromQueryTest.class.getName() );
}
@AfterClass
@@ -139,11 +138,8 @@ public class DownloadArtifactFromQueryTest
String location = String.class.cast( response.getMetadata().get( "Location" ).get( 0 ) );
- /// http://localhost:57168/repository/1400639145722/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
-
Assert.assertEquals( "http://localhost:" + port + "/repository/" + id
- + "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar", location
- );
+ + "/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar", location );
}
finally
{
@@ -172,8 +168,7 @@ public class DownloadArtifactFromQueryTest
/// http://localhost:57168/repository/1400639145722/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar
Assert.assertEquals( "http://localhost:" + port + "/repository/" + id
- + "/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar", location
- );
+ + "/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar", location );
}
@@ -193,8 +188,8 @@ public class DownloadArtifactFromQueryTest
try
{
Response response =
- getSearchService().redirectToArtifactFile( null, "org.apache.archiva.beer", "archiva-wine", "LATEST", null,
- null );
+ getSearchService().redirectToArtifactFile( null, "org.apache.archiva.beer", "archiva-wine", "LATEST",
+ null, null );
Assert.assertEquals( Response.Status.NO_CONTENT.getStatusCode(), response.getStatus() );