mirror of
https://github.com/nasa/openmct.git
synced 2025-06-14 13:18:15 +00:00
[Creation] Rename creation capability
...to instantiation, to distinguish from creation (which typically includes persistence.)
This commit is contained in:
@ -68,7 +68,7 @@ define(
|
|||||||
*/
|
*/
|
||||||
CreationService.prototype.createObject = function (model, parent) {
|
CreationService.prototype.createObject = function (model, parent) {
|
||||||
var persistence = parent.getCapability("persistence"),
|
var persistence = parent.getCapability("persistence"),
|
||||||
newObject = parent.useCapability("creation", model),
|
newObject = parent.useCapability("instantiation", model),
|
||||||
newObjectPersistence = newObject.getCapability("persistence"),
|
newObjectPersistence = newObject.getCapability("persistence"),
|
||||||
self = this;
|
self = this;
|
||||||
|
|
||||||
|
@ -91,14 +91,14 @@ define(
|
|||||||
);
|
);
|
||||||
mockCreationCapability = jasmine.createSpyObj(
|
mockCreationCapability = jasmine.createSpyObj(
|
||||||
"creation",
|
"creation",
|
||||||
["create", "invoke"]
|
["instantiate", "invoke"]
|
||||||
);
|
);
|
||||||
mockCapabilities = {
|
mockCapabilities = {
|
||||||
mutation: mockMutationCapability,
|
mutation: mockMutationCapability,
|
||||||
persistence: mockPersistenceCapability,
|
persistence: mockPersistenceCapability,
|
||||||
composition: mockCompositionCapability,
|
composition: mockCompositionCapability,
|
||||||
context: mockContextCapability,
|
context: mockContextCapability,
|
||||||
creation: mockCreationCapability
|
instantiation: mockCreationCapability
|
||||||
};
|
};
|
||||||
mockNewPersistenceCapability = jasmine.createSpyObj(
|
mockNewPersistenceCapability = jasmine.createSpyObj(
|
||||||
"new-persistence",
|
"new-persistence",
|
||||||
@ -130,9 +130,9 @@ define(
|
|||||||
mockPromise([mockNewObject])
|
mockPromise([mockNewObject])
|
||||||
);
|
);
|
||||||
mockCompositionCapability.add.andReturn(mockPromise(true));
|
mockCompositionCapability.add.andReturn(mockPromise(true));
|
||||||
mockCreationCapability.create.andReturn(mockNewObject);
|
mockCreationCapability.instantiate.andReturn(mockNewObject);
|
||||||
mockCreationCapability.invoke.andCallFake(function (model) {
|
mockCreationCapability.invoke.andCallFake(function (model) {
|
||||||
return mockCreationCapability.create(model);
|
return mockCreationCapability.instantiate(model);
|
||||||
});
|
});
|
||||||
|
|
||||||
creationService = new CreationService(
|
creationService = new CreationService(
|
||||||
@ -144,7 +144,7 @@ define(
|
|||||||
it("allows new objects to be created", function () {
|
it("allows new objects to be created", function () {
|
||||||
var model = { someKey: "some value" };
|
var model = { someKey: "some value" };
|
||||||
creationService.createObject(model, mockParentObject);
|
creationService.createObject(model, mockParentObject);
|
||||||
expect(mockCreationCapability.create)
|
expect(mockCreationCapability.instantiate)
|
||||||
.toHaveBeenCalledWith(model);
|
.toHaveBeenCalledWith(model);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -200,8 +200,8 @@
|
|||||||
"depends": [ "$q" ]
|
"depends": [ "$q" ]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"key": "creation",
|
"key": "instantiation",
|
||||||
"implementation": "capabilities/CreationCapability.js",
|
"implementation": "capabilities/InstantiationCapability.js",
|
||||||
"depends": [ "$injector" ]
|
"depends": [ "$injector" ]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
@ -61,7 +61,7 @@ define(
|
|||||||
*
|
*
|
||||||
* @returns {DomainObject} the new domain object
|
* @returns {DomainObject} the new domain object
|
||||||
*/
|
*/
|
||||||
CreationCapability.prototype.create = function (model) {
|
CreationCapability.prototype.instantiate = function (model) {
|
||||||
var id = uuid(),
|
var id = uuid(),
|
||||||
capabilities = this.getCapabilities(model);
|
capabilities = this.getCapabilities(model);
|
||||||
return new DomainObjectImpl(id, model, capabilities);
|
return new DomainObjectImpl(id, model, capabilities);
|
||||||
@ -72,7 +72,7 @@ define(
|
|||||||
* @see {platform/core.CreationCapability#create}
|
* @see {platform/core.CreationCapability#create}
|
||||||
*/
|
*/
|
||||||
CreationCapability.prototype.invoke =
|
CreationCapability.prototype.invoke =
|
||||||
CreationCapability.prototype.create;
|
CreationCapability.prototype.instantiate;
|
||||||
|
|
||||||
return CreationCapability;
|
return CreationCapability;
|
||||||
}
|
}
|
@ -25,14 +25,14 @@
|
|||||||
* ContextCapability. Created by vwoeltje on 11/6/14.
|
* ContextCapability. Created by vwoeltje on 11/6/14.
|
||||||
*/
|
*/
|
||||||
define(
|
define(
|
||||||
["../../src/capabilities/CreationCapability"],
|
["../../src/capabilities/InstantiationCapability"],
|
||||||
function (CreationCapability) {
|
function (InstantiationCapability) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
describe("The 'creation' capability", function () {
|
describe("The 'instantiation' capability", function () {
|
||||||
var mockInjector,
|
var mockInjector,
|
||||||
mockCapabilityService,
|
mockCapabilityService,
|
||||||
creation;
|
instantiation;
|
||||||
|
|
||||||
beforeEach(function () {
|
beforeEach(function () {
|
||||||
mockInjector = jasmine.createSpyObj("$injector", ["get"]);
|
mockInjector = jasmine.createSpyObj("$injector", ["get"]);
|
||||||
@ -46,12 +46,12 @@ define(
|
|||||||
mockCapabilityService : undefined;
|
mockCapabilityService : undefined;
|
||||||
});
|
});
|
||||||
|
|
||||||
creation = new CreationCapability(mockInjector);
|
instantiation = new InstantiationCapability(mockInjector);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
it("aliases 'create' as 'invoke'", function () {
|
it("aliases 'instantiate' as 'invoke'", function () {
|
||||||
expect(creation.invoke).toBe(creation.create);
|
expect(instantiation.invoke).toBe(instantiation.instantiate);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("when creating an object", function () {
|
describe("when creating an object", function () {
|
||||||
@ -71,7 +71,7 @@ define(
|
|||||||
|
|
||||||
testModel = { someKey: "some value" };
|
testModel = { someKey: "some value" };
|
||||||
|
|
||||||
domainObject = creation.create(testModel);
|
domainObject = instantiation.instantiate(testModel);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("loads capabilities from the capability service", function () {
|
it("loads capabilities from the capability service", function () {
|
||||||
@ -92,7 +92,7 @@ define(
|
|||||||
|
|
||||||
it("provides unique identifiers", function () {
|
it("provides unique identifiers", function () {
|
||||||
expect(domainObject.getId()).toEqual(jasmine.any(String));
|
expect(domainObject.getId()).toEqual(jasmine.any(String));
|
||||||
expect(creation.create(testModel).getId())
|
expect(instantiation.instantiate(testModel).getId())
|
||||||
.not.toEqual(domainObject.getId());
|
.not.toEqual(domainObject.getId());
|
||||||
});
|
});
|
||||||
});
|
});
|
@ -8,8 +8,8 @@
|
|||||||
"capabilities/ContextCapability",
|
"capabilities/ContextCapability",
|
||||||
"capabilities/ContextualDomainObject",
|
"capabilities/ContextualDomainObject",
|
||||||
"capabilities/CoreCapabilityProvider",
|
"capabilities/CoreCapabilityProvider",
|
||||||
"capabilities/CreationCapability",
|
|
||||||
"capabilities/DelegationCapability",
|
"capabilities/DelegationCapability",
|
||||||
|
"capabilities/InstantiationCapability",
|
||||||
"capabilities/MetadataCapability",
|
"capabilities/MetadataCapability",
|
||||||
"capabilities/MutationCapability",
|
"capabilities/MutationCapability",
|
||||||
"capabilities/PersistenceCapability",
|
"capabilities/PersistenceCapability",
|
||||||
|
Reference in New Issue
Block a user