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

fixes style issues in tests

Browse Source
This commit is contained in:
Oliver Goldschmidt
2018-10-11 09:57:54 +02:00
parent 50490370d9
commit ac788aacee
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerDisabledTest.java
View File

@@ -7,19 +7,18 @@
*/ */
package org.dspace.app.opensearch; package org.dspace.app.opensearch;
/*
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
*/
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
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;
import org.springframework.mock.web.MockHttpServletResponse;
/* /*
import org.dspace.app.rest.OpenSearchController; import org.dspace.app.rest.OpenSearchController;
import org.dspace.services.ConfigurationService; import org.dspace.services.ConfigurationService;
@@ -36,13 +35,14 @@ import org.dspace.content.Community;
import org.dspace.content.Item; import org.dspace.content.Item;
import org.dspace.eperson.Group; import org.dspace.eperson.Group;
*/ */
import org.dspace.app.rest.test.AbstractControllerIntegrationTest; import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
import org.junit.Test;
import org.junit.Before;
import org.springframework.test.web.servlet.MockMvc;
import org.dspace.services.ConfigurationService; import org.dspace.services.ConfigurationService;
import org.dspace.services.factory.DSpaceServicesFactory; import org.dspace.services.factory.DSpaceServicesFactory;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import org.junit.Before;
import org.junit.Test;
/** /**
* Integration test to test the /opensearch endpoint * Integration test to test the /opensearch endpoint

17
dspace-spring-rest/src/test/java/org/dspace/app/opensearch/OpenSearchControllerTest.java
View File

@@ -7,18 +7,18 @@
*/ */
package org.dspace.app.opensearch; package org.dspace.app.opensearch;
/*
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
*/
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath;
import org.springframework.mock.web.MockHttpServletResponse;
/* /*
import org.dspace.app.rest.OpenSearchController; import org.dspace.app.rest.OpenSearchController;
@@ -36,14 +36,13 @@ import org.dspace.content.Community;
import org.dspace.content.Item; import org.dspace.content.Item;
import org.dspace.eperson.Group; import org.dspace.eperson.Group;
*/ */
import org.dspace.app.rest.test.AbstractControllerIntegrationTest; import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
import org.junit.Test;
import org.junit.Before;
import org.springframework.test.web.servlet.MockMvc;
import org.dspace.services.ConfigurationService; import org.dspace.services.ConfigurationService;
import org.dspace.services.factory.DSpaceServicesFactory;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers; import org.junit.Before;
import org.springframework.test.web.servlet.result.XpathResultMatchers; import org.junit.Test;
/** /**
* Integration test to test the /opensearch endpoint * Integration test to test the /opensearch endpoint