From: Olivier Lamy <olamy@apache.org>
Date: Thu, 8 Mar 2012 09:33:31 +0000 (+0000)
Subject: use web mock module in rest-services tests
X-Git-Tag: archiva-1.4-M3~1091
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ab058f4b3d96672f519106f2026dd8c7bdead00;p=archiva.git

use web mock module in rest-services tests

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1298323 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index a89ea6909..8ec24f8e8 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -291,6 +291,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-test-mocks</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MockInvalidRepositoryContentConsumer.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MockInvalidRepositoryContentConsumer.java
deleted file mode 100644
index f5107a36c..000000000
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/java/org/apache/archiva/rest/services/utils/MockInvalidRepositoryContentConsumer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.apache.archiva.rest.services.utils;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.archiva.consumers.ConsumerException;
-import org.apache.archiva.consumers.ConsumerMonitor;
-import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author Olivier Lamy
- */
-@Service( "InvalidRepositoryContentConsumer#mock" )
-public class MockInvalidRepositoryContentConsumer
-    implements InvalidRepositoryContentConsumer
-{
-    public String getId()
-    {
-        return "foo";
-    }
-
-    public String getDescription()
-    {
-        return "the foo";
-    }
-
-    public boolean isPermanent()
-    {
-        return false;
-    }
-
-    public void addConsumerMonitor( ConsumerMonitor monitor )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void removeConsumerMonitor( ConsumerMonitor monitor )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public List<String> getIncludes()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public List<String> getExcludes()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void beginScan( ManagedRepository repository, Date whenGathered )
-        throws ConsumerException
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
-        throws ConsumerException
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void processFile( String path )
-        throws ConsumerException
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void processFile( String path, boolean executeOnEntireRepo )
-        throws Exception
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void completeScan()
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void completeScan( boolean executeOnEntireRepo )
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public boolean isProcessUnmodified()
-    {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-}