mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Moved instanceOf method from ServiceBaseImpl class to a utility class
This commit is contained in:
@@ -114,7 +114,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
|
||||
activeContent = generateNodeRef();
|
||||
QName contentSubtype = QName.createQName("contentSubtype", "contentSubtype");
|
||||
when(mockedNodeService.getType(activeContent)).thenReturn(contentSubtype);
|
||||
when(mockedDictionaryService.isSubClass(contentSubtype, ContentModel.TYPE_CONTENT)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(contentSubtype, ContentModel.TYPE_CONTENT)).thenReturn(true);
|
||||
|
||||
// setup interactions
|
||||
doReturn(holdContainer).when(mockedFilePlanService).getHoldContainer(filePlan);
|
||||
|
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.module.org_alfresco_module_rm.util.NodeTypeUtility;
|
||||
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
@@ -62,7 +62,7 @@ public class FrozenAspectUnitTest
|
||||
private ChildAssociationRef mockChildAssociationRef;
|
||||
|
||||
@Mock
|
||||
private DictionaryService mockDictionaryService;
|
||||
private NodeTypeUtility mockedNodeTypeUtility;
|
||||
|
||||
@InjectMocks
|
||||
private FrozenAspect frozenAspect;
|
||||
@@ -103,6 +103,7 @@ public class FrozenAspectUnitTest
|
||||
{
|
||||
when(mockNodeService.hasAspect(content, ASPECT_RECORD)).thenReturn(false);
|
||||
when(mockNodeService.getType(content)).thenReturn(ContentModel.TYPE_CONTENT);
|
||||
when(mockedNodeTypeUtility.instanceOf(mockNodeService.getType(content), ContentModel.TYPE_CONTENT)).thenReturn(true);
|
||||
when(mockNodeService.getPrimaryParent(content)).thenReturn(mockChildAssociationRef);
|
||||
when(mockChildAssociationRef.getParentRef()).thenReturn(folder);
|
||||
frozenAspect.onRemoveAspect(content, null);
|
||||
@@ -117,7 +118,7 @@ public class FrozenAspectUnitTest
|
||||
{
|
||||
when(mockNodeService.hasAspect(content, ASPECT_RECORD)).thenReturn(false);
|
||||
when(mockNodeService.getType(content)).thenReturn(ContentModel.TYPE_FOLDER);
|
||||
when(mockDictionaryService.isSubClass(ContentModel.TYPE_FOLDER, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(ContentModel.TYPE_FOLDER, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
frozenAspect.onRemoveAspect(content, null);
|
||||
verify(mockNodeService, times(0)).setProperty(folder, PROP_HELD_CHILDREN_COUNT, 0);
|
||||
}
|
||||
|
@@ -57,7 +57,7 @@ public class HoldContainerTypeUnitTest extends BaseUnitTest
|
||||
public void testAddNonHoldTypeToHoldContainer()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_HOLD)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_HOLD)).thenReturn(false);
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
NodeRef holdContainer = generateNodeRef(TYPE_HOLD_CONTAINER, true);
|
||||
@@ -75,7 +75,7 @@ public class HoldContainerTypeUnitTest extends BaseUnitTest
|
||||
public void testAddHoldTypeToHoldContainer()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_HOLD)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_HOLD)).thenReturn(true);
|
||||
NodeRef holdFolder= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
NodeRef holdContainer = generateNodeRef(TYPE_HOLD_CONTAINER, true);
|
||||
|
@@ -79,7 +79,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_TRANSFER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_TRANSFER)).thenReturn(true);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociation(childAssocRef, true);
|
||||
@@ -94,7 +94,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_RECORD_FOLDER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_RECORD_FOLDER)).thenReturn(true);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociation(childAssocRef, true);
|
||||
@@ -109,7 +109,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_RECORDS_MANAGEMENT_CONTAINER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_RECORDS_MANAGEMENT_CONTAINER)).thenReturn(true);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociation(childAssocRef, true);
|
||||
@@ -124,7 +124,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_FOLDER)).thenReturn(true);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociation(childAssocRef, true);
|
||||
@@ -139,7 +139,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_FOLDER)).thenReturn(false);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociation(childAssocRef, true);
|
||||
@@ -153,7 +153,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_CONTENT)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_CONTENT)).thenReturn(true);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociation(childAssocRef, true);
|
||||
@@ -168,8 +168,8 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_FOLDER)).thenReturn(false);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociation(childAssocRef, true);
|
||||
@@ -184,7 +184,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
{
|
||||
NodeRef recordFolderNodeRef = AlfMock.generateNodeRef(mockedNodeService, TYPE_RECORD_FOLDER);
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_FOLDER)).thenReturn(true);
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
ChildAssociationRef childAssocRef = generateChildAssociationRef(recordFolderNodeRef, nodeRef);
|
||||
recordFolderType.onCreateChildAssociationOnCommit(childAssocRef, true);
|
||||
@@ -201,7 +201,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
QName type = AlfMock.generateQName();
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_FOLDER)).thenReturn(true);
|
||||
when(mockedNodeService.hasAspect(nodeRef, ASPECT_HIDDEN)).thenReturn(true);
|
||||
|
||||
ChildAssociationRef mockedPrimaryParentAssoc = mock(ChildAssociationRef.class);
|
||||
@@ -222,7 +222,7 @@ public class RecordFolderTypeUnitTest extends BaseUnitTest
|
||||
QName type = AlfMock.generateQName();
|
||||
NodeRef nodeRef = AlfMock.generateNodeRef(mockedNodeService, type, true);
|
||||
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_FOLDER)).thenReturn(false);
|
||||
|
||||
ChildAssociationRef mockedPrimaryParentAssoc = mock(ChildAssociationRef.class);
|
||||
when(mockedNodeService.getPrimaryParent(nodeRef)).thenReturn(mockedPrimaryParentAssoc);
|
||||
|
@@ -59,9 +59,9 @@ public class UnfiledRecordContainerTypeUnitTest extends BaseUnitTest
|
||||
public void testAddNonAcceptedTypeToUnfiledRecordContainer()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
@@ -80,9 +80,9 @@ public class UnfiledRecordContainerTypeUnitTest extends BaseUnitTest
|
||||
public void testAddUnfiledRecordFolderTypeToUnfiledRecordContainer()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(true);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
@@ -101,9 +101,9 @@ public class UnfiledRecordContainerTypeUnitTest extends BaseUnitTest
|
||||
public void testAddContentTypeToUnfiledRecordContainer()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(true);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
@@ -122,9 +122,9 @@ public class UnfiledRecordContainerTypeUnitTest extends BaseUnitTest
|
||||
public void testNonElectronicDocumentTypeToUnfiledRecordContainer()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(true);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
|
@@ -59,9 +59,9 @@ public class UnfiledRecordFolderTypeUnitTest extends BaseUnitTest
|
||||
public void testAddNonAcceptedTypeToUnfiledRecordFolder()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
@@ -80,9 +80,9 @@ public class UnfiledRecordFolderTypeUnitTest extends BaseUnitTest
|
||||
public void testAddUnfiledRecordFolderTypeToUnfiledRecordFolder()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(true);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
@@ -101,9 +101,9 @@ public class UnfiledRecordFolderTypeUnitTest extends BaseUnitTest
|
||||
public void testAddContentTypeToUnfiledRecordFolder()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(true);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(false);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
@@ -122,9 +122,9 @@ public class UnfiledRecordFolderTypeUnitTest extends BaseUnitTest
|
||||
public void testNonElectronicDocumentTypeToUnfiledRecordFolder()
|
||||
{
|
||||
QName type = AlfMock.generateQName();
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedDictionaryService.isSubClass(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(true);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_UNFILED_RECORD_FOLDER)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, ContentModel.TYPE_CONTENT)).thenReturn(false);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, TYPE_NON_ELECTRONIC_DOCUMENT)).thenReturn(true);
|
||||
|
||||
NodeRef nodeRef= AlfMock.generateNodeRef(mockedNodeService, type);
|
||||
|
||||
|
@@ -58,6 +58,7 @@ import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
|
||||
import org.alfresco.module.org_alfresco_module_rm.security.ExtendedSecurityService;
|
||||
import org.alfresco.module.org_alfresco_module_rm.util.AlfrescoTransactionSupport;
|
||||
import org.alfresco.module.org_alfresco_module_rm.util.AuthenticationUtil;
|
||||
import org.alfresco.module.org_alfresco_module_rm.util.NodeTypeUtility;
|
||||
import org.alfresco.module.org_alfresco_module_rm.util.TransactionalResourceHelper;
|
||||
import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService;
|
||||
import org.alfresco.repo.policy.BehaviourFilter;
|
||||
@@ -151,6 +152,8 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
|
||||
/** application context mock */
|
||||
@Mock(name="applicationContext") protected ApplicationContext mockedApplicationContext;
|
||||
|
||||
@Mock protected NodeTypeUtility mockedNodeTypeUtility;
|
||||
|
||||
/** expected exception rule */
|
||||
@Rule
|
||||
public ExpectedException exception = ExpectedException.none();
|
||||
@@ -313,6 +316,7 @@ public class BaseUnitTest implements RecordsManagementModel, ContentModel
|
||||
if (type != null)
|
||||
{
|
||||
when(mockedNodeService.getType(eq(nodeRef))).thenReturn(type);
|
||||
when(mockedNodeTypeUtility.instanceOf(type, type)).thenReturn(true);
|
||||
}
|
||||
return nodeRef;
|
||||
}
|
||||
|
@@ -35,7 +35,6 @@ import java.util.Map;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.junit.Before;
|
||||
@@ -55,10 +54,14 @@ public class ServiceBaseImplUnitTest
|
||||
{
|
||||
@InjectMocks private ServiceBaseImpl serviceBase;
|
||||
|
||||
@Mock(name="nodeService") private NodeService mockedNodeService;
|
||||
@Mock(name="dictionaryService") private DictionaryService mockedDictionaryService;
|
||||
@Mock(name="transactionalResourceHelper") private TransactionalResourceHelper mockedTransactionalResourceHelper;
|
||||
@Mock(name="applicationContext") protected ApplicationContext mockedApplicationContext;
|
||||
@Mock (name = "nodeService")
|
||||
private NodeService mockedNodeService;
|
||||
@Mock (name = "transactionalResourceHelper")
|
||||
private TransactionalResourceHelper mockedTransactionalResourceHelper;
|
||||
@Mock (name = "applicationContext")
|
||||
protected ApplicationContext mockedApplicationContext;
|
||||
@Mock (name = "nodeTypeUtility")
|
||||
protected NodeTypeUtility mockedNodeTypeUtility;
|
||||
@Mock private Map<Object, Object> mockedCache;
|
||||
|
||||
/**
|
||||
@@ -85,7 +88,7 @@ public class ServiceBaseImplUnitTest
|
||||
|
||||
when(mockedNodeService.getType(nodeRef))
|
||||
.thenReturn(ContentModel.TYPE_CONTENT);
|
||||
when(mockedDictionaryService.isSubClass(ContentModel.TYPE_CONTENT, RecordsManagementModel.TYPE_FILE_PLAN))
|
||||
when(mockedNodeTypeUtility.instanceOf(ContentModel.TYPE_CONTENT, RecordsManagementModel.TYPE_FILE_PLAN))
|
||||
.thenReturn(false);
|
||||
when(mockedTransactionalResourceHelper.getMap("rm.servicebase.getFilePlan"))
|
||||
.thenReturn(mockedCache);
|
||||
|
Reference in New Issue
Block a user