Add ChosenDeploymentAlphaLocatorFlow tests (#225)

Author: Jamie Brynes

.buildkite/premerge.steps.yaml

@@ -35,6 +35,12 @@ common: &common
 # These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
 
 steps:
+  - label: "test"
+    command: bash -c ci/test.sh
+    <<: *common
+    artifact_paths:
+      - logs/**/*
+
   - label: "build :android:"
     command: bash -c .shared-ci/scripts/build-worker.sh
     <<: *common

.buildkite/release-qa.steps.yaml

@@ -35,6 +35,12 @@ common: &common
 # These are then relied on to have stable names by other things, so once named, please beware renaming has consequences.
 
 steps:
+  - label: "test"
+    command: bash -c ci/test.sh
+    <<: *common
+    artifact_paths:
+      - logs/**/*
+
   - label: "build :android:"
     command: bash -c .shared-ci/scripts/build-worker.sh
     <<: *common

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+### Breaking Changes
+
+- Moved `ChosenDeploymentAlphaLocatorFlow` and `SessionConnectionFlowInitializer` into the `Fps.Connection` namespace and made them `public`. [#225](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/225)
+
+### Internal
+
+- Added tests for the `ChosenDeploymentAlphaLocatorFlow`. [#225](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/225)
+
 ## `0.2.6` - 2019-08-05
 
 ### Breaking Changes
@@ -15,8 +23,8 @@
 - Added the `io.improbable.gdk.debug` package as a dependency. [#222](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/222)
 
 ### Changed
-- Upgraded to GDK for Unity version `0.2.6`
 
+- Upgraded to GDK for Unity version `0.2.6`
 - The `AdvancedEntityPipeline` now uses the `OwningWorker` component from the PlayerLifecycle feature module [#222](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/222)
 - Removed the `DISABLE_REACTIVE_COMPONENTS` scripting define as it is no longer used. [#222](https://github.com/spatialos/gdk-for-unity-fps-starter-project/pull/222)
 

ci/test.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+set -e -u -o pipefail
+
+if [[ -n "${DEBUG-}" ]]; then
+  set -x
+fi
+
+cd "$(dirname "$0")/../"
+
+source .shared-ci/scripts/pinned-tools.sh
+
+PROJECT_DIR="$(pwd)"
+mkdir -p "${PROJECT_DIR}/logs/"
+
+EDITMODE_TEST_RESULTS_FILE="${PROJECT_DIR}/logs/editmode-test-results.xml"
+
+echo "--- Testing Unity: Editmode :writing_hand:"
+
+pushd "workers/unity"
+    dotnet run -p "${PROJECT_DIR}/.shared-ci/tools/RunUnity/RunUnity.csproj" -- \
+        -batchmode \
+        -projectPath "${PROJECT_DIR}/workers/unity" \
+        -runEditorTests \
+        -logfile "${PROJECT_DIR}/logs/unity-editmode-test-run.log" \
+        -editorTestsResultFile "${EDITMODE_TEST_RESULTS_FILE}" \
+        -editorTestsFilter Fps
+popd

gdk.pinned

@@ -1 +1 @@
-4a4046374963d9555f1da025568dd01502ab9a12
+0674de43bb32efe4abbeaa5a401e3978ea84258d

workers/unity/Assets/Fps/Scripts/SetupLogic/ClientWorkerConnector.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Fps.Connection;
 using Improbable.Gdk.Core;
 using Improbable.Gdk.GameObjectCreation;
 using Improbable.Gdk.PlayerLifecycle;
@@ -173,58 +174,4 @@ private void SendRequest()
                 .RequestPlayerCreation(serializedArgs, onPlayerResponse);
         }
     }
-
-    internal class ChosenDeploymentAlphaLocatorFlow : AlphaLocatorFlow
-    {
-        private readonly string targetDeployment;
-
-        public ChosenDeploymentAlphaLocatorFlow(string targetDeployment,
-            IConnectionFlowInitializer<AlphaLocatorFlow> initializer = null) : base(initializer)
-        {
-            this.targetDeployment = targetDeployment;
-        }
-
-        protected override string SelectLoginToken(List<LoginTokenDetails> loginTokens)
-        {
-            var token = loginTokens.FirstOrDefault(loginToken => loginToken.DeploymentName == targetDeployment);
-
-            return token.LoginToken ?? throw new ArgumentException("Was not able to connect to deployment");
-        }
-    }
-
-    internal class SessionConnectionFlowInitializer : IConnectionFlowInitializer<AlphaLocatorFlow>
-    {
-        private IConnectionFlowInitializer<AlphaLocatorFlow> initializer;
-
-        public SessionConnectionFlowInitializer(IConnectionFlowInitializer<AlphaLocatorFlow> standaloneInitializer)
-        {
-            initializer = standaloneInitializer;
-        }
-
-        public void Initialize(AlphaLocatorFlow flow)
-        {
-            if (Application.isEditor)
-            {
-                if (PlayerPrefs.HasKey(RuntimeConfigNames.DevAuthTokenKey))
-                {
-                    flow.DevAuthToken = PlayerPrefs.GetString(RuntimeConfigNames.DevAuthTokenKey);
-                    return;
-                }
-
-                var textAsset = Resources.Load<TextAsset>("DevAuthToken");
-
-                if (textAsset == null)
-                {
-                    throw new MissingReferenceException("Unable to find DevAuthToken.txt in the Resources folder. " +
-                        "You can generate one via SpatialOS > Generate Dev Authentication Token.");
-                }
-
-                flow.DevAuthToken = textAsset.text;
-            }
-            else
-            {
-                initializer.Initialize(flow);
-            }
-        }
-    }
 }

workers/unity/Assets/Fps/Scripts/SetupLogic/Connection.meta

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Improbable.Gdk.Core;
+using Improbable.Worker.CInterop.Alpha;
+
+namespace Fps.Connection
+{
+    public class ChosenDeploymentAlphaLocatorFlow : AlphaLocatorFlow
+    {
+        private readonly string targetDeployment;
+
+        public ChosenDeploymentAlphaLocatorFlow(string targetDeployment,
+            IConnectionFlowInitializer<AlphaLocatorFlow> initializer = null) : base(initializer)
+        {
+            this.targetDeployment = targetDeployment;
+        }
+
+        protected override string SelectLoginToken(List<LoginTokenDetails> loginTokens)
+        {
+            var token = loginTokens.FirstOrDefault(loginToken => loginToken.DeploymentName == targetDeployment);
+
+            return token.LoginToken ?? throw new ArgumentException("Was not able to connect to deployment");
+        }
+    }
+}

workers/unity/Assets/Fps/Scripts/SetupLogic/Connection/ChosenDeploymentAlphaLocatorFlow.cs

@@ -0,0 +1,41 @@
+using Improbable.Gdk.Core;
+using UnityEngine;
+
+namespace Fps.Connection
+{
+    public class SessionConnectionFlowInitializer : IConnectionFlowInitializer<AlphaLocatorFlow>
+    {
+        private readonly IConnectionFlowInitializer<AlphaLocatorFlow> initializer;
+
+        public SessionConnectionFlowInitializer(IConnectionFlowInitializer<AlphaLocatorFlow> standaloneInitializer)
+        {
+            initializer = standaloneInitializer;
+        }
+
+        public void Initialize(AlphaLocatorFlow flow)
+        {
+            if (Application.isEditor)
+            {
+                if (PlayerPrefs.HasKey(RuntimeConfigNames.DevAuthTokenKey))
+                {
+                    flow.DevAuthToken = PlayerPrefs.GetString(RuntimeConfigNames.DevAuthTokenKey);
+                    return;
+                }
+
+                var textAsset = Resources.Load<TextAsset>("DevAuthToken");
+
+                if (textAsset == null)
+                {
+                    throw new MissingReferenceException("Unable to find DevAuthToken.txt in the Resources folder. " +
+                        "You can generate one via SpatialOS > Generate Dev Authentication Token.");
+                }
+
+                flow.DevAuthToken = textAsset.text;
+            }
+            else
+            {
+                initializer.Initialize(flow);
+            }
+        }
+    }
+}