mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Addressing review comments. Clearer use of lambdas due to default methods in java.util.Collection.
Thanks Tom! git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/classified_renditions@111707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -29,17 +29,13 @@ import static org.mockito.Mockito.when;
|
|||||||
import org.alfresco.service.cmr.dictionary.AspectDefinition;
|
import org.alfresco.service.cmr.dictionary.AspectDefinition;
|
||||||
import org.alfresco.service.cmr.dictionary.AssociationDefinition;
|
import org.alfresco.service.cmr.dictionary.AssociationDefinition;
|
||||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||||
import org.alfresco.service.cmr.repository.NodeRef;
|
|
||||||
import org.alfresco.service.cmr.repository.NodeService;
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
import org.alfresco.service.cmr.repository.StoreRef;
|
|
||||||
import org.alfresco.service.namespace.QName;
|
import org.alfresco.service.namespace.QName;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
import org.mockito.MockitoAnnotations;
|
import org.mockito.MockitoAnnotations;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unit tests for {@link MetadataReferral}.
|
* Unit tests for {@link MetadataReferral}.
|
||||||
*
|
*
|
||||||
@@ -53,8 +49,6 @@ public class MetadataReferralUnitTest
|
|||||||
|
|
||||||
private final ReferralAdminServiceImpl referralAdminService = new ReferralAdminServiceImpl();
|
private final ReferralAdminServiceImpl referralAdminService = new ReferralAdminServiceImpl();
|
||||||
|
|
||||||
private final NodeRef node1 = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "node1");
|
|
||||||
private final NodeRef node2 = new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, "node2");
|
|
||||||
private final QName aspect1 = QName.createQName("test", "aspect1");
|
private final QName aspect1 = QName.createQName("test", "aspect1");
|
||||||
private final QName aspect2 = QName.createQName("test", "aspect2");
|
private final QName aspect2 = QName.createQName("test", "aspect2");
|
||||||
private final QName assoc1 = QName.createQName("test", "assoc1");
|
private final QName assoc1 = QName.createQName("test", "assoc1");
|
||||||
@@ -68,35 +62,33 @@ public class MetadataReferralUnitTest
|
|||||||
|
|
||||||
@Test public void nullOrEmptyReferralsAreForbidden()
|
@Test public void nullOrEmptyReferralsAreForbidden()
|
||||||
{
|
{
|
||||||
List<MetadataReferral> invalidMetadataReferrals = asListFrom(() -> new MetadataReferral(),
|
asListFrom(() -> new MetadataReferral(),
|
||||||
() -> {
|
() -> {
|
||||||
MetadataReferral mr = new MetadataReferral();
|
MetadataReferral mr = new MetadataReferral();
|
||||||
mr.setAssocType(assoc1);
|
mr.setAssocType(assoc1);
|
||||||
mr.setAspects(null);
|
mr.setAspects(null);
|
||||||
mr.setDictionaryService(mockDictionaryService);
|
mr.setDictionaryService(mockDictionaryService);
|
||||||
return mr;
|
return mr;
|
||||||
},
|
},
|
||||||
() -> {
|
() -> {
|
||||||
MetadataReferral mr = new MetadataReferral();
|
MetadataReferral mr = new MetadataReferral();
|
||||||
mr.setAssocType(assoc1);
|
mr.setAssocType(assoc1);
|
||||||
mr.setAspects(emptySet());
|
mr.setAspects(emptySet());
|
||||||
mr.setDictionaryService(mockDictionaryService);
|
mr.setDictionaryService(mockDictionaryService);
|
||||||
return mr;
|
return mr;
|
||||||
},
|
},
|
||||||
() -> {
|
() -> {
|
||||||
MetadataReferral mr = new MetadataReferral();
|
MetadataReferral mr = new MetadataReferral();
|
||||||
mr.setAssocType(null);
|
mr.setAssocType(null);
|
||||||
mr.setAspects(asSet(aspect1, aspect2));
|
mr.setAspects(asSet(aspect1, aspect2));
|
||||||
mr.setDictionaryService(mockDictionaryService);
|
mr.setDictionaryService(mockDictionaryService);
|
||||||
return mr;
|
return mr;
|
||||||
});
|
})
|
||||||
|
.forEach(mr -> expectedException(InvalidMetadataReferral.class, () -> {
|
||||||
invalidMetadataReferrals.stream()
|
mr.validateAndRegister();
|
||||||
.forEach(mr -> expectedException(InvalidMetadataReferral.class, () -> {
|
return null;
|
||||||
mr.validateAndRegister();
|
})
|
||||||
return null;
|
);
|
||||||
}
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected=InvalidMetadataReferral.class)
|
@Test(expected=InvalidMetadataReferral.class)
|
||||||
|
Reference in New Issue
Block a user