hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-14 21:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

71629: checkstyle & removed unused annotations

Browse Source
This commit is contained in:
Marie Verdonck
2020-07-02 15:48:00 +02:00
parent e7b33c5fb5
commit fec04568ff
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dspace-api/src/test/java/org/dspace/curate/CuratorTest.java
View File

@@ -23,27 +23,12 @@ import org.dspace.core.factory.CoreServiceFactory;
import org.dspace.ctask.general.NoOpCurationTask; import org.dspace.ctask.general.NoOpCurationTask;
import org.dspace.services.ConfigurationService; import org.dspace.services.ConfigurationService;
import org.junit.Test; 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 * @author mhwood
*/ */
@RunWith(MockitoJUnitRunner.class)
public class CuratorTest extends AbstractUnitTest { public class CuratorTest extends AbstractUnitTest {
@InjectMocks
private Curator curator;
@Mock
NoOpCurationTask noOpCurationTask;
@Spy
TaskResolver taskResolver;
private static final SiteService SITE_SERVICE = ContentServiceFactory.getInstance().getSiteService(); private static final SiteService SITE_SERVICE = ContentServiceFactory.getInstance().getSiteService();
static final String RUN_PARAMETER_NAME = "runParameter"; static final String RUN_PARAMETER_NAME = "runParameter";
@@ -116,6 +101,9 @@ public class CuratorTest extends AbstractUnitTest {
cfg.setProperty("plugin.named.org.dspace.curate.CurationTask", cfg.setProperty("plugin.named.org.dspace.curate.CurationTask",
NoOpCurationTask.class.getName() + " = " + TASK_NAME); NoOpCurationTask.class.getName() + " = " + TASK_NAME);
// Get and configure a Curator.
Curator curator = new Curator();
StringBuilder reporterOutput = new StringBuilder(); StringBuilder reporterOutput = new StringBuilder();
curator.setReporter(reporterOutput); // Send any report to our StringBuilder. curator.setReporter(reporterOutput); // Send any report to our StringBuilder.

7
dspace-server-webapp/src/test/java/org/dspace/curate/CurationScriptIT.java
View File

@@ -7,10 +7,10 @@
*/ */
package org.dspace.curate; 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 com.jayway.jsonpath.JsonPath.read;
import static org.hamcrest.Matchers.containsString; 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.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; 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; import org.springframework.beans.factory.annotation.Autowired;
/** /**
* IT for {@link CurationCli}
*
* @author Maria Verdonck (Atmire) on 24/06/2020 * @author Maria Verdonck (Atmire) on 24/06/2020
*/ */
public class CurationScriptIT extends AbstractControllerIntegrationTest { public class CurationScriptIT extends AbstractControllerIntegrationTest {
@@ -436,5 +438,4 @@ public class CurationScriptIT extends AbstractControllerIntegrationTest {
} }
} }
} }