Impact updates from fcrepo refactoring

Related to: https://www.pivotaltracker.com/story/show/79452850 and https://www.pivotaltracker.com/story/show/59601690
fcrepo4-archive · Sep 25, 2014 · 9ec66a7 · 9ec66a7
1 parent 2b0d296
commit 9ec66a7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 39 deletions.
diff --git a/fcrepo-message-consumer-core/pom.xml b/fcrepo-message-consumer-core/pom.xml
@@ -75,14 +75,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>

diff --git a/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/IndexerGroupTest.java b/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/IndexerGroupTest.java
@@ -27,12 +27,7 @@
 import org.fcrepo.kernel.utils.EventType;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -59,15 +54,13 @@
 /**
  * @author Michael Durbin
  */
-@RunWith(PowerMockRunner.class)
-@PowerMockIgnore({"javax.net.ssl.*", "org.slf4j.*", "javax.xml.parsers.*", "org.apache.xerces.*"})
-@PrepareForTest({DefaultHttpClient.class})
 public class IndexerGroupTest {
 
     private IndexerGroup indexerGroup;
 
     private String repoUrl = "http://example.org:80";
 
+    @Mock
     private DefaultHttpClient httpClient;
 
     private Set<Indexer<Object>> indexers;
@@ -78,7 +71,6 @@ public class IndexerGroupTest {
     @Before
     public void setUp() {
         initMocks(this);
-        httpClient = PowerMockito.mock(DefaultHttpClient.class);
 
         indexers = new HashSet<>();
         indexers.add(indexer);

diff --git a/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/system/SolrMappingsIT.java b/fcrepo-message-consumer-core/src/test/java/org/fcrepo/indexer/system/SolrMappingsIT.java
@@ -37,7 +37,6 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
 import org.apache.jena.riot.WebContent;
@@ -159,7 +158,7 @@ public void testOneResourceCustomMapping() throws ClientProtocolException, IOExc
 
         LOGGER.debug("Creating index mapping at URL: {}...", mappingUrl);
 
-        final HttpPost indexCreateRequest = new HttpPost(mappingUrl);
+        final HttpPut indexCreateRequest = new HttpPut(mappingUrl);
         final HttpEntity indexMapping =
             new StringEntity(Files.toString(new File(
                     "target/test-classes/ldpath/dublin_core.ldpath"),

diff --git a/fcrepo-message-consumer-elasticsearch/pom.xml b/fcrepo-message-consumer-elasticsearch/pom.xml
@@ -57,6 +57,11 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
    <dependencyManagement>
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -121,28 +121,8 @@
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-module-junit4</artifactId>
-        <version>${powermock.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-api-mockito</artifactId>
-        <version>${powermock.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>