diff --git a/Assets/Scripts/Tests/Asset Audit.meta b/Assets/Scripts/Tests/Asset Audit.meta deleted file mode 100644 index 48be54f7a0..0000000000 --- a/Assets/Scripts/Tests/Asset Audit.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fd1416804fd837343b21146f242fb105 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset b/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset deleted file mode 100644 index 40f118ed5b..0000000000 --- a/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset.meta b/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset.meta deleted file mode 100644 index 4b267088fd..0000000000 --- a/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 34052a794c8206d4c8f613c0b584d60b -RuleSetFileImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Tests/Asset Audit/AssetAuditUtilities.cs b/Assets/Scripts/Tests/AssetAudit/AssetAuditUtilities.cs similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/AssetAuditUtilities.cs rename to Assets/Scripts/Tests/AssetAudit/AssetAuditUtilities.cs diff --git a/Assets/Scripts/Tests/Asset Audit/AssetAuditUtilities.cs.meta b/Assets/Scripts/Tests/AssetAudit/AssetAuditUtilities.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/AssetAuditUtilities.cs.meta rename to Assets/Scripts/Tests/AssetAudit/AssetAuditUtilities.cs.meta diff --git a/Assets/Scripts/Tests/Asset Audit/AssetDataTests.cs b/Assets/Scripts/Tests/AssetAudit/AssetDataTests.cs similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/AssetDataTests.cs rename to Assets/Scripts/Tests/AssetAudit/AssetDataTests.cs diff --git a/Assets/Scripts/Tests/Asset Audit/AssetDataTests.cs.meta b/Assets/Scripts/Tests/AssetAudit/AssetDataTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/AssetDataTests.cs.meta rename to Assets/Scripts/Tests/AssetAudit/AssetDataTests.cs.meta diff --git a/Assets/Scripts/Tests/Asset Audit/PrefabTests.cs b/Assets/Scripts/Tests/AssetAudit/PrefabTests.cs similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/PrefabTests.cs rename to Assets/Scripts/Tests/AssetAudit/PrefabTests.cs diff --git a/Assets/Scripts/Tests/Asset Audit/PrefabTests.cs.meta b/Assets/Scripts/Tests/AssetAudit/PrefabTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/PrefabTests.cs.meta rename to Assets/Scripts/Tests/AssetAudit/PrefabTests.cs.meta diff --git a/Assets/Scripts/Tests/Asset Audit/SS3D.Tests.EditMode.asmdef b/Assets/Scripts/Tests/AssetAudit/SS3D.Tests.EditMode.asmdef similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/SS3D.Tests.EditMode.asmdef rename to Assets/Scripts/Tests/AssetAudit/SS3D.Tests.EditMode.asmdef diff --git a/Assets/Scripts/Tests/Asset Audit/SS3D.Tests.EditMode.asmdef.meta b/Assets/Scripts/Tests/AssetAudit/SS3D.Tests.EditMode.asmdef.meta similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/SS3D.Tests.EditMode.asmdef.meta rename to Assets/Scripts/Tests/AssetAudit/SS3D.Tests.EditMode.asmdef.meta diff --git a/Assets/Scripts/Tests/AssetAudit/SS3DRules.ruleset b/Assets/Scripts/Tests/AssetAudit/SS3DRules.ruleset index 2756c95594..40f118ed5b 100644 --- a/Assets/Scripts/Tests/AssetAudit/SS3DRules.ruleset +++ b/Assets/Scripts/Tests/AssetAudit/SS3DRules.ruleset @@ -1,261 +1,280 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Scripts/Tests/Asset Audit/SceneTests.cs b/Assets/Scripts/Tests/AssetAudit/SceneTests.cs similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/SceneTests.cs rename to Assets/Scripts/Tests/AssetAudit/SceneTests.cs diff --git a/Assets/Scripts/Tests/Asset Audit/SceneTests.cs.meta b/Assets/Scripts/Tests/AssetAudit/SceneTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/SceneTests.cs.meta rename to Assets/Scripts/Tests/AssetAudit/SceneTests.cs.meta diff --git a/Assets/Scripts/Tests/Asset Audit/TileMapTests.cs b/Assets/Scripts/Tests/AssetAudit/TileMapTests.cs similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/TileMapTests.cs rename to Assets/Scripts/Tests/AssetAudit/TileMapTests.cs diff --git a/Assets/Scripts/Tests/Asset Audit/TileMapTests.cs.meta b/Assets/Scripts/Tests/AssetAudit/TileMapTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Asset Audit/TileMapTests.cs.meta rename to Assets/Scripts/Tests/AssetAudit/TileMapTests.cs.meta diff --git a/Assets/Scripts/Tests/Edit Mode.meta b/Assets/Scripts/Tests/Edit Mode.meta deleted file mode 100644 index ab661373a4..0000000000 --- a/Assets/Scripts/Tests/Edit Mode.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ae43e4dc14a0ac54bab2ece482a6f04f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Tests/Edit Mode/SS3DRules.ruleset b/Assets/Scripts/Tests/Edit Mode/SS3DRules.ruleset deleted file mode 100644 index 40f118ed5b..0000000000 --- a/Assets/Scripts/Tests/Edit Mode/SS3DRules.ruleset +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Scripts/Tests/Edit Mode/SS3DRules.ruleset.meta b/Assets/Scripts/Tests/Edit Mode/SS3DRules.ruleset.meta deleted file mode 100644 index 995d862708..0000000000 --- a/Assets/Scripts/Tests/Edit Mode/SS3DRules.ruleset.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 39de2bdeeb6051a4b98d01ae73735a0e -RuleSetFileImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Tests/EditMode.meta b/Assets/Scripts/Tests/EditMode.meta index b3a32c9d6d..ab661373a4 100644 --- a/Assets/Scripts/Tests/EditMode.meta +++ b/Assets/Scripts/Tests/EditMode.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Scripts/SS3D/Application.meta -guid: 39d8a54cf665feb499ef77251b3b7ce5 -======== -guid: 3958892eecab2dc4bb25cae8722d4443 ->>>>>>>> 38d64305 (Revert code changes and add code linting back):Assets/Scripts/Tests/EditMode.meta +guid: ae43e4dc14a0ac54bab2ece482a6f04f folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Tests/Edit Mode/ContainerTests.cs b/Assets/Scripts/Tests/EditMode/ContainerTests.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/ContainerTests.cs rename to Assets/Scripts/Tests/EditMode/ContainerTests.cs diff --git a/Assets/Scripts/Tests/Edit Mode/ContainerTests.cs.meta b/Assets/Scripts/Tests/EditMode/ContainerTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/ContainerTests.cs.meta rename to Assets/Scripts/Tests/EditMode/ContainerTests.cs.meta diff --git a/Assets/Scripts/Tests/EditMode/ElectricityTests/CircuitTests.cs b/Assets/Scripts/Tests/EditMode/ElectricityTests/CircuitTests.cs index 0d1f6f09dc..8f30e3aba4 100644 --- a/Assets/Scripts/Tests/EditMode/ElectricityTests/CircuitTests.cs +++ b/Assets/Scripts/Tests/EditMode/ElectricityTests/CircuitTests.cs @@ -1,11 +1,8 @@ using NUnit.Framework; -using SS3D.Systems.Inventory.Containers; using SS3D.Systems.Tile; -using System.Collections; using System.Collections.Generic; using System.Electricity; using System.Linq; -using System.Reflection.Emit; using UnityEngine; namespace EditorTests @@ -13,9 +10,9 @@ namespace EditorTests public class CircuitTests { private const float Tolerance = 0.0000001f; - + /// - /// Check if batteries charge at equal rate, given they're not full. If they're close to be full, + /// Check if batteries charge at equal rate, given they're not full. If they're close to be full, /// check that they're provided with the amount needed to fill them fully, instead of the equal rate. /// [Test] diff --git a/Assets/Scripts/Tests/Edit Mode/GamemodeTests.cs b/Assets/Scripts/Tests/EditMode/GamemodeTests.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/GamemodeTests.cs rename to Assets/Scripts/Tests/EditMode/GamemodeTests.cs diff --git a/Assets/Scripts/Tests/Edit Mode/GamemodeTests.cs.meta b/Assets/Scripts/Tests/EditMode/GamemodeTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/GamemodeTests.cs.meta rename to Assets/Scripts/Tests/EditMode/GamemodeTests.cs.meta diff --git a/Assets/Scripts/Tests/Edit Mode/HealthTests.cs b/Assets/Scripts/Tests/EditMode/HealthTests.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/HealthTests.cs rename to Assets/Scripts/Tests/EditMode/HealthTests.cs diff --git a/Assets/Scripts/Tests/Edit Mode/HealthTests.cs.meta b/Assets/Scripts/Tests/EditMode/HealthTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/HealthTests.cs.meta rename to Assets/Scripts/Tests/EditMode/HealthTests.cs.meta diff --git a/Assets/Scripts/Tests/Edit Mode/ItemTests.cs b/Assets/Scripts/Tests/EditMode/ItemTests.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/ItemTests.cs rename to Assets/Scripts/Tests/EditMode/ItemTests.cs diff --git a/Assets/Scripts/Tests/Edit Mode/ItemTests.cs.meta b/Assets/Scripts/Tests/EditMode/ItemTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/ItemTests.cs.meta rename to Assets/Scripts/Tests/EditMode/ItemTests.cs.meta diff --git a/Assets/Scripts/Tests/Edit Mode/LogTests.cs b/Assets/Scripts/Tests/EditMode/LogTests.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/LogTests.cs rename to Assets/Scripts/Tests/EditMode/LogTests.cs diff --git a/Assets/Scripts/Tests/Edit Mode/LogTests.cs.meta b/Assets/Scripts/Tests/EditMode/LogTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/LogTests.cs.meta rename to Assets/Scripts/Tests/EditMode/LogTests.cs.meta diff --git a/Assets/Scripts/Tests/Edit Mode/SS3D.Tests.EditMode.asmdef b/Assets/Scripts/Tests/EditMode/SS3D.Tests.EditMode.asmdef similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/SS3D.Tests.EditMode.asmdef rename to Assets/Scripts/Tests/EditMode/SS3D.Tests.EditMode.asmdef diff --git a/Assets/Scripts/Tests/Edit Mode/SS3D.Tests.EditMode.asmdef.meta b/Assets/Scripts/Tests/EditMode/SS3D.Tests.EditMode.asmdef.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/SS3D.Tests.EditMode.asmdef.meta rename to Assets/Scripts/Tests/EditMode/SS3D.Tests.EditMode.asmdef.meta diff --git a/Assets/Scripts/Tests/EditMode/SS3DRules.ruleset b/Assets/Scripts/Tests/EditMode/SS3DRules.ruleset index 2756c95594..40f118ed5b 100644 --- a/Assets/Scripts/Tests/EditMode/SS3DRules.ruleset +++ b/Assets/Scripts/Tests/EditMode/SS3DRules.ruleset @@ -1,261 +1,280 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Scripts/Tests/Edit Mode/SelectionTests.cs b/Assets/Scripts/Tests/EditMode/SelectionTests.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/SelectionTests.cs rename to Assets/Scripts/Tests/EditMode/SelectionTests.cs diff --git a/Assets/Scripts/Tests/Edit Mode/SelectionTests.cs.meta b/Assets/Scripts/Tests/EditMode/SelectionTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/SelectionTests.cs.meta rename to Assets/Scripts/Tests/EditMode/SelectionTests.cs.meta diff --git a/Assets/Scripts/Tests/Edit Mode/SetUpTest.cs b/Assets/Scripts/Tests/EditMode/SetUpTest.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/SetUpTest.cs rename to Assets/Scripts/Tests/EditMode/SetUpTest.cs diff --git a/Assets/Scripts/Tests/Edit Mode/SetUpTest.cs.meta b/Assets/Scripts/Tests/EditMode/SetUpTest.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/SetUpTest.cs.meta rename to Assets/Scripts/Tests/EditMode/SetUpTest.cs.meta diff --git a/Assets/Scripts/Tests/Edit Mode/SubstanceContainerTests.cs.meta b/Assets/Scripts/Tests/EditMode/SubstanceContainerTests.cs.meta similarity index 83% rename from Assets/Scripts/Tests/Edit Mode/SubstanceContainerTests.cs.meta rename to Assets/Scripts/Tests/EditMode/SubstanceContainerTests.cs.meta index 7c8f41ae97..f02a2f7de5 100644 --- a/Assets/Scripts/Tests/Edit Mode/SubstanceContainerTests.cs.meta +++ b/Assets/Scripts/Tests/EditMode/SubstanceContainerTests.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da58aa05f783b5d4485aeb4182a7d7db +guid: 7b88a263d58f877469617675705eea37 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Tests/Edit Mode/TileMapTests.cs b/Assets/Scripts/Tests/EditMode/TileMapTests.cs similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/TileMapTests.cs rename to Assets/Scripts/Tests/EditMode/TileMapTests.cs diff --git a/Assets/Scripts/Tests/Edit Mode/TileMapTests.cs.meta b/Assets/Scripts/Tests/EditMode/TileMapTests.cs.meta similarity index 100% rename from Assets/Scripts/Tests/Edit Mode/TileMapTests.cs.meta rename to Assets/Scripts/Tests/EditMode/TileMapTests.cs.meta diff --git a/Packages/manifest.json b/Packages/manifest.json index 31882a2346..0b4d8e9417 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -11,7 +11,7 @@ "com.unity.inputsystem": "1.4.4", "com.unity.postprocessing": "3.2.2", "com.unity.shadergraph": "12.1.8", - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.toolchain.linux-x86_64": "2.0.2", "com.unity.ugui": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index bce60e7a17..ee0701b904 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -188,7 +188,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 74d31900b0..4532827aa4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -148,7 +148,6 @@ PlayerSettings: - {fileID: 11400000, guid: 3c59f55e6898e694083e7a1ede49fe18, type: 2} - {fileID: 11400000, guid: 2024dd0c65f45424f98ac0c8a6979181, type: 2} - {fileID: 11400000, guid: 97967903e9bd51b499aaa39639cc9bb2, type: 2} - - {fileID: 11400000, guid: f7e904ef16adea74c9689e8d0b84422d, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1