Bugfix/2331 proper progress updates

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   mojaloop-testing-toolkit:
-    image: mojaloop/ml-testing-toolkit:v12.4.1
+    image: mojaloop/ml-testing-toolkit:v13.0.0
     #image: mojaloop-testing-toolkit:local
     #build:
     #  context: .
@@ -18,7 +18,7 @@ services:
       - -c
       - "npm start"
   mojaloop-testing-toolkit-ui:
-    image: mojaloop/ml-testing-toolkit-ui:v12.2.2
+    image: mojaloop/ml-testing-toolkit-ui:v13.0.0
     ports:
       - "6060:6060"
     environment:

native-app-generation/build-native-app.sh

@@ -1,4 +1,4 @@
-TTK_UI_TAG="v12.2.2"
+TTK_UI_TAG="v13.0.0"
 
 HelpMessage () {
   echo "Usage: $0 -platform [macos|linux|win] -arch [x64|x86|armv6|armv7]"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ml-testing-toolkit",
   "description": "Testing Toolkit for Mojaloop implementations",
-  "version": "11.17.4",
+  "version": "12.0.0",
   "license": "Apache-2.0",
   "author": "Vijaya Kumar Guthi, ModusBox Inc. ",
   "contributors": [

src/lib/test-outbound/outbound-initiator.js

@@ -66,11 +66,23 @@ const getTracing = (traceID, dfspId) => {
 }
 
 const OutboundSend = async (inputTemplate, traceID, dfspId) => {
+  const totalCounts = getTotalCounts(inputTemplate)
   const globalConfig = {
     broadcastOutboundProgressEnabled: true,
     scriptExecution: true,
-    testsExecution: true
+    testsExecution: true,
+    totalProgress: {
+      testCasesTotal: totalCounts.totalTestCases,
+      testCasesProcessed: 0,
+      requestsTotal: totalCounts.totalRequests,
+      requestsProcessed: 0,
+      assertionsTotal: totalCounts.totalAssertions,
+      assertionsProcessed: 0,
+      assertionsPassed: 0,
+      assertionsFailed: 0
+    }
   }
+
   const startedTimeStamp = new Date()
   const tracing = getTracing(traceID, dfspId)
 
@@ -79,6 +91,7 @@ const OutboundSend = async (inputTemplate, traceID, dfspId) => {
   }
   try {
     for (const i in inputTemplate.test_cases) {
+      globalConfig.totalProgress.testCasesProcessed++
       await processTestCase(inputTemplate.test_cases[i], traceID, inputTemplate.inputValues, variableData, dfspId, globalConfig)
     }
 
@@ -322,6 +335,13 @@ const setResponse = async (convertedRequest, resp, variableData, request, status
       curlRequest: resp.curlRequest
     }
   }
+
+  // Update total progress counts
+  globalConfig.totalProgress.requestsProcessed++
+  globalConfig.totalProgress.assertionsProcessed += request.tests && request.tests.assertions ? request.tests.assertions.length : 0
+  globalConfig.totalProgress.assertionsPassed += testResult.passedCount
+  globalConfig.totalProgress.assertionsFailed += request.tests && request.tests.assertions ? (request.tests.assertions.length - testResult.passedCount) : 0
+
   if (tracing.outboundID && globalConfig.broadcastOutboundProgressEnabled) {
     notificationEmitter.broadcastOutboundProgress({
       outboundID: tracing.outboundID,
@@ -336,7 +356,8 @@ const setResponse = async (convertedRequest, resp, variableData, request, status
         curlRequest: resp.curlRequest,
         scriptsExecution: scriptsExecution
       },
-      testResult
+      testResult,
+      totalProgress: globalConfig.totalProgress
     }, tracing.sessionID)
   }
 }
@@ -356,6 +377,13 @@ const setSkippedResponse = async (convertedRequest, request, status, tracing, te
       curlRequest: null
     }
   }
+
+  // Update total progress counts
+  globalConfig.totalProgress.requestsProcessed++
+  globalConfig.totalProgress.assertionsProcessed += request.tests && request.tests.assertions && request.tests.assertions.length
+  globalConfig.totalProgress.assertionsPassed += testResult.passedCount
+  // globalConfig.totalProgress.assertionsFailed += 0
+
   if (tracing.outboundID && globalConfig.broadcastOutboundProgressEnabled) {
     notificationEmitter.broadcastOutboundProgress({
       outboundID: tracing.outboundID,
@@ -370,7 +398,8 @@ const setSkippedResponse = async (convertedRequest, request, status, tracing, te
         curlRequest: null,
         scriptsExecution: scriptsExecution
       },
-      testResult
+      testResult,
+      totalProgress: globalConfig.totalProgress
     }, tracing.sessionID)
   }
 }
@@ -766,6 +795,25 @@ const getFunctionResult = (param, inputValues, request) => {
   return utilsInternal.getFunctionResult(param, inputValues, request)
 }
 
+// Get Total Counts
+const getTotalCounts = (inputTemplate) => {
+  var result = {
+    totalTestCases: 0,
+    totalRequests: 0,
+    totalAssertions: 0
+  }
+  const { test_cases } = inputTemplate  // eslint-disable-line
+  result.totalTestCases = test_cases.length
+  test_cases.forEach(testCase => {
+    const { requests } = testCase
+    result.totalRequests += requests.length
+    requests.forEach(request => {
+      result.totalAssertions += request.tests && request.tests.assertions && request.tests.assertions.length
+    })
+  })
+  return result
+}
+
 // Generate consolidated final report
 const generateFinalReport = (inputTemplate, runtimeInformation) => {
   const { test_cases, ...remaingPropsInTemplate } = inputTemplate  // eslint-disable-line