Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

compiles for 5.5 #20

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

compiles for 5.5 #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Factions/Public/FactionDescriptor.h
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@

#include <Engine/Texture.h>
#include <GenericTeamAgentInterface.h>
#include <InstancedStruct.h>
#include "StructUtils/InstancedStruct.h"

#include "FactionDescriptor.generated.h"

2 changes: 1 addition & 1 deletion Source/Test/Private/Attitudes.spec.cpp
View file
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion ...ce/Test/Private/FactionsExtensionTest.cpp → Source/Test/Private/FactionsTest.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Copyright 2015-2023 Piperift. All Rights Reserved.

#include "FactionsExtensionTest.h"
#include "FactionsTest.h"
2 changes: 1 addition & 1 deletion Source/Test/Private/Registration.spec.cpp
View file
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion Source/Test/Private/TeamId.spec.cpp
View file
Original file line number Diff line number Diff line change
@@ -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;
25 changes: 0 additions & 25 deletions Source/Test/Public/FactionsExtensionTest.h
View file

This file was deleted.

25 changes: 25 additions & 0 deletions Source/Test/Public/FactionsTest.h
View file
Original file line number Diff line number Diff line change
@@ -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<FFactionsTest>("FactionsTest");
}

static inline bool IsAvailable()
{
return FModuleManager::Get().IsModuleLoaded("FactionsTest");
}
};

IMPLEMENT_MODULE(FFactionsTest, FactionsTest);
84 changes: 34 additions & 50 deletions Source/Test/Public/TestHelpers.h
View file
Original file line number Diff line number Diff line change
@@ -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