From 1483f9b9ab190d8d5ae12fe30c67ed58de621dde Mon Sep 17 00:00:00 2001 From: Florian Glawogger Date: Wed, 7 Feb 2024 13:44:48 +0100 Subject: [PATCH] Remove Network tests --- .../scenes/laboratory/Laboratory.pc.unity | 38 ++++++++++++++----- .../PcMenuTests/PauseMenuLanguageTests.cs | 30 --------------- 2 files changed, 29 insertions(+), 39 deletions(-) diff --git a/unity/Assets/Maroon/scenes/laboratory/Laboratory.pc.unity b/unity/Assets/Maroon/scenes/laboratory/Laboratory.pc.unity index 2c2c7970a..750b611fa 100644 --- a/unity/Assets/Maroon/scenes/laboratory/Laboratory.pc.unity +++ b/unity/Assets/Maroon/scenes/laboratory/Laboratory.pc.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 382309152} - m_IndirectSpecularColor: {r: 0.4234474, g: 0.3429849, b: 0.23095757, a: 1} + m_IndirectSpecularColor: {r: 0.4234487, g: 0.34298646, b: 0.2309569, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -130,7 +130,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 3 + serializedVersion: 4 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 @@ -143,7 +143,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 2 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -184,6 +184,7 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 --- !u!1 &261083889 GameObject: m_ObjectHideFlags: 0 @@ -210,6 +211,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -251,6 +253,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.77570814, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117766056} m_RootOrder: 0 @@ -262,7 +265,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &406402570 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 95087769124319940, guid: c702bd809945e8641ba7a9c46d2e539c, type: 3} @@ -276,10 +279,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &406402571 MonoBehaviour: m_ObjectHideFlags: 0 @@ -349,6 +354,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1117766056} m_Father: {fileID: 851681030} @@ -405,6 +411,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.13605443, z: 0.7105437} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 851253297} - {fileID: 1077125156} @@ -419,7 +426,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &472427244 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 95274848114540456, guid: c702bd809945e8641ba7a9c46d2e539c, type: 3} @@ -433,10 +440,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &564750688 GameObject: m_ObjectHideFlags: 0 @@ -463,6 +472,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -482,12 +492,12 @@ PrefabInstance: - target: {fileID: 9079110210785623905, guid: fe0a30be743451540982d538c670799e, type: 3} propertyPath: _currentLanguage - value: 15 + value: 10 objectReference: {fileID: 0} - target: {fileID: 9079110210785623905, guid: fe0a30be743451540982d538c670799e, type: 3} propertyPath: _mlgFiles.Array.size - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 9079110210785623905, guid: fe0a30be743451540982d538c670799e, type: 3} @@ -597,6 +607,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 472427243} m_RootOrder: 0 @@ -741,6 +752,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 456740069} m_Father: {fileID: 0} @@ -779,6 +791,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1465274901} m_RootOrder: 2 @@ -913,6 +926,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000031, y: 1.0000031, z: 1.0000031} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 472427243} m_RootOrder: 1 @@ -1123,6 +1137,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1.47, z: 1.407373} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 406402569} - {fileID: 1163306042} @@ -1224,6 +1239,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.77570814, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1117766056} m_RootOrder: 1 @@ -1326,6 +1342,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 12 @@ -1356,6 +1373,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -3641,6 +3659,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -3675,6 +3694,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0000031, y: 1.0000031, z: 1.0000031} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 472427243} m_RootOrder: 2 diff --git a/unity/Assets/Tests/PlayModeTests/PcMenuTests/PauseMenuLanguageTests.cs b/unity/Assets/Tests/PlayModeTests/PcMenuTests/PauseMenuLanguageTests.cs index 3caa24b01..5f3b55239 100644 --- a/unity/Assets/Tests/PlayModeTests/PcMenuTests/PauseMenuLanguageTests.cs +++ b/unity/Assets/Tests/PlayModeTests/PcMenuTests/PauseMenuLanguageTests.cs @@ -34,7 +34,6 @@ public IEnumerator WhenSelectGermanLanguageThenLanguageManagerIsGerman() private static TestCaseData[] _pauseMenuButtonKeysSource = new [] { new TestCaseData("Menu Audio").Returns(null), new TestCaseData("Menu Language").Returns(null), - new TestCaseData("Menu Network").Returns(null), new TestCaseData("Menu Main Menu").Returns(null), new TestCaseData("Menu Resume").Returns(null) }; @@ -76,7 +75,6 @@ public IEnumerator WhenSelectGermanLanguageThenPauseMenuTitleIsGerman() private static TestCaseData[] _checkSubMenuTitlesSource = new [] { new TestCaseData("Menu Audio", "preMenuColumnAudio").Returns(null), new TestCaseData("Menu Language", "preMenuColumnLanguage").Returns(null), - new TestCaseData("Menu Network", "preMenuColumnNetwork").Returns(null) }; [UnityTest, Order(4), TestCaseSource(nameof(_checkSubMenuTitlesSource)), @@ -148,33 +146,5 @@ public IEnumerator WhenSelectGermanLanguageThenLanguageSubMenuIsGerman() Assert.AreEqual(expectedEnglishButtonLabel, actualEnglishButtonLabel, $"English Language Button label is wrong after changing language to {ExpectedLanguage}"); } - - [UnityTest, Order(7), Description("On selecting a new language in the Pause Menu, the Network sub menu's labels match")] - public IEnumerator WhenSelectGermanLanguageThenNetworkSubMenuIsGerman() - { - yield return OpenLanguageSubMenu(); - yield return ClickGermanLanguageButton(); - - // Find and click Pause Menu Network button - string networkButtonLabel = LanguageManager.Instance.GetString("Menu Network", ExpectedLanguage); - GetButtonViaTextLabel(networkButtonLabel).onClick.Invoke(); - yield return null; - - var expectedJoinButtonLabel = LanguageManager.Instance.GetString("Menu Join Server", ExpectedLanguage); - var expectedHostButtonLabel = LanguageManager.Instance.GetString("Menu Host Server", ExpectedLanguage); - - // Find Network Menu's Join and Host Server buttons - Button joinButton = GetButtonViaTextLabel(expectedJoinButtonLabel); - Button hostButton = GetButtonViaTextLabel(expectedHostButtonLabel); - - // Get translated text labels from Buttons - var actualJoinButtonLabel = joinButton.GetComponentInChildren().text; - var actualHostButtonLabel = hostButton.GetComponentInChildren().text; - - Assert.AreEqual(expectedJoinButtonLabel, actualJoinButtonLabel, - $"Join Server Button label is wrong after changing language to {ExpectedLanguage}"); - Assert.AreEqual(expectedHostButtonLabel, actualHostButtonLabel, - $"Host Server Button label is wrong after changing language to {ExpectedLanguage}"); - } } }