Try the docker stuff at CI

.github/workflows/createrelease.yml

@@ -122,7 +122,7 @@ jobs:
           debug: false  
           gitReleaseNotes: true          
 
-  released-mac:
+  release-mac:
     runs-on: macos-11
     name: MacCatalyst Release
     steps:

.github/workflows/pullrequest_android.yml

@@ -20,19 +20,49 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Get IP
+        run: ipconfig getifaddr en0
+
+      - name: Cache Public IP
+        run: echo "ENV_IPADDRESS=$(ipconfig getifaddr en0)" >> $GITHUB_ENV
+
+      - name: Test IP
+        run: echo $ENV_IPADDRESS
+
+      - name: Setup Docker
+        run: |
+         brew install docker
+         colima start --cpu 2 --memory 8 --disk 100
+
+      - name: Pull images
+        run: |
+         docker pull stuartferguson/messagingservice:master
+         docker pull stuartferguson/estatemanagement:master
+         docker pull stuartferguson/securityservice:master
+         docker pull stuartferguson/transactionprocessor:master
+         docker pull stuartferguson/transactionprocessoracl:master
+         docker pull stuartferguson/testhosts:master
+         #docker pull stuartferguson/vouchermanagementacl:master
+         #docker pull stuartferguson/fileprocessor:master
+         docker pull stuartferguson/callbackhandler:master
+         docker pull stuartferguson/mobileconfiguration:master
+         docker pull mcr.microsoft.com/azure-sql-edge
+         docker pull eventstore/eventstore:21.10.0-buster-slim
+
       - uses: malinskiy/action-android/install-sdk@release/0.1.1
       - run: sdkmanager "platform-tools" "platforms;android-33"
       - run: sdkmanager "build-tools;30.0.2"
       - run: adb devices
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12.12.0'
+      #- name: Set up Node.js
+      #  uses: actions/setup-node@v1
+      #  with:
+      #    node-version: '16.14.2'
 
       - name: Set up Appium
         run: |
-          npm install -g appium --unsafe-perm=true --allow-root
+          npm install -g appium@next --unsafe-perm=true --allow-root
+          appium driver install uiautomator2
 
       - name: Setup .NET 7
         uses: actions/setup-dotnet@v2
@@ -58,17 +88,30 @@ jobs:
       - name: Run Unit Tests
         run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
 
-      #- name: Run Integration Tests - Android
-      #  uses: malinskiy/action-android/emulator-run-cmd@release/0.1.1
-      #  with:
-      #    cmd: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter (Category=PRTest)&(Category=Android)
-      #    api: 28
-      #    tag: default
-      #    abi: x86   
-      #    verbose: true
+      - name: Run Integration Tests - Android
+        uses: malinskiy/action-android/emulator-run-cmd@release/0.1.4
+        with:
+          cmd: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter (Category=PRTest)&(Category=Android)
+          api: 28
+          tag: default
+          abi: x86   
+          verbose: false
 
       #- name: Upload Android Artifact
       #  uses: actions/upload-artifact@v2.3.1
       #  with:
       #    name: android-ci-build
       #    path: src/MauiBeach/bin/Release/net6.0-android/*Signed.a*
+
+      - uses: actions/upload-artifact@v2
+        if: ${{ failure() }}
+        with:
+          name: tracelogsios
+          path: /Users/runner/txnproc/trace/
+
+      - name: Save logcat output
+        uses: actions/upload-artifact@master
+        if: failure()
+        with:
+          name: logcat
+          path: artifacts/logcat.log 

.github/workflows/pullrequest_ios.yml

@@ -19,18 +19,48 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Get IP
+        run: ipconfig getifaddr en0
+
+      - name: Cache Public IP
+        run: echo "ENV_IPADDRESS=$(ipconfig getifaddr en0)" >> $GITHUB_ENV
+
+      - name: Test IP
+        run: echo $ENV_IPADDRESS
+
+      - name: Setup Docker
+        run: |
+         brew install docker
+         colima start --cpu 2 --memory 8 --disk 100
+
+      - name: Pull images
+        run: |
+         docker pull stuartferguson/messagingservice:master
+         docker pull stuartferguson/estatemanagement:master
+         docker pull stuartferguson/securityservice:master
+         docker pull stuartferguson/transactionprocessor:master
+         docker pull stuartferguson/transactionprocessoracl:master
+         docker pull stuartferguson/testhosts:master
+         docker pull stuartferguson/vouchermanagementacl:master
+         docker pull stuartferguson/fileprocessor:master
+         docker pull stuartferguson/callbackhandler:master
+         docker pull stuartferguson/mobileconfiguration:master
+         docker pull mcr.microsoft.com/azure-sql-edge
+         docker pull eventstore/eventstore:21.10.0-buster-slim
+
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: '13.3'
 
       - name: Set up Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: '12.12.0'
+          node-version: '16.14.2'
 
       - name: Set up Appium
         run: |
-          npm install -g appium --unsafe-perm=true --allow-root
+          npm install -g appium@next --unsafe-perm=true --allow-root
+          appium driver install xcuitest
 
       - name: Setup .NET 7
         uses: actions/setup-dotnet@v2
