diff --git a/Source/Factions/Public/FactionDescriptor.h b/Source/Factions/Public/FactionDescriptor.h index d99811a..839f07f 100644 --- a/Source/Factions/Public/FactionDescriptor.h +++ b/Source/Factions/Public/FactionDescriptor.h @@ -6,7 +6,7 @@ #include #include -#include +#include "StructUtils/InstancedStruct.h" #include "FactionDescriptor.generated.h" diff --git a/Source/Test/Private/Attitudes.spec.cpp b/Source/Test/Private/Attitudes.spec.cpp index 330798f..a38419b 100644 --- a/Source/Test/Private/Attitudes.spec.cpp +++ b/Source/Test/Private/Attitudes.spec.cpp @@ -8,7 +8,7 @@ #define BASE_SPEC FFactionsSpec BEGIN_TESTSPEC(FAttitudesSpec, "FactionsExtension.Attitudes", - EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::ProductFilter) + EAutomationTestFlags_ApplicationContextMask | EAutomationTestFlags::ProductFilter) UFactionsSubsystem* Factions = nullptr; FFaction FactionA; FFaction FactionB; diff --git a/Source/Test/Private/FactionsExtensionTest.cpp b/Source/Test/Private/FactionsTest.cpp similarity index 61% rename from Source/Test/Private/FactionsExtensionTest.cpp rename to Source/Test/Private/FactionsTest.cpp index 0a1d8c4..ee1af9e 100644 --- a/Source/Test/Private/FactionsExtensionTest.cpp +++ b/Source/Test/Private/FactionsTest.cpp @@ -1,3 +1,3 @@ // Copyright 2015-2023 Piperift. All Rights Reserved. -#include "FactionsExtensionTest.h" +#include "FactionsTest.h" diff --git a/Source/Test/Private/Registration.spec.cpp b/Source/Test/Private/Registration.spec.cpp index f6084d1..32101f5 100644 --- a/Source/Test/Private/Registration.spec.cpp +++ b/Source/Test/Private/Registration.spec.cpp @@ -8,7 +8,7 @@ #define BASE_SPEC FFactionsSpec BEGIN_TESTSPEC(FFactionRegistrySpec, "FactionsExtension.Registry", - EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::ProductFilter) + EAutomationTestFlags_ApplicationContextMask | EAutomationTestFlags::ProductFilter) UFactionsSubsystem* Factions = nullptr; FFaction FactionA; FFaction FactionB; diff --git a/Source/Test/Private/TeamId.spec.cpp b/Source/Test/Private/TeamId.spec.cpp index 96e6266..0f373e3 100644 --- a/Source/Test/Private/TeamId.spec.cpp +++ b/Source/Test/Private/TeamId.spec.cpp @@ -8,7 +8,7 @@ #define BASE_SPEC FFactionsSpec BEGIN_TESTSPEC(FTeamIdSpec, "FactionsExtension.TeamId", - EAutomationTestFlags::ApplicationContextMask | EAutomationTestFlags::ProductFilter) + EAutomationTestFlags_ApplicationContextMask | EAutomationTestFlags::ProductFilter) UFactionsSubsystem* Factions = nullptr; FFaction FactionA; FFaction FactionB; diff --git a/Source/Test/Public/FactionsExtensionTest.h b/Source/Test/Public/FactionsExtensionTest.h deleted file mode 100644 index 9307213..0000000 --- a/Source/Test/Public/FactionsExtensionTest.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2015-2023 Piperift. All Rights Reserved. - -#pragma once - -#include "Modules/ModuleManager.h" - - -class FFactionsExtensionTest : public IModuleInterface -{ -public: - virtual void StartupModule() override {} - virtual void ShutdownModule() override {} - - static inline FFactionsExtensionTest& Get() - { - return FModuleManager::LoadModuleChecked("FactionsExtensionTest"); - } - - static inline bool IsAvailable() - { - return FModuleManager::Get().IsModuleLoaded("FactionsExtensionTest"); - } -}; - -IMPLEMENT_MODULE(FFactionsExtensionTest, FactionsExtensionTest); diff --git a/Source/Test/Public/FactionsTest.h b/Source/Test/Public/FactionsTest.h new file mode 100644 index 0000000..ae33791 --- /dev/null +++ b/Source/Test/Public/FactionsTest.h @@ -0,0 +1,25 @@ +// Copyright 2015-2023 Piperift. All Rights Reserved. + +#pragma once + +#include "Modules/ModuleManager.h" + + +class FFactionsTest : public IModuleInterface +{ +public: + virtual void StartupModule() override {} + virtual void ShutdownModule() override {} + + static inline FFactionsTest& Get() + { + return FModuleManager::LoadModuleChecked("FactionsTest"); + } + + static inline bool IsAvailable() + { + return FModuleManager::Get().IsModuleLoaded("FactionsTest"); + } +}; + +IMPLEMENT_MODULE(FFactionsTest, FactionsTest); diff --git a/Source/Test/Public/TestHelpers.h b/Source/Test/Public/TestHelpers.h index ec19aed..e40eca1 100644 --- a/Source/Test/Public/TestHelpers.h +++ b/Source/Test/Public/TestHelpers.h @@ -67,66 +67,50 @@ class FFactionsSpec : public FAutomationSpecBase # define BASE_SPEC FFactionsSpec #endif -#define BEGIN_TESTSPEC_PRIVATE(TClass, PrettyName, TFlags, FileName, LineNumber) \ - class TClass : public BASE_SPEC \ - { \ - using Super = BASE_SPEC; \ - \ - public: \ - TClass(const FString& InName) : Super(InName, false) \ - { \ - static_assert((TFlags) &EAutomationTestFlags::ApplicationContextMask, \ - "AutomationTest has no application flag. It shouldn't run. See AutomationTest.h."); \ - static_assert( \ - (((TFlags) &EAutomationTestFlags::FilterMask) == EAutomationTestFlags::SmokeFilter) || \ - (((TFlags) &EAutomationTestFlags::FilterMask) == EAutomationTestFlags::EngineFilter) || \ - (((TFlags) &EAutomationTestFlags::FilterMask) == EAutomationTestFlags::ProductFilter) || \ - (((TFlags) &EAutomationTestFlags::FilterMask) == EAutomationTestFlags::PerfFilter) || \ - (((TFlags) &EAutomationTestFlags::FilterMask) == EAutomationTestFlags::StressFilter) || \ - (((TFlags) &EAutomationTestFlags::FilterMask) == EAutomationTestFlags::NegativeFilter), \ - "All AutomationTests must have exactly 1 filter type specified. See AutomationTest.h."); \ - } \ - virtual uint32 GetTestFlags() const override \ - { \ - return TFlags; \ - } \ - using Super::GetTestSourceFileName; \ - virtual FString GetTestSourceFileName() const override \ - { \ - return FileName; \ - } \ - using Super::GetTestSourceFileLine; \ - virtual int32 GetTestSourceFileLine() const override \ - { \ - return LineNumber; \ - } \ - \ - protected: \ - virtual FString GetBeautifiedTestName() const override \ - { \ - return PrettyName; \ - } \ +#define BEGIN_TESTSPEC_PRIVATE(TClass, PrettyName, TFlags, FileName, LineNumber) \ + class TClass : public BASE_SPEC \ + { \ + using Super = BASE_SPEC; \ + public: \ + TClass(const FString& InName) \ + : Super(InName, false) { \ + static_assert(!!((TFlags) & EAutomationTestFlags_ApplicationContextMask), "AutomationTest has no application flag. It shouldn't run. See AutomationTest.h."); \ + static_assert( !!(((TFlags) & EAutomationTestFlags_FilterMask) == EAutomationTestFlags::SmokeFilter) || \ + !!(((TFlags) & EAutomationTestFlags_FilterMask) == EAutomationTestFlags::EngineFilter) || \ + !!(((TFlags) & EAutomationTestFlags_FilterMask) == EAutomationTestFlags::ProductFilter) || \ + !!(((TFlags) & EAutomationTestFlags_FilterMask) == EAutomationTestFlags::PerfFilter) || \ + !!(((TFlags) & EAutomationTestFlags_FilterMask) == EAutomationTestFlags::StressFilter) || \ + !!(((TFlags) & EAutomationTestFlags_FilterMask) == EAutomationTestFlags::NegativeFilter), \ + "All AutomationTests must have exactly 1 filter type specified. See AutomationTest.h."); \ + } \ + virtual EAutomationTestFlags GetTestFlags() const override { return TFlags; } \ + using Super::GetTestSourceFileName; \ + virtual FString GetTestSourceFileName() const override { return FileName; } \ + using Super::GetTestSourceFileLine; \ + virtual int32 GetTestSourceFileLine() const override { return LineNumber; } \ + protected: \ + virtual FString GetBeautifiedTestName() const override { return PrettyName; } \ virtual void Define() override; #if WITH_AUTOMATION_WORKER -# define TESTSPEC(TClass, PrettyName, TFlags) \ +# define TESTSPEC(TClass, PrettyName, TFlags) \ BEGIN_TESTSPEC_PRIVATE(TClass, PrettyName, TFlags, __FILE__, __LINE__) \ - } \ - ; \ - namespace \ - { \ - TClass TClass##AutomationSpecInstance(TEXT(#TClass)); \ + } \ + ; \ + namespace \ + { \ + TClass TClass##AutomationSpecInstance(TEXT(#TClass)); \ } # define BEGIN_TESTSPEC(TClass, PrettyName, TFlags) \ BEGIN_TESTSPEC_PRIVATE(TClass, PrettyName, TFlags, __FILE__, __LINE__) -# define END_TESTSPEC(TClass) \ - } \ - ; \ - namespace \ - { \ +# define END_TESTSPEC(TClass) \ + } \ + ; \ + namespace \ + { \ TClass TClass##AutomationSpecInstance(TEXT(#TClass)); \ } #endif