ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-07 11:08:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Creation] Use instantiate service

Browse Source 
...from instantiation capability.
This commit is contained in:
Victor Woeltjen 2015-11-06 14:15:22 -08:00
parent d059116782
commit 81b136eab1
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
platform/core/src/capabilities/InstantiationCapability.js
View File

@ -38,20 +38,6 @@ define(
this.$injector = $injector;
}
/**
* Alias of `capabilityService.getCapabilities`; handles lazy loading
* of `capabilityService`, since it cannot be declared as a
* dependency directly without creating a cycle.
* @private
*/
CreationCapability.prototype.getCapabilities = function (model) {
if (!this.capabilityService) {
this.capabilityService =
this.$injector.get('capabilityService');
}
return this.capabilityService.getCapabilities(model);
};
/**
* Instantiate a new domain object with the provided model.
*
@ -62,9 +48,8 @@ define(
* @returns {DomainObject} the new domain object
*/
CreationCapability.prototype.instantiate = function (model) {
var id = uuid(),
capabilities = this.getCapabilities(model);
return new DomainObjectImpl(id, model, capabilities);
this.instantiate = this.$injector.get("instantiate");
return this.instantiate(model);
};
/**

40
platform/core/test/capabilities/InstantiationCapabilitySpec.js
View File

@ -19,7 +19,7 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
/*global define,Promise,describe,it,xdescribe,expect,beforeEach,waitsFor,jasmine*/
/**
* ContextCapability. Created by vwoeltje on 11/6/14.
@ -31,19 +31,16 @@ define(
describe("The 'instantiation' capability", function () {
var mockInjector,
mockCapabilityService,
mockInstantiate,
instantiation;
beforeEach(function () {
mockInjector = jasmine.createSpyObj("$injector", ["get"]);
mockCapabilityService = jasmine.createSpyObj(
"capabilityService",
[ "getCapabilities" ]
);
mockInstantiate = jasmine.createSpy("instantiate");
mockInjector.get.andCallFake(function (key) {
return key === 'capabilityService' ?
mockCapabilityService : undefined;
return key === 'instantiate' ?
mockInstantiate : undefined;
});
instantiation = new InstantiationCapability(mockInjector);
@ -54,7 +51,22 @@ define(
expect(instantiation.invoke).toBe(instantiation.instantiate);
});
describe("when creating an object", function () {
it("uses the instantiate service to create domain objects", function () {
var mockDomainObject = jasmine.createSpyObj('domainObject', [
'getId',
'getModel',
'getCapability',
'useCapability',
'hasCapability'
]), testModel = { someKey: "some value" };
mockInstantiate.andReturn(mockDomainObject);
expect(instantiation.instantiate(testModel))
.toBe(mockDomainObject);
expect(mockInstantiate).toHaveBeenCalledWith(testModel);
});
// TODO: Move to instantiate service
xdescribe("when creating an object", function () {
var mockCapabilityConstructor,
mockCapabilityInstance,
mockCapabilities,
@ -64,9 +76,9 @@ define(
beforeEach(function () {
mockCapabilityConstructor = jasmine.createSpy('capability');
mockCapabilityInstance = {};
mockCapabilityService.getCapabilities.andReturn({
something: mockCapabilityConstructor
});
// mockCapabilityService.getCapabilities.andReturn({
// something: mockCapabilityConstructor
// });
mockCapabilityConstructor.andReturn(mockCapabilityInstance);
testModel = { someKey: "some value" };
@ -75,8 +87,8 @@ define(
});
it("loads capabilities from the capability service", function () {
expect(mockCapabilityService.getCapabilities)
.toHaveBeenCalledWith(testModel);
// expect(mockCapabilityService.getCapabilities)
// .toHaveBeenCalledWith(testModel);
});
it("exposes loaded capabilities from the created object", function () {