refactor uitesting

dprevato · Jan 28, 2020 · e2871eb · e2871eb
1 parent 30ba3a5
commit e2871eb
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 20 deletions.
diff --git a/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UITests/HelloWorld.UITests.csproj b/Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UITests/HelloWorld.UITests.csproj
@@ -6,6 +6,10 @@
     <NoWarn>NU1201</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(BUILD_ARTIFACTSTAGINGDIRECTORY)' != '' ">
+    <OutputDir>$(ArtifactStagingRoot)</OutputDir>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">

diff --git a/Source/build/azure-pipelines.yml b/Source/build/azure-pipelines.yml
@@ -29,8 +29,8 @@ variables:
   value: Release
 - name: BuildPlatform
   value: Any CPU
-- name: AppCenterDroidSlug
-  value: Prism/Sandbox.Android
+- name: AppCenterDroidAppName
+  value: Sandbox.Android
 - name: AppCenterDroidDevices
   value: 8804278a
 - group: SignClient
@@ -61,6 +61,14 @@ stages:
 
   - template: jobs/xamarin-uitest.yml
 
+  - template: jobs/sandbox-uitest.yml
+    parameters:
+      artifactName: Sandbox-Android
+      sandboxJobName: sandboxAndroid
+      appFile: '$(Pipeline.Workspace)/Sandbox-Android/com.prismlibrary.helloworld.apk'
+      appName: $(AppCenterDroidAppName)
+      devices: $(AppCenterDroidDevices)
+
 - stage: buildPackage
   displayName: Build Prism Library
   jobs:
@@ -78,7 +86,7 @@ stages:
           steps:
             - template: steps/appcenter-deploy.yml
               parameters:
-                appName: 'Sandbox.Android'
+                appName: $(AppCenterDroidAppName)
                 appFile: '$(Pipeline.Workspace)/Sandbox-Android/com.prismlibrary.helloworld.apk'
                 distributionGroup: '88fd9e93-9e2e-4a44-bda4-e7d6bf8f7a10'
 

diff --git a/Source/build/jobs/sandbox-android.yml b/Source/build/jobs/sandbox-android.yml
@@ -1,5 +1,5 @@
 parameters:
-  buildConfiguration: 'Debug'
+  buildConfiguration: 'Release'
   versionName: ''
 
 jobs:
@@ -48,4 +48,3 @@ jobs:
     inputs:
       targetPath: '$(Build.ArtifactStagingDirectory)'
       artifactName: Sandbox-Android
-    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
diff --git a/Source/build/jobs/sandbox-ios.yml b/Source/build/jobs/sandbox-ios.yml
@@ -59,4 +59,3 @@ jobs:
     inputs:
       targetPath: '$(Build.ArtifactStagingDirectory)'
       artifactName: Sandbox-iOS
-    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
diff --git a/Source/build/jobs/sandbox-uitest.yml b/Source/build/jobs/sandbox-uitest.yml
@@ -0,0 +1,39 @@
+parameters:
+  artifactName: ''
+  sandboxJobName: ''
+  appFile: ''
+  appName: ''
+  devices: ''
+
+jobs:
+- job: appCenterTests-${{ parameters.artifactName }}
+  displayName: App Center Tests ${{ parameters.artifactName }}
+  dependsOn: |
+   ${{ parameters.sandboxJobName }}
+   xamarinUITest
+  pool:
+    vmImage: $(VMImage)
+    demands:
+    - MSBuild
+  workspace:
+    clean: all
+  steps:
+  - task: DownloadPipelineArtifact@2
+    displayName: Download UI Test Project
+    inputs:
+      artifactName: XamarinUITests
+      targetPath: '$(Pipeline.Workspace)'
+  - task: DownloadPipelineArtifact@2
+    displayName: Download ${{ parameters.artifactName }}
+    inputs:
+      artifactName: ${{ parameters.artifactName }}
+      targetPath: '$(Pipeline.Workspace)'
+  - task: AppCenterTest@1
+    displayName: 'Run UI Tests ${{ parameters.artifactName }} with App Center'
+    inputs:
+      appFile: ${{ parameters.appFile }}
+      frameworkOption: uitest
+      uiTestBuildDirectory: $(Pipeline.Workspace)/XamarinUITests/
+      serverEndpoint: 'Prism-AppCenter'
+      appSlug: 'Prism/${{ parameters.appName }}'
+      devices: ${{ parameters.devices }}
diff --git a/Source/build/jobs/xamarin-uitest.yml b/Source/build/jobs/xamarin-uitest.yml
@@ -1,7 +1,6 @@
 jobs:
 - job: xamarinUITest
   displayName: HelloWorld.UITests
-  dependsOn: sandboxAndroid
   pool:
     vmImage: $(VMImage)
     demands:
@@ -13,18 +12,14 @@ jobs:
     parameters:
       solution: Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UITests/HelloWorld.UITests.csproj
       solutionName: HelloWorld.UITests
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      artifactName: 'Sandbox-Android'
-      targetPath: '$(Pipeline.Workspace)'
-  - task: AppCenterTest@1
-    displayName: 'Test Android with Visual Studio App Center'
+
+  - powershell: Get-ChildItem . -Recurse | ForEach-Object -Process { $_.FullName }
+    displayName: List Artifacts
+
+  - task: PublishPipelineArtifact@0
+    displayName: 'Publish Sandbox Artifacts'
     inputs:
-      appFile: '**/*.apk'
-      frameworkOption: uitest
-      uiTestBuildDirectory: 'Sandbox/Xamarin/HelloWorld/HelloWorld/HelloWorld.UITests/bin/$(BuildConfiguration)/net461/'
-      serverEndpoint: 'Prism-AppCenter'
-      appSlug: '$(AppCenterDroidSlug)'
-      devices: '$(AppCenterDroidDevices)'
-    enabled: true
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+      artifactName: XamarinUITests
+