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

Merge pull request #2435 from tdonohue/fix_broken_IT

Browse Source 
Fix race condition in IT on "master"
This commit is contained in:
Tim Donohue
2019-05-21 12:49:50 -05:00
committed by GitHub
parent 73c2e9d2d6 81040975ed
commit 68a068db37
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace-spring-rest/src/test/java/org/dspace/app/oai/OAIpmhIT.java
View File

@@ -40,7 +40,6 @@ import org.dspace.xoai.services.api.xoai.DSpaceFilterResolver;
import org.junit.Assume; import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Mock;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.boot.test.mock.mockito.SpyBean;
@@ -71,13 +70,14 @@ public class OAIpmhIT extends AbstractControllerIntegrationTest {
@MockBean @MockBean
private XOAICacheService xoaiCacheService; private XOAICacheService xoaiCacheService;
// Mock for date-based testing below // Spy on the current EarliestDateResolver bean, to allow us to change behavior in tests below
@Mock @SpyBean
private EarliestDateResolver earliestDateResolver; private EarliestDateResolver earliestDateResolver;
// XOAI's BaseDateProvider (used for date-based testing below) // XOAI's BaseDateProvider (used for date-based testing below)
private static BaseDateProvider baseDateProvider = new BaseDateProvider(); private static BaseDateProvider baseDateProvider = new BaseDateProvider();
// Spy on the current XOAIManagerResolver, to allow us to change behavior of XOAIManager in tests // Spy on the current XOAIManagerResolver bean, to allow us to change behavior of XOAIManager in tests
// See also: createMockXOAIManager() method // See also: createMockXOAIManager() method
@SpyBean @SpyBean
private XOAIManagerResolver xoaiManagerResolver; private XOAIManagerResolver xoaiManagerResolver;
@@ -142,9 +142,10 @@ public class OAIpmhIT extends AbstractControllerIntegrationTest {
@Test @Test
public void requestForIdentifyShouldReturnTheConfiguredValues() throws Exception { public void requestForIdentifyShouldReturnTheConfiguredValues() throws Exception {
// Mock EarliestDateResolver to return now for getEarliestDate() // Get current date/time and store as "now"
Date now = new Date(); Date now = new Date();
when(earliestDateResolver.getEarliestDate(context)).thenReturn(now); // Return "now" when "getEarliestDate()" is called for the currently loaded EarliestDateResolver bean
doReturn(now).when(earliestDateResolver).getEarliestDate(context);
// Attempt to make an Identify request to root context // Attempt to make an Identify request to root context
getClient().perform(get(DEFAULT_CONTEXT).param("verb", "Identify")) getClient().perform(get(DEFAULT_CONTEXT).param("verb", "Identify"))