From 48025360c2bfe5a56d51edb1b0f5c7b00b0bfff0 Mon Sep 17 00:00:00 2001 From: Steve Vermeulen Date: Mon, 6 Aug 2018 14:57:25 +0800 Subject: [PATCH] Fixes to integration tests to play nicely with the asmdef files --- .../IntegrationTests/Misc/TestZenAutoInjecter/Bar.cs | 6 ++++++ .../Zenject/OptionalExtras/IntegrationTests/Tests.meta | 10 ++++++++++ .../IntegrationTests/Tests/Bindings.meta | 10 ++++++++++ .../Tests/Bindings/TestDiContainerMethods.meta | 10 ++++++++++ .../TestDiContainerMethods/TestDiContainerMethods.cs | 0 .../TestDiContainerMethods.cs.meta | 0 .../Tests/Bindings/TestFromComponent.meta | 10 ++++++++++ .../Bindings/TestFromComponent/TestFromComponentOn.cs | 0 .../TestFromComponent/TestFromComponentOn.cs.meta | 0 .../TestFromComponent/TestFromNewComponentOn.cs | 0 .../TestFromComponent/TestFromNewComponentOn.cs.meta | 0 .../Tests/Bindings/TestFromComponentInChildren.meta | 10 ++++++++++ .../TestFromComponentInChildren.cs | 0 .../TestFromComponentInChildren.cs.meta | 0 .../Tests/Bindings/TestFromComponentInHierarchy.meta | 10 ++++++++++ .../TestFromComponentInHierarchy.cs | 0 .../TestFromComponentInHierarchy.cs.meta | 0 .../TestFromComponentInHierarchyGameObjectContext.meta | 10 ++++++++++ .../TestFromComponentInHierarchyGameObjectContext.cs | 0 ...stFromComponentInHierarchyGameObjectContext.cs.meta | 0 .../Tests/Bindings/TestFromComponentInParents.meta | 10 ++++++++++ .../TestFromComponentInParents.cs | 0 .../TestFromComponentInParents.cs.meta | 0 .../Tests/Bindings/TestFromComponentInSiblings.meta | 10 ++++++++++ .../TestFromComponentInSiblings.cs | 0 .../TestFromComponentInSiblings.cs.meta | 0 .../Tests/Bindings/TestFromGameObject.meta | 10 ++++++++++ .../Bindings/TestFromGameObject/TestFromGameObject.cs | 0 .../TestFromGameObject/TestFromGameObject.cs.meta | 0 .../Bindings/TestFromNewScriptableObjectResource.meta | 10 ++++++++++ .../TestFromNewScriptableObjectResource.cs | 0 .../TestFromNewScriptableObjectResource.cs.meta | 0 .../Tests/Bindings/TestFromPrefab.meta | 10 ++++++++++ .../Bindings/TestFromPrefab/TestFromPrefab.cs | 0 .../Bindings/TestFromPrefab/TestFromPrefab.cs.meta | 0 .../Tests/Bindings/TestFromPrefabInstaller.meta | 10 ++++++++++ .../TestFromPrefabInstaller/TestFromPrefabInstaller.cs | 0 .../TestFromPrefabInstaller.cs.meta | 0 .../Tests/Bindings/TestFromPrefabResource.meta | 10 ++++++++++ .../TestFromPrefabResource/TestFromPrefabResource.cs | 0 .../TestFromPrefabResource.cs.meta | 0 .../Tests/Bindings/TestFromResource.meta | 10 ++++++++++ .../Bindings/TestFromResource/TestFromResource.cs | 0 .../Bindings/TestFromResource/TestFromResource.cs.meta | 0 .../Tests/Bindings/TestFromSiblingComponent.meta | 10 ++++++++++ .../TestFromSiblingComponent.cs | 0 .../TestFromSiblingComponent.cs.meta | 0 .../Tests/Bindings/TestFromSubContainerPrefab.meta | 10 ++++++++++ .../TestFromSubContainerPrefab.cs | 0 .../TestFromSubContainerPrefab.cs.meta | 0 .../Bindings/TestFromSubContainerPrefabResource.meta | 10 ++++++++++ .../TestFromSubContainerPrefabResource.cs | 0 .../TestFromSubContainerPrefabResource.cs.meta | 0 .../IntegrationTests/Tests/Bindings/TestLazy.meta | 10 ++++++++++ .../{ => Tests}/Bindings/TestLazy/TestLazy.cs | 0 .../{ => Tests}/Bindings/TestLazy/TestLazy.cs.meta | 0 .../IntegrationTests/Tests/Factories.meta | 10 ++++++++++ .../Tests/Factories/PrefabFactory.meta | 10 ++++++++++ .../Factories/PrefabFactory/TestPrefabFactory.cs | 0 .../Factories/PrefabFactory/TestPrefabFactory.cs.meta | 0 .../Tests/Factories/TestBindFactory.meta | 10 ++++++++++ .../Factories/TestBindFactory/TestBindFactory.cs | 0 .../Factories/TestBindFactory/TestBindFactory.cs.meta | 0 .../Tests/Factories/TestBindFactoryFive.meta | 10 ++++++++++ .../TestBindFactoryFive/TestBindFactoryFive.cs | 0 .../TestBindFactoryFive/TestBindFactoryFive.cs.meta | 0 .../Tests/Factories/TestBindFactoryOne.meta | 10 ++++++++++ .../Factories/TestBindFactoryOne/TestBindFactoryOne.cs | 0 .../TestBindFactoryOne/TestBindFactoryOne.cs.meta | 0 .../{ => Tests}/Factories/TestMemoryPools.meta | 0 .../Factories/TestMemoryPools/TestMemoryPool1.cs | 0 .../Factories/TestMemoryPools/TestMemoryPool1.cs.meta | 0 .../IntegrationTests/Tests/Installers.meta | 10 ++++++++++ .../Tests/Installers/TestInstallers.meta | 10 ++++++++++ .../Installers/TestInstallers/TestInstallers.cs | 0 .../Installers/TestInstallers/TestInstallers.cs.meta | 0 .../Tests/Installers/TestMonoInstallers.meta | 10 ++++++++++ .../TestMonoInstallers/TestMonoInstallers.cs | 0 .../TestMonoInstallers/TestMonoInstallers.cs.meta | 0 .../Installers/TestScriptableObjectInstallers.meta | 10 ++++++++++ .../TestScriptableObjectInstallers.cs | 0 .../TestScriptableObjectInstallers.cs.meta | 0 .../{ => Tests}/IntegrationTestTester.meta | 5 +++-- .../IntegrationTestTester/TestIntegrationTest.cs | 0 .../IntegrationTestTester/TestIntegrationTest.cs.meta | 0 .../OptionalExtras/IntegrationTests/Tests/Misc.meta | 10 ++++++++++ .../Tests/Misc/TestAnimationStateBehaviourInject.meta | 10 ++++++++++ .../TestAnimationStateBehaviourInject.cs | 0 .../TestAnimationStateBehaviourInject.cs.meta | 0 .../Tests/Misc/TestZenAutoInjecter.meta | 10 ++++++++++ .../Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs | 6 ------ .../TestZenAutoInjecter/TestZenAutoInjecter.cs.meta | 0 .../IntegrationTests/Tests/SceneContractTests.meta | 10 ++++++++++ .../IntegrationTests/Tests/SceneTests.meta | 10 ++++++++++ .../{ => Tests}/SceneTests/SpaceFighterTests.meta | 4 ++-- .../SceneTests/SpaceFighterTests/SpaceFighterTests.cs | 0 .../SpaceFighterTests/SpaceFighterTests.cs.meta | 0 .../SceneTests}/TestSceneContextEvents.cs | 0 .../SceneTests}/TestSceneContextEvents.cs.meta | 4 ++-- .../Tests/Zenject-IntegrationTests-Editor.asmdef | 10 ++++++++++ .../Tests/Zenject-IntegrationTests-Editor.asmdef.meta | 9 +++++++++ .../IntegrationTests/Zenject-IntegrationTests.asmdef | 5 +---- .../Zenject-IntegrationTests.asmdef.meta | 4 ++-- .../Editor/MemoryPool/TestStaticMemoryPool.cs | 7 +++++++ .../Factories/Pooling/Static/StaticMemoryPool.cs | 5 +++++ 105 files changed, 377 insertions(+), 18 deletions(-) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponent/TestFromComponentOn.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponent/TestFromComponentOn.cs.meta (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponent/TestFromNewComponentOn.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponent/TestFromNewComponentOn.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromGameObject/TestFromGameObject.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromGameObject/TestFromGameObject.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromPrefab/TestFromPrefab.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromPrefab/TestFromPrefab.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromResource/TestFromResource.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromResource/TestFromResource.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestLazy/TestLazy.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Bindings/TestLazy/TestLazy.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/PrefabFactory/TestPrefabFactory.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/PrefabFactory/TestPrefabFactory.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestBindFactory/TestBindFactory.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestBindFactory/TestBindFactory.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestBindFactoryFive/TestBindFactoryFive.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestBindFactoryFive/TestBindFactoryFive.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestBindFactoryOne/TestBindFactoryOne.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestBindFactoryOne/TestBindFactoryOne.cs.meta (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestMemoryPools.meta (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestMemoryPools/TestMemoryPool1.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Factories/TestMemoryPools/TestMemoryPool1.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Installers/TestInstallers/TestInstallers.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Installers/TestInstallers/TestInstallers.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Installers/TestMonoInstallers/TestMonoInstallers.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Installers/TestMonoInstallers/TestMonoInstallers.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs.meta (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/IntegrationTestTester.meta (60%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/IntegrationTestTester/TestIntegrationTest.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/IntegrationTestTester/TestIntegrationTest.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs (98%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs.meta (100%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneContractTests.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests.meta rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/SceneTests/SpaceFighterTests.meta (70%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/SceneTests/SpaceFighterTests/SpaceFighterTests.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{ => Tests}/SceneTests/SpaceFighterTests/SpaceFighterTests.cs.meta (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{SceneTests/TestSceneContextEvents/Tests => Tests/SceneTests}/TestSceneContextEvents.cs (100%) rename UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/{SceneTests/TestSceneContextEvents/Tests => Tests/SceneTests}/TestSceneContextEvents.cs.meta (77%) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/Bar.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/Bar.cs index 6847e256a..e757fffac 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/Bar.cs +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/Bar.cs @@ -3,6 +3,12 @@ namespace Zenject.Tests.AutoInjecter { + public class Foo + { + [Inject] + public DiContainer Container; + } + public class Bar : MonoBehaviour { [Inject] diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests.meta new file mode 100644 index 000000000..6c55387a8 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 298f8de97839fb243bb9885dcfb37b43 +folderAsset: yes +timeCreated: 1533537209 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings.meta new file mode 100644 index 000000000..973c6457a --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 712f29884b0173a4193cd48315786df9 +folderAsset: yes +timeCreated: 1533537390 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods.meta new file mode 100644 index 000000000..19529719e --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: bcfe42301470d994596ab617acdc6545 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods/TestDiContainerMethods.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent.meta new file mode 100644 index 000000000..08a5a7a52 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3da0ff226e0beea4d91bdef5be3cc543 +folderAsset: yes +timeCreated: 1533537470 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromComponentOn.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromComponentOn.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromComponentOn.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromComponentOn.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromComponentOn.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromComponentOn.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromComponentOn.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromComponentOn.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromNewComponentOn.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromNewComponentOn.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromNewComponentOn.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromNewComponentOn.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromNewComponentOn.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromNewComponentOn.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponent/TestFromNewComponentOn.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponent/TestFromNewComponentOn.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren.meta new file mode 100644 index 000000000..c0d86ab9e --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b28f74c42a00cce4c966429fc9bf3304 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInChildren/TestFromComponentInChildren.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy.meta new file mode 100644 index 000000000..bcc7de4b9 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 703bae5899505584ea4bd2f89e7c5686 +folderAsset: yes +timeCreated: 1533537470 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext.meta new file mode 100644 index 000000000..37ee0fc04 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b4dba59ca52fc08499490254c3940f59 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext/TestFromComponentInHierarchyGameObjectContext.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents.meta new file mode 100644 index 000000000..234105686 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b12b2bde79e96504980df2b05b948e89 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInParents/TestFromComponentInParents.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings.meta new file mode 100644 index 000000000..6ac632c96 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1f10443fc834f9f4cbd6ce1fd5bce4a3 +folderAsset: yes +timeCreated: 1533537470 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInSiblings/TestFromComponentInSiblings.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject.meta new file mode 100644 index 000000000..ee3ce74aa --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9116904793056a445abaca59d9fd9c91 +folderAsset: yes +timeCreated: 1533537470 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromGameObject/TestFromGameObject.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject/TestFromGameObject.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromGameObject/TestFromGameObject.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject/TestFromGameObject.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromGameObject/TestFromGameObject.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject/TestFromGameObject.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromGameObject/TestFromGameObject.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject/TestFromGameObject.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource.meta new file mode 100644 index 000000000..bb3711e0a --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1584905eb3a75484099619f9e66362b1 +folderAsset: yes +timeCreated: 1533537470 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource/TestFromNewScriptableObjectResource.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab.meta new file mode 100644 index 000000000..bb1d35fbf --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d3728543fde13364396f833fea981d45 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefab/TestFromPrefab.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab/TestFromPrefab.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefab/TestFromPrefab.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab/TestFromPrefab.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefab/TestFromPrefab.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab/TestFromPrefab.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefab/TestFromPrefab.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab/TestFromPrefab.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller.meta new file mode 100644 index 000000000..00961f09e --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 004fb639c2306474c8f8825720e5a9d2 +folderAsset: yes +timeCreated: 1533537470 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller/TestFromPrefabInstaller.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource.meta new file mode 100644 index 000000000..b2e3039bf --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ab61730ee27e0954db743cf10ae967bd +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource/TestFromPrefabResource.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource.meta new file mode 100644 index 000000000..41dec47eb --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 77895b2c18397dd4eb7b086f557cfaa1 +folderAsset: yes +timeCreated: 1533537470 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromResource/TestFromResource.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource/TestFromResource.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromResource/TestFromResource.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource/TestFromResource.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromResource/TestFromResource.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource/TestFromResource.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromResource/TestFromResource.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource/TestFromResource.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent.meta new file mode 100644 index 000000000..3f8b1ee40 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ac3824324711c3f489d292e1b03858b9 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSiblingComponent/TestFromSiblingComponent.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab.meta new file mode 100644 index 000000000..1d3bb26e2 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9ab8e28ca08241e41982482e00de08f0 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab/TestFromSubContainerPrefab.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource.meta new file mode 100644 index 000000000..af17d6630 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ecae311eb84afdb4e812a5c20367cb1e +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource/TestFromSubContainerPrefabResource.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy.meta new file mode 100644 index 000000000..d36ef2129 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f49bebb41c308914d80eebda326f1e17 +folderAsset: yes +timeCreated: 1533537471 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestLazy/TestLazy.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy/TestLazy.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestLazy/TestLazy.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy/TestLazy.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestLazy/TestLazy.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy/TestLazy.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Bindings/TestLazy/TestLazy.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestLazy/TestLazy.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories.meta new file mode 100644 index 000000000..3da085f72 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e5e30fa1ac6a1d1408340b6fb61c9693 +folderAsset: yes +timeCreated: 1533537394 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory.meta new file mode 100644 index 000000000..acda7aebf --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: af8b779557d36924d820d239ab6ee944 +folderAsset: yes +timeCreated: 1476627232 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/PrefabFactory/TestPrefabFactory.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory/TestPrefabFactory.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/PrefabFactory/TestPrefabFactory.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory/TestPrefabFactory.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/PrefabFactory/TestPrefabFactory.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory/TestPrefabFactory.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/PrefabFactory/TestPrefabFactory.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory/TestPrefabFactory.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory.meta new file mode 100644 index 000000000..73d09f96f --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c021ba356ec385d469d715722ac7c4a7 +folderAsset: yes +timeCreated: 1476627237 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactory/TestBindFactory.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory/TestBindFactory.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactory/TestBindFactory.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory/TestBindFactory.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactory/TestBindFactory.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory/TestBindFactory.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactory/TestBindFactory.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory/TestBindFactory.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive.meta new file mode 100644 index 000000000..3fe418311 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 99205e310884d9d4b9039013bf5eaaee +folderAsset: yes +timeCreated: 1476627243 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive/TestBindFactoryFive.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne.meta new file mode 100644 index 000000000..ad7f16e54 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 26299dac98af5b84483bf41c4b2897ca +folderAsset: yes +timeCreated: 1476627250 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne/TestBindFactoryOne.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestMemoryPools.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestMemoryPools.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestMemoryPools.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestMemoryPools.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestMemoryPools/TestMemoryPool1.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestMemoryPools/TestMemoryPool1.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestMemoryPools/TestMemoryPool1.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestMemoryPools/TestMemoryPool1.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestMemoryPools/TestMemoryPool1.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestMemoryPools/TestMemoryPool1.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Factories/TestMemoryPools/TestMemoryPool1.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestMemoryPools/TestMemoryPool1.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers.meta new file mode 100644 index 000000000..929488134 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 12c03aec56b42a246bcd063539109901 +folderAsset: yes +timeCreated: 1533537397 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers.meta new file mode 100644 index 000000000..b811ece08 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: fa8246ebe523f444d8a36e1473a69c9f +folderAsset: yes +timeCreated: 1476629271 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestInstallers/TestInstallers.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers/TestInstallers.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestInstallers/TestInstallers.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers/TestInstallers.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestInstallers/TestInstallers.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers/TestInstallers.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestInstallers/TestInstallers.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers/TestInstallers.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers.meta new file mode 100644 index 000000000..18dc0d0b1 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ce19e0da982ee004ab1ac04ad4ee376a +folderAsset: yes +timeCreated: 1476629271 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestMonoInstallers/TestMonoInstallers.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers/TestMonoInstallers.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestMonoInstallers/TestMonoInstallers.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers/TestMonoInstallers.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestMonoInstallers/TestMonoInstallers.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers/TestMonoInstallers.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestMonoInstallers/TestMonoInstallers.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers/TestMonoInstallers.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers.meta new file mode 100644 index 000000000..a8a7e9f5e --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2668028b00be0f74bb1a41abc9199438 +folderAsset: yes +timeCreated: 1476629271 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers/TestScriptableObjectInstallers.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/IntegrationTestTester.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/IntegrationTestTester.meta similarity index 60% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/IntegrationTestTester.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/IntegrationTestTester.meta index 4b5a2ede6..b17abc6c7 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/IntegrationTestTester.meta +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/IntegrationTestTester.meta @@ -1,9 +1,10 @@ fileFormatVersion: 2 -guid: 5e4cecac9f13dc34bb357515129ac69e +guid: b97ab04110b7d5a4ea3f45c3acf61671 folderAsset: yes -timeCreated: 1506454637 +timeCreated: 1533537796 licenseType: Free DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/IntegrationTestTester/TestIntegrationTest.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/IntegrationTestTester/TestIntegrationTest.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/IntegrationTestTester/TestIntegrationTest.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/IntegrationTestTester/TestIntegrationTest.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/IntegrationTestTester/TestIntegrationTest.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/IntegrationTestTester/TestIntegrationTest.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/IntegrationTestTester/TestIntegrationTest.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/IntegrationTestTester/TestIntegrationTest.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc.meta new file mode 100644 index 000000000..f98a84c33 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4e9bd8259ac41484a89d4c3ded0e11f4 +folderAsset: yes +timeCreated: 1533537402 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject.meta new file mode 100644 index 000000000..52645204f --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b3f01a7aab70acf449c179f9d22e6ff5 +folderAsset: yes +timeCreated: 1527865953 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject/TestAnimationStateBehaviourInject.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter.meta new file mode 100644 index 000000000..29e39e090 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e6a5ac4ad92f5574e8f348463d68fa13 +folderAsset: yes +timeCreated: 1528396585 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs similarity index 98% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs index 61667f12c..30f14c84e 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs @@ -9,12 +9,6 @@ namespace Zenject.Tests.AutoInjecter { - public class Foo - { - [Inject] - public DiContainer Container; - } - #if UNITY_EDITOR public class TestZenAutoInjecter : ZenjectIntegrationTestFixture { diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter/TestZenAutoInjecter.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneContractTests.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneContractTests.meta new file mode 100644 index 000000000..a73b7d7db --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneContractTests.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4336204fd171b8a438551dc8b7a9c1bb +folderAsset: yes +timeCreated: 1533537407 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests.meta new file mode 100644 index 000000000..dff1e9b2f --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3f3dc32955683614bbd38701bbd38e48 +folderAsset: yes +timeCreated: 1533537410 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/SpaceFighterTests.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/SpaceFighterTests.meta similarity index 70% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/SpaceFighterTests.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/SpaceFighterTests.meta index 9cb0b1bd5..221f47d6d 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/SpaceFighterTests.meta +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/SpaceFighterTests.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 23e3157d2be157940be3ec6da1303235 +guid: 7f9141e6f6edfe54d83ba1892f6882ed folderAsset: yes -timeCreated: 1527237595 +timeCreated: 1533537886 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs.meta similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/SpaceFighterTests/SpaceFighterTests.cs.meta diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/TestSceneContextEvents/Tests/TestSceneContextEvents.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/TestSceneContextEvents.cs similarity index 100% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/TestSceneContextEvents/Tests/TestSceneContextEvents.cs rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/TestSceneContextEvents.cs diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/TestSceneContextEvents/Tests/TestSceneContextEvents.cs.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/TestSceneContextEvents.cs.meta similarity index 77% rename from UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/TestSceneContextEvents/Tests/TestSceneContextEvents.cs.meta rename to UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/TestSceneContextEvents.cs.meta index 61ceba690..dc8b4f669 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/SceneTests/TestSceneContextEvents/Tests/TestSceneContextEvents.cs.meta +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/SceneTests/TestSceneContextEvents.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: d925ed1992e09b94c922dd7d8727cc7d -timeCreated: 1527239663 +guid: d86cf7d476433b44a80c483ab6396e27 +timeCreated: 1533537917 licenseType: Free MonoImporter: externalObjects: {} diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef new file mode 100644 index 000000000..e6ef014e0 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef @@ -0,0 +1,10 @@ +{ + "name": "Zenject-IntegrationTests-Editor", + "references": [ + "Zenject-TestFramework", + "Zenject", + "Zenject-IntegrationTests" + ], + "includePlatforms": [], + "excludePlatforms": [] +} \ No newline at end of file diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef.meta new file mode 100644 index 000000000..021d61033 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b4d325adfafa9454b8d5f7d62eca2a8a +timeCreated: 1531969489 +licenseType: Free +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef index 0c8649d2e..851cedcb0 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef @@ -1,11 +1,8 @@ { "name": "Zenject-IntegrationTests", "references": [ - "Zenject-TestFramework", "Zenject" ], - "includePlatforms": [ - "Editor" - ], + "includePlatforms": [], "excludePlatforms": [] } \ No newline at end of file diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef.meta index 021d61033..ee6db53a0 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef.meta +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b4d325adfafa9454b8d5f7d62eca2a8a -timeCreated: 1531969489 +guid: 2845024868d5894408e3dc7b917ca748 +timeCreated: 1533537358 licenseType: Free AssemblyDefinitionImporter: externalObjects: {} diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/UnitTests/Editor/MemoryPool/TestStaticMemoryPool.cs b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/UnitTests/Editor/MemoryPool/TestStaticMemoryPool.cs index 401a00d90..91adc3be5 100644 --- a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/UnitTests/Editor/MemoryPool/TestStaticMemoryPool.cs +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/UnitTests/Editor/MemoryPool/TestStaticMemoryPool.cs @@ -22,6 +22,7 @@ public void RunTest() var pool = Foo.Pool; pool.Clear(); + pool.ClearActiveCount(); Assert.IsEqual(pool.NumActive, 0); Assert.IsEqual(pool.NumInactive, 0); @@ -71,6 +72,9 @@ public void TestListPool() { var pool = ListPool.Instance; + pool.Clear(); + pool.ClearActiveCount(); + Assert.IsEqual(pool.NumActive, 0); Assert.IsEqual(pool.NumInactive, 0); Assert.IsEqual(pool.NumTotal, 0); @@ -123,6 +127,7 @@ public void TestPoolWrapper() var pool = Foo.Pool; pool.Clear(); + pool.ClearActiveCount(); Assert.IsEqual(pool.NumActive, 0); Assert.IsEqual(pool.NumInactive, 0); @@ -146,7 +151,9 @@ public void TestPoolWrapper() public void TestResize() { var pool = Bar.Pool; + pool.Clear(); + pool.ClearActiveCount(); Assert.IsEqual(pool.NumActive, 0); Assert.IsEqual(pool.NumTotal, 0); diff --git a/UnityProject/Assets/Plugins/Zenject/Source/Factories/Pooling/Static/StaticMemoryPool.cs b/UnityProject/Assets/Plugins/Zenject/Source/Factories/Pooling/Static/StaticMemoryPool.cs index 885b86673..b81c04f57 100644 --- a/UnityProject/Assets/Plugins/Zenject/Source/Factories/Pooling/Static/StaticMemoryPool.cs +++ b/UnityProject/Assets/Plugins/Zenject/Source/Factories/Pooling/Static/StaticMemoryPool.cs @@ -65,6 +65,11 @@ public void Dispose() StaticMemoryPoolRegistry.Remove(this); } + public void ClearActiveCount() + { + _activeCount = 0; + } + public void Clear() { Resize(0);