inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

Browse Source 
124938 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124888 jvonka: Merged 50N-NDB (5.0.4) to 5.0.N (5.0.4)
         124735: MNT-15211: Follow-on (note: only affects NDB) - tweaks for further repo tests, including:
         - FileFolderServiceImplTest.testMoveCopyLotsOfFiles
         - DbNodeServiceImplTest.testDuplicateCatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Cristian Turlica
2016-04-08 14:39:58 +00:00
parent 8ef6cf6e78
commit fa503e9c2d
3 changed files with 86 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/test-java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2014 Alfresco Software Limited.
* Copyright (C) 2005-2016 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -46,6 +46,7 @@ import org.alfresco.repo.dictionary.DictionaryBootstrap;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.M2Model;
import org.alfresco.repo.dictionary.M2Type;
import org.alfresco.repo.domain.hibernate.dialect.AlfrescoMySQLClusterNDBDialect;
import org.alfresco.repo.model.filefolder.FileFolderServiceImpl.InvalidTypeException;
import org.alfresco.repo.node.integrity.IntegrityChecker;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -80,6 +81,7 @@ import org.alfresco.util.FileFilterMode;
import org.alfresco.util.FileFilterMode.Client;
import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
import org.hibernate.dialect.Dialect;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
import org.springframework.extensions.surf.util.I18NUtil;
@@ -1736,7 +1738,7 @@ public class FileFolderServiceImplTest extends TestCase
checkFileList(pageRes, 6, 0, expectedNames);
}
public void testMoveCopy3000Files() throws FileNotFoundException
public void testMoveCopyLotsOfFiles() throws FileNotFoundException
{
final String CONTAINING_FOLDER = "CONTAINING FOLDER " + GUID.generate(),
FOLDER_1 = "FOLDER 1 " + GUID.generate(),
@@ -1746,8 +1748,18 @@ public class FileFolderServiceImplTest extends TestCase
folder1 = fileFolderService.create(containingFolder.getNodeRef(), FOLDER_1, ContentModel.TYPE_FOLDER),
folder2 = fileFolderService.create(containingFolder.getNodeRef(), FOLDER_2, ContentModel.TYPE_FOLDER);
// create 3000 files within the folder
final int COUNT = 3000;
// create thousand(s) of files within the folder
int COUNT = 3000;
Dialect dialect = (Dialect) ctx.getBean("dialect");
if (dialect instanceof AlfrescoMySQLClusterNDBDialect)
{
// note: to increase the file count on NDB, may need to further bump-up NDB cluster config
// eg. DataMemory, IndexMemory, MaxNoOfConcurrentOperations, ...
// also consider splitting into separate txns (eg. after each bulk create, move, delete, copy, ...)
COUNT = 1000;
}
for (int index = 0; index < COUNT; index++)
{
fileFolderService.create(folder1.getNodeRef(), "Name " + index, ContentModel.TYPE_CONTENT);
@@ -1778,11 +1790,13 @@ public class FileFolderServiceImplTest extends TestCase
assertEquals(COUNT, fileFolderService.listFiles(folders.get(0).getNodeRef()).size());
fileFolderService.delete(folder1.getNodeRef());
assertEquals(1, fileFolderService.list(containingFolder.getNodeRef()).size());
folder1 = folders.get(0);
// copy back
FileInfo newFolder = fileFolderService.copy(folder1.getNodeRef(), containingFolder.getNodeRef(), null);
assertEquals(2, fileFolderService.list(containingFolder.getNodeRef()).size());
assertEquals(COUNT, fileFolderService.list(newFolder.getNodeRef()).size());
}