Merge branch 'feature/ACS-1782_ImplRequestDAUinContentService' into feature/ACS-566_forTestingOnly

This commit is contained in:
Sara Aspery
2021-08-04 13:31:43 +01:00

View File

@@ -35,6 +35,7 @@ import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -504,8 +505,8 @@ public class CachingContentStoreTest
{ {
try try
{ {
when(backingStore.requestContentDirectUrl(anyString(), any(), anyString(), any())).thenThrow(new UnsupportedOperationException()); when(backingStore.requestContentDirectUrl(anyString(), eq(true), anyString(), anyLong())).thenThrow(new UnsupportedOperationException());
cachingStore.requestContentDirectUrl("url", true,null, 30L); cachingStore.requestContentDirectUrl("url", true,"someFile", 30L);
fail(); fail();
} }
catch (UnsupportedOperationException e) catch (UnsupportedOperationException e)
@@ -517,7 +518,7 @@ public class CachingContentStoreTest
@Test @Test
public void getDirectAccessUrl() public void getDirectAccessUrl()
{ {
when(backingStore.requestContentDirectUrl(anyString(), any(), anyString(), any())).thenReturn(new DirectAccessUrl()); when(backingStore.requestContentDirectUrl(anyString(), eq(true), anyString(), anyLong())).thenReturn(new DirectAccessUrl());
cachingStore.requestContentDirectUrl("url", true,null, 30L); cachingStore.requestContentDirectUrl("url", true,"someFile", 30L);
} }
} }