ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-01 15:10:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrated to using notifications and fixed tests

Browse Source
This commit is contained in:
Henry 2015-11-04 15:38:22 -08:00 committed by Andrew Henry
parent 4e69ca50fb
commit 5e1b0f38b7
3 changed files with 68 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platform/entanglement/src/services/CopyService.js
View File

@ -95,7 +95,6 @@ define(
persistenceSpace: originalParent.getCapability('persistence')
}
delete modelClone.model.composition;
delete modelClone.model.location;
delete modelClone.model.persisted;
delete modelClone.model.modified;
return $q.when(originalObject.useCapability('composition')).then(function(composees){
@ -108,7 +107,11 @@ define(
return copy(composee, originalObject).then(function(composeeClone){
//Once copied, associate each cloned
// composee with its parent clone
composeeClone.model.location = modelClone.id;
if ( !(composee.hasCapability("location") && composee.getCapability("location").isLink())) {
//If the object is not a link,
// locate it within its parent
composeeClone.model.location = modelClone.id;
}
modelClone.model.composition = modelClone.model.composition || [];
return modelClone.model.composition.push(composeeClone.id);
});
@ -122,7 +125,12 @@ define(
});
};
return copy(domainObject, parent).then(function(){
return copy(domainObject, parent).then(function(domainObjectClone){
//If the domain object being cloned is not a link, set its
// location to the new parent
if ( !(domainObject.hasCapability("location") && domainObject.getCapability("location").isLink())) {
domainObjectClone.model.location = parent.getId();
}
return clones;
});
}
@ -166,8 +174,7 @@ define(
if (!parent.hasCapability('composition')){
return self.$q.reject();
}
parentClone.model.location = parent.getId();
return self.persistenceService
.updateObject(parentClone.persistenceSpace, parentClone.id, parentClone.model)
.then(function(){return parent.getCapability("composition").add(parentClone.id)})

2
platform/entanglement/test/actions/AbstractComposeActionSpec.js
View File

@ -140,7 +140,7 @@ define(
.args[0](newParent);
expect(composeService.perform)
.toHaveBeenCalledWith(selectedObject, newParent, undefined);
.toHaveBeenCalledWith(selectedObject, newParent);
});
});
});

94
platform/entanglement/test/services/CopyServiceSpec.js
View File

@ -126,6 +126,7 @@ define(
describe("perform", function () {
var mockQ,
mockDeferred,
creationService,
createObjectPromise,
copyService,
@ -167,19 +168,33 @@ define(
mockNow.now.andCallFake(function(){
return 1234;
})
var resolvedValue;
mockDeferred = jasmine.createSpyObj('mockDeferred', ['notify', 'resolve']);
mockDeferred.notify.andCallFake(function(notification){});
mockDeferred.resolve.andCallFake(function(value){resolvedValue = value})
mockDeferred.promise = {
then: function(callback){
return synchronousPromise(callback(resolvedValue));
}
}
mockQ = jasmine.createSpyObj('mockQ', ['when', 'all', 'reject', 'defer']);
mockQ.when.andCallFake(synchronousPromise);
mockQ.all.andCallFake(function (promises) {
var result = {};
Object.keys(promises).forEach(function (k) {
promises[k].then(function (v) { result[k] = v; });
});
return synchronousPromise(result);
});
mockQ.defer.andReturn(mockDeferred);
});
describe("on domain object without composition", function () {
beforeEach(function () {
object = domainObjectFactory({
name: 'object',
id: 'abc',
model: {
name: 'some object',
persisted: mockNow.now()
}
});
newParent = domainObjectFactory({
name: 'newParent',
id: '456',
@ -190,14 +205,15 @@ define(
persistence: parentPersistenceCapability
}
});
mockQ = jasmine.createSpyObj('mockQ', ['when', 'all', 'reject']);
mockQ.when.andCallFake(synchronousPromise);
mockQ.all.andCallFake(function (promises) {
var result = {};
Object.keys(promises).forEach(function (k) {
promises[k].then(function (v) { result[k] = v; });
});
return synchronousPromise(result);
object = domainObjectFactory({
name: 'object',
id: 'abc',
model: {
name: 'some object',
location: newParent.id,
persisted: mockNow.now()
}
});
copyService = new CopyService(mockQ, creationService, policyService, mockPersistenceService, mockNow.now);
@ -235,18 +251,14 @@ define(
var newObject,
childObject,
compositionCapability,
locationCapability,
compositionPromise;
beforeEach(function () {
mockQ = jasmine.createSpyObj('mockQ', ['when', 'all', 'reject']);
mockQ.when.andCallFake(synchronousPromise);
mockQ.all.andCallFake(function (promises) {
var result = {};
Object.keys(promises).forEach(function (k) {
promises[k].then(function (v) { result[k] = v; });
});
return synchronousPromise(result);
});
locationCapability = jasmine.createSpyObj('locationCapability', ['isLink']);
locationCapability.isLink.andReturn(true);
childObject = domainObjectFactory({
name: 'childObject',
@ -264,8 +276,6 @@ define(
['then']
);
//compositionPromise.then.andCallFake(synchronousPromise);
compositionCapability
.invoke
.andReturn(synchronousPromise([childObject]));
@ -275,10 +285,12 @@ define(
id: 'abc',
model: {
name: 'some object',
composition: ['def']
composition: ['def'],
location: 'testLocation'
},
capabilities: {
composition: compositionCapability
composition: compositionCapability,
location: locationCapability
}
});
newObject = domainObjectFactory({
@ -315,16 +327,6 @@ define(
copyFinished = jasmine.createSpy('copyFinished');
copyResult.then(copyFinished);
});
/**
* This is testing that the number of calls to the
* backend is kept to a minimum
*/
it("makes only n+2 persistence calls for n copied" +
" objects", function () {
expect(mockPersistenceService.createObject.calls.length).toEqual(2);
expect(mockPersistenceService.updateObject.calls.length).toEqual(1);
expect(parentPersistenceCapability.persist).toHaveBeenCalled();
});
it("copies object and children in a bottom-up" +
" fashion", function () {
@ -342,6 +344,20 @@ define(
expect(copyFinished.mostRecentCall.args[0].model.persisted).toBe(mockNow.now());
});
/**
Preserves links
*/
it ("preserves links", function() {
expect(copyFinished.mostRecentCall.args[0].model.location).toBe("testLocation");
});
/**
Preserves links
*/
it ("correctly locates cloned objects", function() {
expect(mockPersistenceService.createObject.calls[0].args[2].location).toEqual(mockPersistenceService.createObject.calls[1].args[1])
});
});
});