* Code refactored (FreezeService & RecordService)

* Test class for RecordService added

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@43608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2012-11-14 14:29:26 +00:00
parent 24db12b7df
commit 80afd72288
16 changed files with 597 additions and 463 deletions

View File

@@ -15,24 +15,9 @@ import org.alfresco.service.cmr.repository.NodeRef;
public class DataSetServiceImplTest extends BaseRMTestCase
{
/** Data Set Service */
private DataSetService dataSetService;
/** Id of the test data set*/
private static final String DATA_SET_ID = "testExampleData";
/**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices()
*/
@Override
protected void initServices()
{
super.initServices();
// Get Data Set Service
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
}
/**
* @see DataSetService#getDataSets()
*/

View File

@@ -10,8 +10,6 @@ import java.util.Set;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -21,12 +19,6 @@ import org.alfresco.service.namespace.QName;
public class FreezeServiceImplTest extends BaseRMTestCase
{
/** Data Set Service */
private DataSetService dataSetService;
/** Freeze Service */
private FreezeService freezeService;
/** Id of the test data set*/
private static final String DATA_SET_ID = "testExampleData";
@@ -42,20 +34,6 @@ public class FreezeServiceImplTest extends BaseRMTestCase
/** Fourth Record */
private NodeRef recordFour;
/**
* @see org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase#initServices()
*/
@Override
protected void initServices()
{
super.initServices();
// Get Data Set Service
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
// Get Freeze Service
freezeService = (FreezeService) applicationContext.getBean("freezeService");
}
public void testFreezeService() throws Exception
{
doTestInTransaction(new Test<NodeRef>()

View File

@@ -0,0 +1,102 @@
package org.alfresco.module.org_alfresco_module_rm.test.service;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.namespace.QName;
public class RecordServiceImplTest extends BaseRMTestCase
{
/**
* @see RecordService#getRecordMetaDataAspects()
*/
public void testGetRecordMetaDataAspects() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
Set<QName> aspects = recordService.getRecordMetaDataAspects();
assertNotNull(aspects);
assertEquals(5, aspects.size());
assertTrue(aspects.containsAll(getAspectList()));
return null;
}
/**
* Helper method for getting a list of record meta data aspects
*
* @return Record meta data aspects as list
*/
private List<QName> getAspectList()
{
QName[] aspects = new QName[]
{
DOD5015Model.ASPECT_DIGITAL_PHOTOGRAPH_RECORD,
DOD5015Model.ASPECT_PDF_RECORD,
DOD5015Model.ASPECT_WEB_RECORD,
DOD5015Model.ASPECT_SCANNED_RECORD,
ASPECT_RECORD_META_DATA
};
return Arrays.asList(aspects);
}
});
}
/**
* @see RecordService#isDeclared(org.alfresco.service.cmr.repository.NodeRef)
*/
public void testIsDeclared() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
// FIXME
return null;
}
});
}
/**
* @see RecordService#createRecordFromDocument(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeRef)
*/
public void testCreateRecordFromDocument() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
// FIXME
return null;
}
});
}
/**
* @see RecordService#getUnfiledRecordContainer(org.alfresco.service.cmr.repository.NodeRef)
*/
public void testGetUnfiledRecordContainer() throws Exception
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
// FIXME
return null;
}
});
}
}

View File

@@ -19,16 +19,13 @@
package org.alfresco.module.org_alfresco_module_rm.test.service;
import java.util.List;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.FilePlanComponentKind;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
import org.alfresco.module.org_alfresco_module_rm.dod5015.DOD5015Model;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
import org.springframework.util.CollectionUtils;
/**
@@ -578,41 +575,9 @@ public class RecordsManagementServiceImplTest extends BaseRMTestCase
}
/********** Record methods **********/
// TODO void testIsRecordFrozen()
/**
* @see RecordsManagementService#getRecordMetaDataAspects()
*/
public void testGetRecordMetaDataAspects()
{
doTestInTransaction(new Test<Void>()
{
@Override
public Void run()
{
Set<QName> aspects = rmService.getRecordMetaDataAspects();
assertNotNull(aspects);
assertEquals(5, aspects.size());
assertTrue(aspects.containsAll(
CollectionUtils.arrayToList(new QName[]
{
DOD5015Model.ASPECT_DIGITAL_PHOTOGRAPH_RECORD,
DOD5015Model.ASPECT_PDF_RECORD,
DOD5015Model.ASPECT_WEB_RECORD,
DOD5015Model.ASPECT_SCANNED_RECORD,
ASPECT_RECORD_META_DATA
})));
return null;
}
});
}
// TODO void testGetRecordFolders(NodeRef record);
// TODO void testIsRecordDeclared(NodeRef nodeRef);
/********** RM2 - Multi-hierarchy record taxonomy's **********/
/**

View File

@@ -27,11 +27,14 @@ import org.alfresco.module.org_alfresco_module_rm.RecordsManagementAdminService;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementService;
import org.alfresco.module.org_alfresco_module_rm.action.RecordsManagementActionService;
import org.alfresco.module.org_alfresco_module_rm.capability.CapabilityService;
import org.alfresco.module.org_alfresco_module_rm.dataset.DataSetService;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionSchedule;
import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService;
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.RmSiteType;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
import org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService;
@@ -112,6 +115,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected RecordsManagementSecurityService securityService;
protected CapabilityService capabilityService;
protected VitalRecordService vitalRecordService;
protected DataSetService dataSetService;
protected FreezeService freezeService;
protected RecordService recordService;
/** test data */
protected StoreRef storeRef;
@@ -266,6 +272,9 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
securityService = (RecordsManagementSecurityService)this.applicationContext.getBean("RecordsManagementSecurityService");
capabilityService = (CapabilityService)this.applicationContext.getBean("CapabilityService");
vitalRecordService = (VitalRecordService)this.applicationContext.getBean("VitalRecordService");
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
freezeService = (FreezeService) applicationContext.getBean("FreezeService");
recordService = (RecordService) applicationContext.getBean("RecordService");
}
/**