@@ -51,11 +81,5 @@ jobs:
       - name: Run Unit Tests
         run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
 
-      #- name: Run Integration Tests - iOS
-      #  run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter  "Category=PRTest&Category=iOS"
-
-      #- name: Upload iOS Artifact
-      #  uses: actions/upload-artifact@v2.3.1
-      #  with:
-      #    name: ios-ci-build
-      #    path: src/TransactionMobile.Maui/bin/Release/net6.0-ios/**/*.app/
+      - name: Run Integration Tests - iOS
+        run: dotnet test TransactionMobile.Maui.UiTests/TransactionMobile.Maui.UiTests.csproj --filter  "Category=PRTest&Category=iOS"

.github/workflows/pullrequest_maccatalyst.yml

@@ -37,9 +37,9 @@ jobs:
       - name: Run Unit Tests
         run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
 
-#      #- name: Upload MacCatalyst Artifact
-#      #  uses: actions/upload-artifact@v2.3.1
-#      #  with:
-#      #    name: macos-ci-build
-#      #    path: src/MauiBeach/bin/Release/net6.0-maccatalyst/**/*.app/
+##      #- name: Upload MacCatalyst Artifact
+##      #  uses: actions/upload-artifact@v2.3.1
+##      #  with:
+##      #    name: macos-ci-build
+##      #    path: src/MauiBeach/bin/Release/net6.0-maccatalyst/**/*.app/
 

.github/workflows/pullrequest_windows.yml

@@ -47,10 +47,3 @@ jobs:
 
       - name: Run Unit Tests
         run: dotnet test TransactionMobile.Maui.BusinessLogic.Tests/TransactionMobile.Maui.BusinessLogic.Tests.csproj
-
-      - name: Upload Windows Artifact
-        uses: actions/upload-artifact@v2.3.1
-        with:
-          name: windows-ci-build
-          path: |
-            TransactionMobile.Maui/bin/Release/net6.0-windows*/**/TransactionMobile.Maui*.msix

TransactionMobile.Maui.BusinessLogic.Tests/RequestHandlerTests/TransactionRequestHandlerTests.cs

@@ -15,7 +15,6 @@
 using TransactionProcessorACL.DataTransferObjects.Responses;
 using UIServices;
 using Xunit;
