diff --git a/dspace-api/src/test/java/org/dspace/curate/CuratorTest.java b/dspace-api/src/test/java/org/dspace/curate/CuratorTest.java index ddfa751322..4890fef26f 100644 --- a/dspace-api/src/test/java/org/dspace/curate/CuratorTest.java +++ b/dspace-api/src/test/java/org/dspace/curate/CuratorTest.java @@ -23,27 +23,12 @@ import org.dspace.core.factory.CoreServiceFactory; import org.dspace.ctask.general.NoOpCurationTask; import org.dspace.services.ConfigurationService; import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; /** * @author mhwood */ -@RunWith(MockitoJUnitRunner.class) public class CuratorTest extends AbstractUnitTest { - @InjectMocks - private Curator curator; - - @Mock - NoOpCurationTask noOpCurationTask; - - @Spy - TaskResolver taskResolver; - private static final SiteService SITE_SERVICE = ContentServiceFactory.getInstance().getSiteService(); static final String RUN_PARAMETER_NAME = "runParameter"; @@ -116,6 +101,9 @@ public class CuratorTest extends AbstractUnitTest { cfg.setProperty("plugin.named.org.dspace.curate.CurationTask", NoOpCurationTask.class.getName() + " = " + TASK_NAME); + // Get and configure a Curator. + Curator curator = new Curator(); + StringBuilder reporterOutput = new StringBuilder(); curator.setReporter(reporterOutput); // Send any report to our StringBuilder. diff --git a/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java b/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java index ac5f149c48..4a8e907c5e 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java @@ -7,10 +7,10 @@ */ package org.dspace.curate; -import static org.hamcrest.Matchers.containsStringIgnoringCase; -import static org.hamcrest.Matchers.is; import static com.jayway.jsonpath.JsonPath.read; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.containsStringIgnoringCase; +import static org.hamcrest.Matchers.is; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -42,6 +42,8 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; /** + * IT for {@link CurationCli} + * * @author Maria Verdonck (Atmire) on 24/06/2020 */ public class CurationScriptIT extends AbstractControllerIntegrationTest { @@ -436,5 +438,4 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest { } } - }