Changing literals to - endpointDeclaration.functionName

Author: anu3990

test-basic/endpoint-caller.js

@@ -25,7 +25,7 @@ describe('Endpoint caller', function() {
     it('moduleInitSjs endpoint', function(done) {
         const serviceDeclaration = JSON.parse(fs.readFileSync('test-basic-proxy/ml-modules/generated/moduleInitSjs/service.json', {encoding: 'utf8'}));
         const endpointDeclaration = JSON.parse(fs.readFileSync('test-basic-proxy/ml-modules/generated/moduleInitSjs/initializer.api', {encoding: 'utf8'}));
-        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+'initializer'+'.sjs';
+        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+endpointDeclaration.functionName+'.sjs';
         const endpointCaller = dbWriter.endpointCaller(endpointDeclaration);
         const params = {param1:true, param2: '1.2', param3: [1.2, 3.4], param4:[5, 6] };
 
@@ -43,7 +43,7 @@ describe('Endpoint caller', function() {
     it('moduleInitXqy endpoint', function(done) {
         const serviceDeclaration = JSON.parse(fs.readFileSync('test-basic-proxy/ml-modules/generated/moduleInitXqy/service.json', {encoding: 'utf8'}));
         const endpointDeclaration = JSON.parse(fs.readFileSync('test-basic-proxy/ml-modules/generated/moduleInitXqy/initializer.api', {encoding: 'utf8'}));
-        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+'initializer'+'.xqy';
+        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+endpointDeclaration.functionName+'.xqy';
         const endpointCaller = dbWriter.endpointCaller(endpointDeclaration);
         const params = {param1:true, param2: '1.2', param3: [1.2, 3.4], param4:[5, 6] };
 
@@ -63,7 +63,7 @@ describe('Endpoint caller', function() {
             {encoding: 'utf8'}));
         const endpointDeclaration = JSON.parse(fs.readFileSync('test-basic-proxy/ml-modules/generated/postOfMultipartForDocument/postOfMultipartForDocumentArray1.api',
             {encoding: 'utf8'}));
-        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+'postOfMultipartForDocumentArray1'+'.sjs';
+        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+endpointDeclaration.functionName+'.sjs';
         const endpointCaller = dbWriter.endpointCaller(endpointDeclaration);
         const params = {param1:[{"root":{"child":"text1"}}, {"root":{"child":"text2"}}]};
 
@@ -83,7 +83,7 @@ describe('Endpoint caller', function() {
             {encoding: 'utf8'}));
         const endpointDeclaration = JSON.parse(fs.readFileSync('test-basic-proxy/ml-modules/generated/postOfUrlencodedForDocument/postOfUrlencodedForDocumentArray1.api',
             {encoding: 'utf8'}));
-        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+'postOfUrlencodedForDocumentArray1'+'.mjs';
+        endpointDeclaration.endpoint = serviceDeclaration.endpointDirectory+endpointDeclaration.functionName+'.mjs';
         const endpointCaller = dbWriter.endpointCaller(endpointDeclaration);
         const params = {param1:[1.2, 3.4]};
 

test-basic/service-caller.js

@@ -29,7 +29,7 @@ describe('Service caller', function() {
         const serviceCaller = dbWriter.serviceCaller(serviceDeclaration, [endpointDeclaration]);
         const params = {param1:true, param2: '1.2', param3: [1.2, 3.4], param4:[5, 6] };
 
-        serviceCaller.call('initializer', params)
+        serviceCaller.call(endpointDeclaration.functionName, params)
             .then(output => {
                 expect(output).to.eql(true);
                 done();
@@ -47,7 +47,7 @@ describe('Service caller', function() {
         const serviceCaller = dbWriter.serviceCaller(serviceDeclaration, [endpointDeclaration]);
         const params = {param1:true, param2: '1.2', param3: [1.2, 3.4], param4:[5, 6] };
 
-        serviceCaller.call('initializer', params)
+        serviceCaller.call(endpointDeclaration.functionName, params)
             .then(output => {
                 expect(output).to.eql(true);
                 done();
@@ -67,7 +67,7 @@ describe('Service caller', function() {
         const serviceCaller = dbWriter.serviceCaller(serviceDeclaration, [endpointDeclaration]);
         const params = {param1:[{"root":{"child":"text1"}}, {"root":{"child":"text2"}}]};
 
-        serviceCaller.call('postOfMultipartForDocumentArray1', params)
+        serviceCaller.call(endpointDeclaration.functionName, params)
             .then(output => {
                 expect(output).to.eql(["text1", 1]);
                 done();
@@ -87,7 +87,7 @@ describe('Service caller', function() {
         const serviceCaller = dbWriter.serviceCaller(serviceDeclaration, [endpointDeclaration]);
         const params = {param1:[1.2, 3.4]};
 
-        serviceCaller.call('postOfUrlencodedForDocumentArray1', params)
+        serviceCaller.call(endpointDeclaration.functionName, params)
             .then(output => {
                 expect(output).to.eql(["text1", 1]);
                 done();
@@ -110,10 +110,10 @@ describe('Service caller', function() {
         const params1 = {param1:[1.2, 3.4]};
         const params2 = {param1:[{"root":{"child":"text1"}}, {"root":{"child":"text2"}}]};
 
-        serviceCaller.call('postOfMultipartForDocumentArray1', params1)
+        serviceCaller.call(endpointDeclaration1.functionName, params1)
             .then(output => {
                 expect(output).to.eql(["text1", 1]);
-                return serviceCaller.call('postOfMultipartForDocumentTextDocument1', params2);
+                return serviceCaller.call(endpointDeclaration2.functionName, params2);
             })
             .then(output => {
                 expect(output).to.eql('abc');