-using static SQLite.SQLite3;
 
 public class TransactionRequestHandlerTests
 {
@@ -63,7 +62,8 @@ public async Task TransactionRequestHandler_LogonTransactionRequest_Handle_IsHan
     [Fact]
     public async Task TransactionRequestHandler_PerformMobileTopupRequest_Handle_IsHandled()
     {
-        this.TransactionService.Setup(t => t.PerformMobileTopup(It.IsAny<PerformMobileTopupRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<SaleTransactionResponseMessage>(new SaleTransactionResponseMessage {
+        this.TransactionService.Setup(t => t.PerformMobileTopup(It.IsAny<PerformMobileTopupRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<PerformMobileTopupResponseModel>(new PerformMobileTopupResponseModel
+            {
             ResponseCode = "0000"
         }));
 
@@ -75,17 +75,17 @@ public async Task TransactionRequestHandler_PerformMobileTopupRequest_Handle_IsH
                                                                              TestData.Operator1Product_100KES.Value,
                                                                              TestData.CustomerEmailAddress);
 
-        Result<SaleTransactionResponseMessage> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
+        Result<PerformMobileTopupResponseModel> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
 
         result.Success.ShouldBeTrue();
-        result.Data.IsSuccessfulTransaction().ShouldBeTrue();
+        result.Data.IsSuccessful.ShouldBeTrue();
     }
 
     [Fact]
     public async Task TransactionRequestHandler_PerformVoucherIssueRequest_Handle_IsHandled()
     {
-        this.TransactionService.Setup(t => t.PerformVoucherIssue(It.IsAny<PerformVoucherIssueRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<SaleTransactionResponseMessage>(new SaleTransactionResponseMessage
-            {
+        this.TransactionService.Setup(t => t.PerformVoucherIssue(It.IsAny<PerformVoucherIssueRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<PerformVoucherIssueResponseModel>(new PerformVoucherIssueResponseModel
+        {
                 ResponseCode = "0000"
             }));
 
@@ -98,10 +98,10 @@ public async Task TransactionRequestHandler_PerformVoucherIssueRequest_Handle_Is
                                                                                TestData.Operator3Product_200KES.Value,
                                                                                TestData.CustomerEmailAddress);
 
-        Result<SaleTransactionResponseMessage> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
+        Result<PerformVoucherIssueResponseModel> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
 
         result.Success.ShouldBeTrue();
-        result.Data.IsSuccessfulTransaction().ShouldBeTrue();
+        result.Data.IsSuccessful.ShouldBeTrue();
     }
 
     [Fact]
@@ -146,7 +146,7 @@ public async Task TransactionRequestHandler_PerformBillPaymentGetAccountRequest_
     [Fact]
     public async Task TransactionRequestHandler_PerformBillPaymentMakePaymentRequest_Handle_IsHandled()
     {
-        this.TransactionService.Setup(t => t.PerformBillPaymentMakePayment(It.IsAny<PerformBillPaymentMakePaymentModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<SaleTransactionResponseMessage>(new SaleTransactionResponseMessage
+        this.TransactionService.Setup(t => t.PerformBillPaymentMakePayment(It.IsAny<PerformBillPaymentMakePaymentModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<PerformBillPaymentMakePaymentResponseModel>(new PerformBillPaymentMakePaymentResponseModel
         {
             ResponseCode = "0000"
         }));
@@ -160,17 +160,17 @@ public async Task TransactionRequestHandler_PerformBillPaymentMakePaymentRequest
                                                                                                    TestData.CustomerMobileNumber,
                                                                                                    TestData.PaymentAmount);
 
-        Result<SaleTransactionResponseMessage> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
+        Result<PerformBillPaymentMakePaymentResponseModel> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
 
         result.Success.ShouldBeTrue();
-        result.Data.IsSuccessfulTransaction().ShouldBeTrue();
+        result.Data.IsSuccessful.ShouldBeTrue();
     }
 
     [Fact]
     public async Task TransactionRequestHandler_PerformBillPaymentMakePaymentRequest_PaymentFailed_Handle_IsHandled()
     {
-        this.TransactionService.Setup(t => t.PerformBillPaymentMakePayment(It.IsAny<PerformBillPaymentMakePaymentModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<SaleTransactionResponseMessage>(new SaleTransactionResponseMessage
-            {
+        this.TransactionService.Setup(t => t.PerformBillPaymentMakePayment(It.IsAny<PerformBillPaymentMakePaymentModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<PerformBillPaymentMakePaymentResponseModel>(new PerformBillPaymentMakePaymentResponseModel
+        {
                 ResponseCode = "0001"
             }));
 
@@ -183,15 +183,16 @@ public async Task TransactionRequestHandler_PerformBillPaymentMakePaymentRequest
                                                                                                    TestData.CustomerMobileNumber,
                                                                                                    TestData.PaymentAmount);
 
-        Result<SaleTransactionResponseMessage> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
+        Result<PerformBillPaymentMakePaymentResponseModel> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
 
         result.Failure.ShouldBeTrue();
     }
 
     [Fact]
     public async Task TransactionRequestHandler_PerformReconciliationRequest_NoTransactions_Handle_IsHandled()
     {
-        this.TransactionService.Setup(t => t.PerformReconciliation(It.IsAny<PerformReconciliationRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<ReconciliationResponseMessage>(new ReconciliationResponseMessage {
+        this.TransactionService.Setup(t => t.PerformReconciliation(It.IsAny<PerformReconciliationRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<PerformReconciliationResponseModel>(new PerformReconciliationResponseModel
+            {
             ResponseCode = "0000"
         }));
         this.DatabaseContext.Setup(d => d.GetTransactions(It.IsAny<Boolean>())).ReturnsAsync(new List<TransactionRecord>());
@@ -200,26 +201,26 @@ public async Task TransactionRequestHandler_PerformReconciliationRequest_NoTrans
                                                                                    TestData.DeviceIdentifier,
                                                                                    TestData.ApplicationVersion);
 
-        Result<ReconciliationResponseMessage> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
+        Result<PerformReconciliationResponseModel> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
 
         result.Success.ShouldBeTrue();
-        result.Data.IsSuccessfulReconciliation().ShouldBeTrue();
+        result.Data.IsSuccessful.ShouldBeTrue();
     }
 
     [Fact]
     public async Task TransactionRequestHandler_PerformReconciliationRequest_TransactionsStored_Handle_IsHandled() {
-        this.TransactionService.Setup(t => t.PerformReconciliation(It.IsAny<PerformReconciliationRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<ReconciliationResponseMessage>(new ReconciliationResponseMessage
-            {
+        this.TransactionService.Setup(t => t.PerformReconciliation(It.IsAny<PerformReconciliationRequestModel>(), It.IsAny<CancellationToken>())).ReturnsAsync(new SuccessResult<PerformReconciliationResponseModel>(new PerformReconciliationResponseModel
+        {
                 ResponseCode = "0000"
             }));
 
         this.DatabaseContext.Setup(d => d.GetTransactions(It.IsAny<Boolean>())).ReturnsAsync(TestData.StoredTransactions);
 
         PerformReconciliationRequest request = PerformReconciliationRequest.Create(TestData.TransactionDateTime, TestData.DeviceIdentifier, TestData.ApplicationVersion);
 
-        Result<ReconciliationResponseMessage> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
+        Result<PerformReconciliationResponseModel> result = await this.TransactionRequestHandler.Handle(request, CancellationToken.None);
 
         result.Success.ShouldBeTrue();
-        result.Data.IsSuccessfulReconciliation().ShouldBeTrue();
+        result.Data.IsSuccessful.ShouldBeTrue();
     }
 }