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/10/07 04:52:56 UTC

[6/6] archiva git commit: make easy testing for archetype

make easy testing for archetype


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/795d6d39
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/795d6d39
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/795d6d39

Branch: refs/heads/master
Commit: 795d6d3957fd5b8e657ff0d46a165ea9a8723139
Parents: b2ced49
Author: Olivier Lamy <ol...@apache.org>
Authored: Wed Oct 7 13:46:19 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Wed Oct 7 13:46:19 2015 +1100

----------------------------------------------------------------------
 .../src/main/java/SimpleArtifactConsumer.java                  | 4 ++--
 .../src/test/java/SimpleArtifactConsumerTest.java              | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/795d6d39/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
index 877a5c2..9c9a41e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/java/SimpleArtifactConsumer.java
@@ -101,7 +101,7 @@ public class SimpleArtifactConsumer
         throws ConsumerException
     {
         this.repository = repository;
-        log.info( "Beginning scan of repository [" + this.repository.getId() + "]" );
+        log.info( "Beginning scan of repository [{}]", this.repository.getId() );
 
         repositorySession = repositorySessionFactory.createSession();
     }
@@ -115,7 +115,7 @@ public class SimpleArtifactConsumer
     public void processFile( String path, boolean executeOnEntireRepo )
         throws ConsumerException
     {
-        log.info( "Processing entry [" + path + "] from repository [" + this.repository.getId() + "]" );
+        log.info( "Processing entry [{}] from repository [{}]", path, this.repository.getId() );
 
         try
         {

http://git-wip-us.apache.org/repos/asf/archiva/blob/795d6d39/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
index 1b44182..f8a9dd3 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/java/SimpleArtifactConsumerTest.java
@@ -99,11 +99,7 @@ public class SimpleArtifactConsumerTest
         consumer.beginScan( testRepository, new Date() );
         consumer.processFile( "org/simple/test/testartifact/testartifact/1.0/testartifact-1.0.pom" );
         consumer.processFile( "org/simple/test/testartifact/testartifact/1.1/testartifact-1.1.pom" );
-
-        verify( metadataRepository ).getArtifacts( testRepository.getId(), "org.simple.test.testartifact",
-                                                   "testartifact", "1.0" );
-        verify( metadataRepository ).getArtifacts( testRepository.getId(), "org.simple.test.testartifact",
-                                                   "testartifact", "1.1" );
+        
     }
 
 }