mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
RM-2130 (Check classification after method execution, filtering results where appropriate)
- Fixed failing integration test +review RM-94 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/ENFORCE@107273 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -18,6 +18,8 @@
|
||||
*/
|
||||
package org.alfresco.module.org_alfresco_module_rm.test.legacy.service;
|
||||
|
||||
import static org.alfresco.util.GUID.generate;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchParameters;
|
||||
@@ -26,14 +28,12 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
|
||||
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.util.Pair;
|
||||
import org.alfresco.util.TestWithUserUtils;
|
||||
|
||||
/**
|
||||
* Search service implementation unit test.
|
||||
*
|
||||
* @author Roy Wetherall
|
||||
*/
|
||||
@SuppressWarnings("unused")
|
||||
public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
|
||||
{
|
||||
@Override
|
||||
@@ -47,19 +47,11 @@ public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
|
||||
private static final String SEARCH3 = "search3";
|
||||
private static final String SEARCH4 = "search4";
|
||||
|
||||
private static final String USER1 = "user1";
|
||||
private static final String USER2 = "user2";
|
||||
private static final String USER1 = generate();
|
||||
|
||||
private NodeRef folderLevelRecordFolder;
|
||||
private NodeRef recordLevelRecordFolder;
|
||||
|
||||
private NodeRef recordOne;
|
||||
private NodeRef recordTwo;
|
||||
private NodeRef recordThree;
|
||||
private NodeRef recordFour;
|
||||
private NodeRef recordFive;
|
||||
private NodeRef recordSix;
|
||||
|
||||
private int numberOfReports;
|
||||
|
||||
/**
|
||||
@@ -75,15 +67,13 @@ public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
|
||||
@Override
|
||||
public Void run()
|
||||
{
|
||||
// Create test users
|
||||
TestWithUserUtils.createUser(USER1, USER1, rootNodeRef, nodeService, authenticationService);
|
||||
TestWithUserUtils.createUser(USER2, USER2, rootNodeRef, nodeService, authenticationService);
|
||||
|
||||
// Count the number of pre-defined reports
|
||||
List<SavedSearchDetails> searches = rmSearchService.getSavedSearches(siteId);
|
||||
assertNotNull(searches);
|
||||
numberOfReports = searches.size();
|
||||
|
||||
createPerson(USER1);
|
||||
|
||||
return null;
|
||||
}
|
||||
}, AuthenticationUtil.getSystemUserName());
|
||||
@@ -105,37 +95,18 @@ public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
|
||||
folderLevelRecordFolder = mhRecordFolder42;
|
||||
recordLevelRecordFolder = mhRecordFolder43;
|
||||
|
||||
recordOne = utils.createRecord(folderLevelRecordFolder, "recordOne.txt", null, "record one - folder level - elephant");
|
||||
recordTwo = utils.createRecord(folderLevelRecordFolder, "recordTwo.txt", null, "record two - folder level - snake");
|
||||
recordThree = utils.createRecord(folderLevelRecordFolder, "recordThree.txt", null, "record three - folder level - monkey");
|
||||
recordFour = utils.createRecord(recordLevelRecordFolder, "recordFour.txt", null, "record four - record level - elephant");
|
||||
recordFive = utils.createRecord(recordLevelRecordFolder, "recordFive.txt", null, "record five - record level - snake");
|
||||
recordSix = utils.createRecord(recordLevelRecordFolder, "recordSix.txt", null, "record six - record level - monkey");
|
||||
utils.createRecord(folderLevelRecordFolder, "recordOne.txt", null, "record one - folder level - elephant");
|
||||
utils.createRecord(folderLevelRecordFolder, "recordTwo.txt", null, "record two - folder level - snake");
|
||||
utils.createRecord(folderLevelRecordFolder, "recordThree.txt", null, "record three - folder level - monkey");
|
||||
utils.createRecord(recordLevelRecordFolder, "recordFour.txt", null, "record four - record level - elephant");
|
||||
utils.createRecord(recordLevelRecordFolder, "recordFive.txt", null, "record five - record level - snake");
|
||||
utils.createRecord(recordLevelRecordFolder, "recordSix.txt", null, "record six - record level - monkey");
|
||||
|
||||
return null;
|
||||
}
|
||||
}, AuthenticationUtil.getSystemUserName());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void tearDown() throws Exception
|
||||
{
|
||||
doTestInTransaction(new Test<Void>()
|
||||
{
|
||||
@Override
|
||||
public Void run()
|
||||
{
|
||||
// Delete test users
|
||||
TestWithUserUtils.deleteUser(USER1, USER1, rootNodeRef, nodeService, authenticationService);
|
||||
TestWithUserUtils.deleteUser(USER2, USER2, rootNodeRef, nodeService, authenticationService);
|
||||
|
||||
return null;
|
||||
}
|
||||
}, AuthenticationUtil.getSystemUserName());
|
||||
|
||||
super.tearDown();
|
||||
}
|
||||
|
||||
public void testSearch()
|
||||
{
|
||||
// Full text search
|
||||
|
Reference in New Issue
Block a user