Skip to content

Commit

Permalink
Merge branch 'release-1.0' of https://github.com/accordproject/concerto…
Browse files Browse the repository at this point in the history 
… into release-1.0
  • Loading branch information
@dselman
dselman committed Dec 16, 2020
2 parents fd67f93 + 77174fd commit 4a9fa66
Showing 1 changed file with 23 additions and 17 deletions.
40 changes: 23 additions & 17 deletions packages/concerto-tools/test/codegen/fromcto/xmlschema/xmlschemavisitor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,19 @@ describe('XmlSchemaVisitor', function () {
};
mockModelFile.getNamespace.returns('org.hyperledger.composer.system');
mockModelFile.getAllDeclarations.returns([mockClassDeclaration]);
mockModelFile.getImports.returns(['org.imported.ImportedType']);
mockModelManager.getModelFiles.returns([mockModelFile]);

xmlSchemaVisitor.visit(mockModelManager, param);

param.fileWriter.openFile.withArgs('org.hyperledger.composer.system.xsd').calledOnce.should.be.ok;
param.fileWriter.writeLine.callCount.should.deep.equal(4);
param.fileWriter.writeLine.callCount.should.deep.equal(6);
param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, '<?xml version="1.0"?>']);
param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '<xs:schema xmlns:org.hyperledger.composer.system="org.hyperledger.composer.system" targetNamespace="org.hyperledger.composer.system" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" ']);
param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, '>']);
param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '</xs:schema>']);
param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '<xs:schema xmlns:org.hyperledger.composer.system=\"org.hyperledger.composer.system\" targetNamespace=\"org.hyperledger.composer.system\" elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" ']);
param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, 'xmlns:org.imported=\"org.imported\"']);
param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '>']);
param.fileWriter.writeLine.getCall(4).args.should.deep.equal([0, '<xs:import namespace=\"org.imported\" schemaLocation=\"org.imported.xsd\"/>']);
param.fileWriter.writeLine.getCall(5).args.should.deep.equal([0, '</xs:schema>']);

param.fileWriter.closeFile.calledOnce.should.be.ok;
});
Expand Down Expand Up @@ -180,16 +183,20 @@ describe('XmlSchemaVisitor', function () {
};
mockModelFile.getNamespace.returns('org.hyperledger.composer.system');
mockModelFile.getAllDeclarations.returns([mockClassDeclaration]);
mockModelFile.getImports.returns(['org.imported.ImportedType']);

mockModelManager.getModelFiles.returns([mockModelFile]);

xmlSchemaVisitor.visitModelManager(mockModelManager, param);

param.fileWriter.openFile.withArgs('org.hyperledger.composer.system.xsd').calledOnce.should.be.ok;
param.fileWriter.writeLine.callCount.should.deep.equal(4);
param.fileWriter.writeLine.callCount.should.deep.equal(6);
param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, '<?xml version="1.0"?>']);
param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '<xs:schema xmlns:org.hyperledger.composer.system="org.hyperledger.composer.system" targetNamespace="org.hyperledger.composer.system" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" ']);
param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, '>']);
param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '</xs:schema>']);
param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '<xs:schema xmlns:org.hyperledger.composer.system=\"org.hyperledger.composer.system\" targetNamespace=\"org.hyperledger.composer.system\" elementFormDefault=\"qualified\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" ']);
param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, 'xmlns:org.imported=\"org.imported\"']);
param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '>']);
param.fileWriter.writeLine.getCall(4).args.should.deep.equal([0, '<xs:import namespace=\"org.imported\" schemaLocation=\"org.imported.xsd\"/>']);
param.fileWriter.writeLine.getCall(5).args.should.deep.equal([0, '</xs:schema>']);

param.fileWriter.closeFile.calledOnce.should.be.ok;
});
Expand Down Expand Up @@ -241,15 +248,14 @@ describe('XmlSchemaVisitor', function () {

param.fileWriter.openFile.withArgs('org.foo.xsd').calledOnce.should.be.ok;
param.fileWriter.writeLine.callCount.should.deep.equal(8);
let index=0;
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, '<?xml version="1.0"?>']);
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, '<xs:schema xmlns:org.foo="org.foo" targetNamespace="org.foo" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" ']);
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, 'xmlns:org.imported="org.imported"']);
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, 'xmlns:org.different="org.different"']);
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, '>']);
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, '<xs:import namespace="org.imported" schemaLocation="org.imported.xsd"/>']);
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, '<xs:import namespace="org.different" schemaLocation="org.different.xsd"/>']);
param.fileWriter.writeLine.getCall(index++).args.should.deep.equal([0, '</xs:schema>']);
param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, '<?xml version="1.0"?>']);
param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '<xs:schema xmlns:org.foo="org.foo" targetNamespace="org.foo" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" ']);
param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, 'xmlns:org.imported="org.imported"']);
param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, 'xmlns:org.different="org.different"']);
param.fileWriter.writeLine.getCall(4).args.should.deep.equal([0, '>']);
param.fileWriter.writeLine.getCall(5).args.should.deep.equal([0, '<xs:import namespace="org.imported" schemaLocation="org.imported.xsd"/>']);
param.fileWriter.writeLine.getCall(6).args.should.deep.equal([0, '<xs:import namespace="org.different" schemaLocation="org.different.xsd"/>']);
param.fileWriter.writeLine.getCall(7).args.should.deep.equal([0, '</xs:schema>']);

param.fileWriter.closeFile.calledOnce.should.be.ok;
});
Expand Down

0 comments on commit 4a9fa66

Please sign in to comment.