From 77174fddfe980c60bceb10de9ba01af6a9fc1721 Mon Sep 17 00:00:00 2001 From: Jerome Simeon Date: Mon, 9 Nov 2020 14:36:22 -0500 Subject: [PATCH] fix(tools) Fixes some failing tests after the last commit Signed-off-by: Jerome Simeon --- .../test/codegen/fromcto/java/javavisitor.js | 2 +- .../loopback/loopbackvisitorcircular.js | 2 +- .../fromcto/typescript/typescriptvisitor.js | 10 ++--- .../fromcto/xmlschema/xmlschemavisitor.js | 39 +++++++++++-------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/packages/concerto-tools/test/codegen/fromcto/java/javavisitor.js b/packages/concerto-tools/test/codegen/fromcto/java/javavisitor.js index 3c3c235fd1..0d6d2d35ea 100644 --- a/packages/concerto-tools/test/codegen/fromcto/java/javavisitor.js +++ b/packages/concerto-tools/test/codegen/fromcto/java/javavisitor.js @@ -360,7 +360,7 @@ describe('JavaVisitor', function () { param.fileWriter.writeLine.callCount.should.deep.equal(4); param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, 'import oranges;']); param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, 'import apples;']); - param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, 'public class Bob extends org.hyperledger.composer.system.Resource {']); + param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, 'public class Bob {']); param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '}']); acceptSpy.withArgs(javaVisit, Object.assign({},param,{mode:'field'})).calledTwice.should.be.ok; acceptSpy.withArgs(javaVisit, Object.assign({},param,{mode:'getter'})).calledTwice.should.be.ok; diff --git a/packages/concerto-tools/test/codegen/fromcto/loopback/loopbackvisitorcircular.js b/packages/concerto-tools/test/codegen/fromcto/loopback/loopbackvisitorcircular.js index 3a25a60ca0..7d5541470b 100644 --- a/packages/concerto-tools/test/codegen/fromcto/loopback/loopbackvisitorcircular.js +++ b/packages/concerto-tools/test/codegen/fromcto/loopback/loopbackvisitorcircular.js @@ -53,7 +53,7 @@ describe('LoopbackVisitor with Circular Model', () => { // Visit all of the loaded model files and check that they were all generated const schemas = modelManager.accept(visitor, { fileWriter: mockFileWriter }); - schemas.length.should.equal(32); + schemas.length.should.equal(29); }); }); diff --git a/packages/concerto-tools/test/codegen/fromcto/typescript/typescriptvisitor.js b/packages/concerto-tools/test/codegen/fromcto/typescript/typescriptvisitor.js index 3e4b7adfc6..b4b1228317 100644 --- a/packages/concerto-tools/test/codegen/fromcto/typescript/typescriptvisitor.js +++ b/packages/concerto-tools/test/codegen/fromcto/typescript/typescriptvisitor.js @@ -283,12 +283,10 @@ describe('TypescriptVisitor', function () { typescriptVisitor.visitModelFile(mockModelFile, param); param.fileWriter.openFile.withArgs('org.acme.Person.ts').calledOnce.should.be.ok; - param.fileWriter.writeLine.callCount.should.deep.equal(5); - param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, 'import {Bob} from \'./org.hyperledger.composer.system\';']); - param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, 'import {Fred} from \'./org.hyperledger.composer.system\';']); - param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, 'import {Property1,Property3} from \'./org.org1\';']); - param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '// export namespace org.acme.Person{']); - param.fileWriter.writeLine.getCall(4).args.should.deep.equal([0, '// }']); + param.fileWriter.writeLine.callCount.should.deep.equal(3); + param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, 'import {Property1,Property3} from \'./org.org1\';']); + param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '// export namespace org.acme.Person{']); + param.fileWriter.writeLine.getCall(2).args.should.deep.equal([0, '// }']); param.fileWriter.closeFile.calledOnce.should.be.ok; acceptSpy.withArgs(typescriptVisitor, param).calledTwice.should.be.ok; diff --git a/packages/concerto-tools/test/codegen/fromcto/xmlschema/xmlschemavisitor.js b/packages/concerto-tools/test/codegen/fromcto/xmlschema/xmlschemavisitor.js index 4d6b95eb82..52832ae5d7 100644 --- a/packages/concerto-tools/test/codegen/fromcto/xmlschema/xmlschemavisitor.js +++ b/packages/concerto-tools/test/codegen/fromcto/xmlschema/xmlschemavisitor.js @@ -136,16 +136,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, '']); - param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '']); - param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '']); + param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '']); + param.fileWriter.writeLine.getCall(4).args.should.deep.equal([0, '']); + param.fileWriter.writeLine.getCall(5).args.should.deep.equal([0, '']); param.fileWriter.closeFile.calledOnce.should.be.ok; }); @@ -178,16 +181,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, '']); - param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '']); - param.fileWriter.writeLine.getCall(3).args.should.deep.equal([0, '']); + param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '']); + param.fileWriter.writeLine.getCall(4).args.should.deep.equal([0, '']); + param.fileWriter.writeLine.getCall(5).args.should.deep.equal([0, '']); param.fileWriter.closeFile.calledOnce.should.be.ok; }); @@ -238,17 +245,15 @@ describe('XmlSchemaVisitor', function () { xmlSchemaVisitor.visitModelManager(mockModelManager, param); param.fileWriter.openFile.withArgs('org.foo.xsd').calledOnce.should.be.ok; - param.fileWriter.writeLine.callCount.should.deep.equal(10); + param.fileWriter.writeLine.callCount.should.deep.equal(8); param.fileWriter.writeLine.getCall(0).args.should.deep.equal([0, '']); param.fileWriter.writeLine.getCall(1).args.should.deep.equal([0, '']); - param.fileWriter.writeLine.getCall(6).args.should.deep.equal([0, '']); - param.fileWriter.writeLine.getCall(7).args.should.deep.equal([0, '']); - param.fileWriter.writeLine.getCall(8).args.should.deep.equal([0, '']); - param.fileWriter.writeLine.getCall(9).args.should.deep.equal([0, '']); + 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, '']); + param.fileWriter.writeLine.getCall(6).args.should.deep.equal([0, '']); + param.fileWriter.writeLine.getCall(7).args.should.deep.equal([0, '']); param.fileWriter.closeFile.calledOnce.should.be.ok; });