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