Handle primitive types in ModelUtil.isAssignableTo() (#1022)

Also fixed a logic error where property name was used as a type name.

Author: Mark S. Lewis

packages/composer-common/lib/modelutil.js

@@ -96,23 +96,14 @@ class ModelUtil {
  * @private
  */
  static isAssignableTo(modelFile, type, property) {
- if(ModelUtil.isPrimitiveType(type)) {
- throw new Error('This method only works with complex types.');
- }
+ const propertyType = property.getFullyQualifiedTypeName();
 
- if(ModelUtil.isPrimitiveType(property.getName())) {
- return false;
+ if (ModelUtil.isPrimitiveType(type) || ModelUtil.isPrimitiveType(propertyType)) {
+ return type === propertyType;
  }
 
- // console.log( 'Checking whether type ' + type + ' can be stored in a property of type ' + property.getFullyQualifiedTypeName() );
-
- // console.log( 'model file ns ' + modelFile.getNamespace() );
- // console.log( 'type ' + type );
- // console.log( 'property ' + property.getFullyQualifiedName() );
- // console.log( 'property type ' + property.getFullyQualifiedTypeName() );
-
  // simple case
- if(type === property.getFullyQualifiedTypeName()) {
+ if (type === propertyType) {
  return true;
  }
 

packages/composer-common/test/modelutil.js

@@ -104,32 +104,45 @@ describe('ModelUtil', function () {
  });
 
  describe('#isAssignableTo', function() {
+ let mockModelFile;
+ let mockProperty;
 
- it('throws error for primitive types', function() {
- let mockModelFile = sinon.createStubInstance(ModelFile);
- let mockProperty = sinon.createStubInstance(Property);
- (() => {
- ModelUtil.isAssignableTo(mockModelFile, 'String', mockProperty);
- }).should.throw(/This method only works with complex types/);
+ beforeEach(function() {
+ mockModelFile = sinon.createStubInstance(ModelFile);
+ mockProperty = sinon.createStubInstance(Property);
+ });
+
+ it('returns true for matching primitive types', function() {
+ mockProperty.getFullyQualifiedTypeName.returns('String');
+ const result = ModelUtil.isAssignableTo(mockModelFile, 'String', mockProperty);
+ result.should.equal(true);
+ });
+
+ it('returns false for non-matching primitive types', function() {
+ mockProperty.getFullyQualifiedTypeName.returns('DateTime');
+ const result = ModelUtil.isAssignableTo(mockModelFile, 'Boolean', mockProperty);
+ result.should.equal(false);
+ });
+
+ it('returns false for assignment of primitive to non-primitive property', function() {
+ mockProperty.getFullyQualifiedTypeName.returns('org.doge.Doge');
+ const result = ModelUtil.isAssignableTo(mockModelFile, 'String', mockProperty);
+ result.should.equal(false);
  });
 
- it('returns false if property name is primitive type', function() {
- let mockModelFile = sinon.createStubInstance(ModelFile);
- let mockProperty = sinon.createStubInstance(Property);
- mockProperty.getName.returns('String');
- ModelUtil.isAssignableTo(mockModelFile, 'org.doge.Doge', mockProperty).should.equal(false);
+ it('returns false for assignment of non-primitive to primitive property', function() {
+ mockProperty.getFullyQualifiedTypeName.returns('String');
+ const result = ModelUtil.isAssignableTo(mockModelFile, 'org.doge.Doge', mockProperty);
+ result.should.equal(false);
  });
 
  it('returns true if property type and required type are identical', function() {
- let mockModelFile = sinon.createStubInstance(ModelFile);
- let mockProperty = sinon.createStubInstance(Property);
  mockProperty.getFullyQualifiedTypeName.returns('org.doge.Doge');
- ModelUtil.isAssignableTo(mockModelFile, 'org.doge.Doge', mockProperty).should.equal(true);
+ const result = ModelUtil.isAssignableTo(mockModelFile, 'org.doge.Doge', mockProperty);
+ result.should.equal(true);
  });
 
  it('throws error when type cannot be found', function() {
- let mockModelFile = sinon.createStubInstance(ModelFile);
- let mockProperty = sinon.createStubInstance(Property);
  mockProperty.getName.returns('theDoge');
  mockProperty.getFullyQualifiedTypeName.returns('org.doge.BaseDoge');
  mockModelFile.getType.returns(null);