inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/THOR1 to HEAD:

Browse Source 
32613: THOR-659: Caching Content Store blocked readers



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-12-08 10:29:27 +00:00
parent 2ec53219cb
commit 400471543d
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/java/org/alfresco/repo/content/caching/ContentCacheImplTest.java
View File

@@ -31,6 +31,7 @@ import org.alfresco.repo.content.caching.ContentCacheImpl.NumericFileNameCompara
import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.repo.content.filestore.FileContentWriter; import org.alfresco.repo.content.filestore.FileContentWriter;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.alfresco.util.TempFileProvider; import org.alfresco.util.TempFileProvider;
import org.junit.Before; import org.junit.Before;
@@ -40,7 +41,9 @@ import org.mockito.ArgumentCaptor;
import org.mockito.InOrder; import org.mockito.InOrder;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner; import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
/** /**
* Tests for the ContentCacheImpl class. * Tests for the ContentCacheImpl class.
@@ -202,15 +205,38 @@ public class ContentCacheImplTest
{ {
ContentReader contentReader = Mockito.mock(ContentReader.class); ContentReader contentReader = Mockito.mock(ContentReader.class);
Mockito.when(contentReader.getSize()).thenReturn(999000L); Mockito.when(contentReader.getSize()).thenReturn(999000L);
ArgumentCaptor<File> cacheFileArg = ArgumentCaptor.forClass(File.class);
Mockito.doAnswer(new Answer() {
public Object answer(InvocationOnMock invocation) {
Object[] args = invocation.getArguments();
File f = (File) args[0];
// The file must be present for the rename to work
// in ContentCacheImpl.put()
try
{
f.createNewFile();
}
catch (IOException error)
{
error.printStackTrace();
}
return null;
}})
.when(contentReader).getContent(cacheFileArg.capture());
final String url = "store://some/url.bin"; final String url = "store://some/url.bin";
boolean putResult = contentCache.put(url, contentReader); boolean putResult = contentCache.put(url, contentReader);
assertTrue("Non-empty files should be cached", putResult); assertTrue("Non-empty files should be cached", putResult);
ArgumentCaptor<File> cacheFileArg = ArgumentCaptor.forClass(File.class);
Mockito.verify(contentReader).getContent(cacheFileArg.capture()); // The rename will have taken effect
String cacheFilePath = cacheFileArg.getValue().getAbsolutePath().replace(".tmp", ".bin");
// Check cached item is recorded properly in ehcache // Check cached item is recorded properly in ehcache
Mockito.verify(lookupTable).put(Key.forUrl(url), cacheFileArg.getValue().getAbsolutePath()); Mockito.verify(lookupTable).put(Key.forUrl(url), cacheFilePath);
Mockito.verify(lookupTable).put(Key.forCacheFile(cacheFileArg.getValue().getAbsolutePath()), url); Mockito.verify(lookupTable).put(Key.forCacheFile(cacheFilePath), url);
} }