Merge pull request #133 from nathalmg/master

Updated GameSettings and fixed tests

Crypto Wars/Assets/Scenes/GameSettings.unity

@@ -156,6 +156,7 @@ RectTransform:
   - {fileID: 1853319218}
   - {fileID: 2093687544}
   - {fileID: 620531436}
+  - {fileID: 1224117506}
   - {fileID: 724148189}
   m_Father: {fileID: 150460279}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -418,7 +419,6 @@ RectTransform:
   - {fileID: 494674735}
   - {fileID: 903953149}
   - {fileID: 1166935057}
-  - {fileID: 1224117506}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1514,7 +1514,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 1166935056}
         m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
         m_MethodName: SetActive
         m_Mode: 6
@@ -1801,7 +1801,7 @@ GameObject:
   - component: {fileID: 724148191}
   - component: {fileID: 724148190}
   m_Layer: 5
-  m_Name: RetMainMenu
+  m_Name: ConfirmSettings
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1822,9 +1822,9 @@ RectTransform:
   - {fileID: 1348711279}
   m_Father: {fileID: 68754812}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -300}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 659.9999, y: -496.9845}
   m_SizeDelta: {x: 500, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &724148190
@@ -2363,6 +2363,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 68754811}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!114 &853015713
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3057,7 +3069,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Button
+  m_text: Return to Main Menu
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -3147,7 +3159,7 @@ GameObject:
   - component: {fileID: 1224117508}
   - component: {fileID: 1224117507}
   m_Layer: 5
-  m_Name: Button
+  m_Name: RetMainMenu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -3166,11 +3178,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1213104307}
-  m_Father: {fileID: 150460279}
+  m_Father: {fileID: 68754812}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -700, y: -800}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -660.00006, y: -496.9845}
   m_SizeDelta: {x: 500, y: 75}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1224117507
@@ -3596,7 +3608,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Return to Main Menu
+  m_text: Start
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -5233,6 +5245,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 68754811}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!114 &1925360425
 MonoBehaviour:
   m_ObjectHideFlags: 0

Crypto Wars/Assets/Scripts/GUI/SettingsMenu.cs

@@ -80,18 +80,19 @@ public void setFourPlayer()
 
 
     // Multiplayer Settings
+    // moved functionality of SetActive to the Inspector due to test failures
     public void hotSeatEnable()
     {
         hotseat = true;
         Debug.Log("Hotseat Enabled");
-        settingsMenu.SetActive(true);
+        //settingsMenu.SetActive(true);
     }
 
     public void hotseatDisable()
     {
         hotseat = false;
         Debug.Log("Hotseat Disabled");
-        settingsMenu.SetActive(true);
+        //settingsMenu.SetActive(true);
     }
 
 

Crypto Wars/Assets/Scripts/Test_PlayMode/SettingsTest.cs

@@ -7,8 +7,17 @@
 
 public class SettingsTest
 {
+    public GameObject go;
     public SettingsMenu settTest;
 
+    [SetUp]
+    public void SetUp()
+    {
+        go = new GameObject();
+        go.AddComponent<SettingsMenu>();
+        settTest = go.GetComponent<SettingsMenu>();
+    }
+
     [Test]
     public void TestPlayerCountSettings()
     {
@@ -53,5 +62,10 @@ public void TestTilePercentageSettings()
         Assert.AreEqual(settTest.getTileWinCondition(), 1f);
     }
 
+    [TearDown]
+    public void TearDown()
+    {
+        Object.DestroyImmediate(go);
+    }
 
 }