From 770a5f5e557d5bd2facaf20d892016f55b57646e Mon Sep 17 00:00:00 2001 From: Robin-Manuel Thiel Date: Sun, 23 Sep 2018 13:55:42 +0200 Subject: [PATCH] Test Cloud fixes --- ContosoMaintenance.sln | 153 +++++------------- .../ContosoFieldService.Core.csproj | 23 +-- Mobile/Droid/ContosoFieldService.Droid.csproj | 32 ++-- Mobile/Droid/Services/EnvironmentService.cs | 4 +- .../ContosoFieldService.UITests.csproj | 39 +++-- Mobile/UITests/PageObjects/JobsPage.cs | 8 - Mobile/UITests/Tests.cs | 19 +-- Mobile/UITests/packages.config | 4 +- Mobile/iOS/AppDelegate.cs | 9 +- Mobile/iOS/ContosoFieldService.iOS.csproj | 52 +++--- Mobile/iOS/Services/EnvironmentService.cs | 4 +- 11 files changed, 129 insertions(+), 218 deletions(-) diff --git a/ContosoMaintenance.sln b/ContosoMaintenance.sln index efff2c4..fa39a3c 100644 --- a/ContosoMaintenance.sln +++ b/ContosoMaintenance.sln @@ -26,9 +26,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContosoMaintenance.WebAPI", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContosoMaintenance.Functions", "Backend\Functions\ContosoMaintenance.Functions.csproj", "{0980AA2E-1C59-4AD4-A8B4-C38C8676F323}" EndProject -Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "ContosoFieldService.UITests", "Mobile\UITests\ContosoFieldService.UITests.csproj", "{015BB45C-56AE-46A3-82BE-0A439C2A078E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContosoFieldService.UITests", "Mobile\UITests\ContosoFieldService.UITests.csproj", "{B6E498F2-60A4-44BE-B4D9-D8D2F953066D}" EndProject -Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "ContosoMaintenance.Bot.WebApp", "Backend\BotBackend\ContosoMaintenance.Bot.WebApp.csproj", "{AF689AE3-DDED-4A91-BD53-D42C344EA930}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContosoMaintenance.Bot.WebApp", "Backend\BotBackend\ContosoMaintenance.Bot.WebApp.csproj", "{9C7E3A46-B60F-4052-9A21-DC8D1A942216}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -44,6 +44,7 @@ Global ReleaseBackend|Any CPU = ReleaseBackend|Any CPU ReleaseBackend|iPhone = ReleaseBackend|iPhone ReleaseBackend|iPhoneSimulator = ReleaseBackend|iPhoneSimulator + Test Cloud|Any CPU = Test Cloud|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8D50D622-6D39-4894-B679-BB60C5D60648}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -52,158 +53,82 @@ Global {8D50D622-6D39-4894-B679-BB60C5D60648}.Debug|iPhone.Build.0 = Debug|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.DebugBackend|Any CPU.ActiveCfg = Debug|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.DebugBackend|Any CPU.Build.0 = Debug|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.DebugBackend|iPhone.ActiveCfg = Debug|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.DebugBackend|iPhone.Build.0 = Debug|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.DebugBackend|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.DebugBackend|iPhoneSimulator.Build.0 = Debug|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Release|Any CPU.ActiveCfg = Release|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Release|Any CPU.Build.0 = Release|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Release|iPhone.ActiveCfg = Release|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Release|iPhone.Build.0 = Release|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {8D50D622-6D39-4894-B679-BB60C5D60648}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.ReleaseBackend|Any CPU.ActiveCfg = Release|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.ReleaseBackend|Any CPU.Build.0 = Release|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.ReleaseBackend|iPhone.ActiveCfg = Release|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.ReleaseBackend|iPhone.Build.0 = Release|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.ReleaseBackend|iPhoneSimulator.ActiveCfg = Release|Any CPU - {8D50D622-6D39-4894-B679-BB60C5D60648}.ReleaseBackend|iPhoneSimulator.Build.0 = Release|Any CPU + {8D50D622-6D39-4894-B679-BB60C5D60648}.Test Cloud|Any CPU.ActiveCfg = Test Cloud|Any CPU + {8D50D622-6D39-4894-B679-BB60C5D60648}.Test Cloud|Any CPU.Build.0 = Test Cloud|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Debug|iPhone.ActiveCfg = Debug|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|Any CPU.ActiveCfg = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|Any CPU.Build.0 = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|Any CPU.Deploy.0 = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|iPhone.ActiveCfg = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|iPhone.Build.0 = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|iPhone.Deploy.0 = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|iPhoneSimulator.ActiveCfg = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|iPhoneSimulator.Build.0 = DebugBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.DebugBackend|iPhoneSimulator.Deploy.0 = DebugBackend|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Release|Any CPU.Build.0 = Release|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Release|iPhone.ActiveCfg = Release|Any CPU {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|Any CPU.ActiveCfg = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|Any CPU.Build.0 = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|Any CPU.Deploy.0 = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|iPhone.ActiveCfg = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|iPhone.Build.0 = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|iPhone.Deploy.0 = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|iPhoneSimulator.ActiveCfg = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|iPhoneSimulator.Build.0 = ReleaseBackend|Any CPU - {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.ReleaseBackend|iPhoneSimulator.Deploy.0 = ReleaseBackend|Any CPU + {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Test Cloud|Any CPU.ActiveCfg = Test Cloud|Any CPU + {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C}.Test Cloud|Any CPU.Build.0 = Test Cloud|Any CPU {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Debug|iPhone.ActiveCfg = Debug|iPhone {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Debug|iPhone.Build.0 = Debug|iPhone {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.DebugBackend|Any CPU.ActiveCfg = DebugBackend|Any CPU - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.DebugBackend|Any CPU.Build.0 = DebugBackend|Any CPU - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.DebugBackend|iPhone.ActiveCfg = DebugBackend|iPhone - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.DebugBackend|iPhone.Build.0 = DebugBackend|iPhone - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.DebugBackend|iPhoneSimulator.ActiveCfg = DebugBackend|iPhoneSimulator - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.DebugBackend|iPhoneSimulator.Build.0 = DebugBackend|iPhoneSimulator {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Release|Any CPU.ActiveCfg = Release|iPhone {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Release|Any CPU.Build.0 = Release|iPhone {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Release|iPhone.ActiveCfg = Release|iPhone {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Release|iPhone.Build.0 = Release|iPhone {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.ReleaseBackend|Any CPU.ActiveCfg = ReleaseBackend|Any CPU - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.ReleaseBackend|Any CPU.Build.0 = ReleaseBackend|Any CPU - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.ReleaseBackend|iPhone.ActiveCfg = ReleaseBackend|iPhone - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.ReleaseBackend|iPhone.Build.0 = ReleaseBackend|iPhone - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.ReleaseBackend|iPhoneSimulator.ActiveCfg = ReleaseBackend|iPhoneSimulator - {E2745280-BDD1-4F5D-B976-199B9AA7602C}.ReleaseBackend|iPhoneSimulator.Build.0 = ReleaseBackend|iPhoneSimulator + {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Test Cloud|Any CPU.ActiveCfg = Test Cloud|iPhoneSimulator + {E2745280-BDD1-4F5D-B976-199B9AA7602C}.Test Cloud|Any CPU.Build.0 = Test Cloud|iPhoneSimulator {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Debug|Any CPU.Build.0 = Debug|Any CPU {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Debug|iPhone.ActiveCfg = Debug|Any CPU {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.DebugBackend|Any CPU.ActiveCfg = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.DebugBackend|Any CPU.Build.0 = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.DebugBackend|iPhone.ActiveCfg = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.DebugBackend|iPhone.Build.0 = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.DebugBackend|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.DebugBackend|iPhoneSimulator.Build.0 = Debug|Any CPU {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Release|Any CPU.ActiveCfg = Release|Any CPU {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Release|Any CPU.Build.0 = Release|Any CPU {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Release|iPhone.ActiveCfg = Release|Any CPU {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.ReleaseBackend|Any CPU.ActiveCfg = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.ReleaseBackend|Any CPU.Build.0 = Debug|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.ReleaseBackend|iPhone.ActiveCfg = Release|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.ReleaseBackend|iPhone.Build.0 = Release|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.ReleaseBackend|iPhoneSimulator.ActiveCfg = Release|Any CPU - {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.ReleaseBackend|iPhoneSimulator.Build.0 = Release|Any CPU + {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Test Cloud|Any CPU.ActiveCfg = Debug|Any CPU + {61BFA852-2AAC-42BB-9073-B8857D45FE3A}.Test Cloud|Any CPU.Build.0 = Debug|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Debug|Any CPU.Build.0 = Debug|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Debug|iPhone.ActiveCfg = Debug|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.DebugBackend|Any CPU.ActiveCfg = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.DebugBackend|Any CPU.Build.0 = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.DebugBackend|iPhone.ActiveCfg = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.DebugBackend|iPhone.Build.0 = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.DebugBackend|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.DebugBackend|iPhoneSimulator.Build.0 = Debug|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Release|Any CPU.ActiveCfg = Release|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Release|Any CPU.Build.0 = Release|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Release|iPhone.ActiveCfg = Release|Any CPU {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.ReleaseBackend|Any CPU.ActiveCfg = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.ReleaseBackend|Any CPU.Build.0 = Debug|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.ReleaseBackend|iPhone.ActiveCfg = Release|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.ReleaseBackend|iPhone.Build.0 = Release|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.ReleaseBackend|iPhoneSimulator.ActiveCfg = Release|Any CPU - {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.ReleaseBackend|iPhoneSimulator.Build.0 = Release|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.DebugBackend|Any CPU.ActiveCfg = DebugBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.DebugBackend|Any CPU.Build.0 = DebugBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.DebugBackend|iPhone.ActiveCfg = DebugBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.DebugBackend|iPhone.Build.0 = DebugBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.DebugBackend|iPhoneSimulator.ActiveCfg = DebugBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.DebugBackend|iPhoneSimulator.Build.0 = DebugBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Release|Any CPU.Build.0 = Release|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Release|iPhone.ActiveCfg = Release|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.ReleaseBackend|Any CPU.ActiveCfg = ReleaseBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.ReleaseBackend|Any CPU.Build.0 = ReleaseBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.ReleaseBackend|iPhone.ActiveCfg = ReleaseBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.ReleaseBackend|iPhone.Build.0 = ReleaseBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.ReleaseBackend|iPhoneSimulator.ActiveCfg = ReleaseBackend|Any CPU - {015BB45C-56AE-46A3-82BE-0A439C2A078E}.ReleaseBackend|iPhoneSimulator.Build.0 = ReleaseBackend|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Debug|iPhone.Build.0 = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.DebugBackend|Any CPU.ActiveCfg = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.DebugBackend|Any CPU.Build.0 = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.DebugBackend|iPhone.ActiveCfg = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.DebugBackend|iPhone.Build.0 = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.DebugBackend|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.DebugBackend|iPhoneSimulator.Build.0 = Debug|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Release|Any CPU.Build.0 = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Release|iPhone.ActiveCfg = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Release|iPhone.Build.0 = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.ReleaseBackend|Any CPU.ActiveCfg = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.ReleaseBackend|Any CPU.Build.0 = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.ReleaseBackend|iPhone.ActiveCfg = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.ReleaseBackend|iPhone.Build.0 = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.ReleaseBackend|iPhoneSimulator.ActiveCfg = Release|Any CPU - {AF689AE3-DDED-4A91-BD53-D42C344EA930}.ReleaseBackend|iPhoneSimulator.Build.0 = Release|Any CPU + {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Test Cloud|Any CPU.ActiveCfg = Debug|Any CPU + {0980AA2E-1C59-4AD4-A8B4-C38C8676F323}.Test Cloud|Any CPU.Build.0 = Debug|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Release|Any CPU.Build.0 = Release|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Release|iPhone.ActiveCfg = Release|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Test Cloud|Any CPU.ActiveCfg = Debug|Any CPU + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D}.Test Cloud|Any CPU.Build.0 = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Debug|iPhone.Build.0 = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Release|Any CPU.Build.0 = Release|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Release|iPhone.ActiveCfg = Release|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Release|iPhone.Build.0 = Release|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Test Cloud|Any CPU.ActiveCfg = Debug|Any CPU + {9C7E3A46-B60F-4052-9A21-DC8D1A942216}.Test Cloud|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -217,8 +142,8 @@ Global {E2745280-BDD1-4F5D-B976-199B9AA7602C} = {ED42B7AC-B4AD-4784-8FEF-2953A8A7CEDC} {61BFA852-2AAC-42BB-9073-B8857D45FE3A} = {9F0FD859-1134-4C77-99E5-83703A2DE5A2} {0980AA2E-1C59-4AD4-A8B4-C38C8676F323} = {A5E6EEE2-C985-4C48-A6FD-BD95BFAA25EA} - {015BB45C-56AE-46A3-82BE-0A439C2A078E} = {F9802EBB-7857-4380-B1AD-F4CDE60F43F2} - {AF689AE3-DDED-4A91-BD53-D42C344EA930} = {140A5FB1-CD49-4998-8196-74EF067452B3} + {B6E498F2-60A4-44BE-B4D9-D8D2F953066D} = {F9802EBB-7857-4380-B1AD-F4CDE60F43F2} + {9C7E3A46-B60F-4052-9A21-DC8D1A942216} = {140A5FB1-CD49-4998-8196-74EF067452B3} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {60FF5FF1-44FA-4082-8169-95F16F23BE13} diff --git a/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj b/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj index a4b101f..e60ff12 100644 --- a/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj +++ b/Mobile/ContosoFieldService.Core/ContosoFieldService.Core.csproj @@ -6,18 +6,21 @@ 1701;1702;1705;1998;NU1701;AvoidAsyncVoid;UseAsyncSuffix + TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0; - - 1701;1702;1705;1998;NU1701; - obj\Debug\netstandard2.0 - true - false - TRACE;DEBUG;NETSTANDARD2_0 + + + TRACE;RELEASE;NETSTANDARD;NETSTANDARD2_0; - - obj\Release\netstandard2.0 - true - TRACE;RELEASE;NETSTANDARD2_0 + + + true + bin\Test Cloud + TRACE;RELEASE;NETSTANDARD;NETSTANDARD2_0;ENABLE_TEST_CLOUD; + 4 + 1701;1702 + true + obj\Test Cloud diff --git a/Mobile/Droid/ContosoFieldService.Droid.csproj b/Mobile/Droid/ContosoFieldService.Droid.csproj index 380f010..64d4aba 100644 --- a/Mobile/Droid/ContosoFieldService.Droid.csproj +++ b/Mobile/Droid/ContosoFieldService.Droid.csproj @@ -44,28 +44,16 @@ armeabi-v7a;x86;armeabi 1024m - - true - full - false - bin\DebugBackend - DEBUG; - prompt - 4 - None - arm64-v8a;armeabi;armeabi-v7a;x86 - - - true - pdbonly - true - bin\ReleaseBackend - prompt - 4 - true - false - true - armeabi-v7a + + true + pdbonly + true + bin\Test Cloud + ENABLE_TEST_CLOUD; + 4 + + true + false diff --git a/Mobile/Droid/Services/EnvironmentService.cs b/Mobile/Droid/Services/EnvironmentService.cs index e19840d..d5df008 100644 --- a/Mobile/Droid/Services/EnvironmentService.cs +++ b/Mobile/Droid/Services/EnvironmentService.cs @@ -10,8 +10,8 @@ namespace ContosoFieldService.Droid.Services { public bool IsRunningInRealWorld() { -#if DEBUG - //return false; +#if ENABLE_TEST_CLOUD + return false; #endif if (Build.Fingerprint.Contains("vbox") || Build.Fingerprint.Contains("generic") || diff --git a/Mobile/UITests/ContosoFieldService.UITests.csproj b/Mobile/UITests/ContosoFieldService.UITests.csproj index fa2663d..0984dbc 100644 --- a/Mobile/UITests/ContosoFieldService.UITests.csproj +++ b/Mobile/UITests/ContosoFieldService.UITests.csproj @@ -24,28 +24,13 @@ prompt 4 - - true - full - false - bin\DebugBackend - DEBUG; - prompt - 4 - - - true - bin\ReleaseBackend - prompt - 4 - - - ..\..\packages\Xamarin.UITest.2.2.4\lib\net45\Xamarin.UITest.dll - - ..\..\packages\NUnit.2.6.5\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + + ..\..\packages\Xamarin.UITest.2.2.6\lib\net45\Xamarin.UITest.dll @@ -64,6 +49,20 @@ + + + {E2745280-BDD1-4F5D-B976-199B9AA7602C} + ContosoFieldService.iOS + False + False + + + {7ABD1905-E31B-4857-B4EA-B47ED1C55D0C} + ContosoFieldService.Droid + False + False + + - \ No newline at end of file + diff --git a/Mobile/UITests/PageObjects/JobsPage.cs b/Mobile/UITests/PageObjects/JobsPage.cs index 6bbaccc..c560b7e 100644 --- a/Mobile/UITests/PageObjects/JobsPage.cs +++ b/Mobile/UITests/PageObjects/JobsPage.cs @@ -5,14 +5,6 @@ namespace ContosoFieldService.UITests.PageObjects { public class JobsPage { - public readonly string TestJobName; public readonly Func JobsListView = e => e.Marked("jobsListView"); - public readonly Func TestJob; - - public JobsPage(string testJobName) - { - TestJobName = testJobName; - TestJob = e => e.Text(TestJobName); - } } } diff --git a/Mobile/UITests/Tests.cs b/Mobile/UITests/Tests.cs index a038159..d128ca4 100644 --- a/Mobile/UITests/Tests.cs +++ b/Mobile/UITests/Tests.cs @@ -15,8 +15,6 @@ namespace ContosoFieldService.UITests IApp app; Platform platform; - string testJobName = "Paint Boeing 737"; - LoginPage loginPage; JobsPage jobsPage; JobsDetailsPage jobsDetailsPage; @@ -25,7 +23,7 @@ namespace ContosoFieldService.UITests { this.platform = platform; this.loginPage = new LoginPage(); - this.jobsPage = new JobsPage(testJobName); + this.jobsPage = new JobsPage(); this.jobsDetailsPage = new JobsDetailsPage(); } @@ -53,18 +51,21 @@ namespace ContosoFieldService.UITests app.WaitForElement(jobsPage.JobsListView); app.Screenshot("Jobs list shown."); - // Scroll down to Paint Boeing 737 job - app.ScrollDownTo(jobsPage.TestJob); - app.Screenshot("Paint Boeing 737 job shown."); + // Scroll down a bit + app.ScrollDown(); + app.Screenshot("Scrolled down"); + Assert.IsTrue(app.Query("jobItem").Any(), "No Jobs found."); - // Open job - app.Tap(jobsPage.TestJob); + // Open last job on page + var lastJobName = app.Query("lblName").LastOrDefault()?.Text; + Assert.IsTrue(lastJobName != null, "No Job Title Element found to click on."); + app.Tap(lastJobName); app.WaitForElement(jobsDetailsPage.JobName); app.Screenshot("Job Details shown."); // Check if displayed name is correct var jobNameText = app.Query(jobsDetailsPage.JobName).First().Text; - Assert.AreEqual(jobNameText, testJobName); + Assert.AreEqual(jobNameText, lastJobName, "Selected Job and displayed Job Details do not match."); } } } diff --git a/Mobile/UITests/packages.config b/Mobile/UITests/packages.config index f44a10c..d01f0a6 100644 --- a/Mobile/UITests/packages.config +++ b/Mobile/UITests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Mobile/iOS/AppDelegate.cs b/Mobile/iOS/AppDelegate.cs index e344478..6d1ace2 100644 --- a/Mobile/iOS/AppDelegate.cs +++ b/Mobile/iOS/AppDelegate.cs @@ -32,12 +32,13 @@ namespace ContosoFieldService.iOS //HACK to get the linker to behave var ignore = new CircleTransformation(); + + +#if ENABLE_TEST_CLOUD // Code for starting up the Xamarin Test Cloud Agent - // TODO: Make sure, the Agent is not started, when you want to distribute to the App Store. - // Apple will reject that. Currently, we are UI Testing the Release version in Azure DevOps. - // So a compiler flag would be a solution. Xamarin.Calabash.Start(); - +#endif + var formsApp = new App(); UIApplication.SharedApplication.SetStatusBarStyle(UIStatusBarStyle.LightContent, false); diff --git a/Mobile/iOS/ContosoFieldService.iOS.csproj b/Mobile/iOS/ContosoFieldService.iOS.csproj index 12d37d2..73e4955 100644 --- a/Mobile/iOS/ContosoFieldService.iOS.csproj +++ b/Mobile/iOS/ContosoFieldService.iOS.csproj @@ -16,7 +16,7 @@ full false bin\iPhoneSimulator\Debug - DEBUG;ENABLE_TEST_CLOUD; + __IOS__;__MOBILE__;__UNIFIED__;DEBUG; prompt 4 iPhone Developer @@ -32,7 +32,6 @@ - pdbonly true bin\iPhone\Release @@ -50,7 +49,6 @@ Contoso Maintenance In-House - pdbonly true bin\iPhoneSimulator\Release @@ -71,7 +69,7 @@ full false bin\iPhone\Debug - DEBUG;ENABLE_TEST_CLOUD; + __IOS__;__MOBILE__;__UNIFIED__;DEBUG; prompt 4 iPhone Developer @@ -89,28 +87,32 @@ Contoso Maintenance Development - - false - bin\DebugBackend - - - 4 - iPhone Developer - true - - + + true + bin\iPhone\Test Cloud + __IOS__;__MOBILE__;__UNIFIED__;ENABLE_TEST_CLOUD; + 4 + iPhone Distribution: Xamarin Inc + + true + Entitlements.prod.plist + ARM64 + HttpClientHandler + Contoso Maintenance In-House + None - - false - bin\ReleaseBackend - - - 4 - iPhone Developer: Michael James (354MN7UPEZ) - true - - - VS: WildCard Development + + true + bin\iPhoneSimulator\Test Cloud + __IOS__;__MOBILE__;__UNIFIED__;ENABLE_TEST_CLOUD; + 4 + iPhone Developer: Michael James (354MN7UPEZ) + true + + None + x86_64 + HttpClientHandler + VS: WildCard Development diff --git a/Mobile/iOS/Services/EnvironmentService.cs b/Mobile/iOS/Services/EnvironmentService.cs index 2428dfc..a72b5ba 100644 --- a/Mobile/iOS/Services/EnvironmentService.cs +++ b/Mobile/iOS/Services/EnvironmentService.cs @@ -10,8 +10,8 @@ namespace ContosoFieldService.iOS.Services { public bool IsRunningInRealWorld() { -#if DEBUG - //return false; +#if ENABLE_TEST_CLOUD + return false; #endif if (Runtime.Arch == Arch.SIMULATOR ||