From 1e6beb83f2591b5f758f35f304c9ab458251303d Mon Sep 17 00:00:00 2001 From: Redstone1024 <2824517378@qq.com> Date: Thu, 19 Dec 2024 22:02:13 +0800 Subject: [PATCH] refactor(testing): refactor test code and file to reduce the name collisions --- .../{ContainersTesting.cpp => Containers.cpp} | 24 +++++++------ .../{IteratorTesting.cpp => Iterator.cpp} | 20 ++++++----- .../Testing/{MemoryTesting.cpp => Memory.cpp} | 30 +++++++++------- ...ellaneousTesting.cpp => Miscellaneous.cpp} | 36 ++++++++++--------- .../{NumericTesting.cpp => Numeric.cpp} | 18 ++++++---- .../Testing/{StringTesting.cpp => String.cpp} | 21 ++++++----- .../{TemplatesTesting.cpp => Templates.cpp} | 34 ++++++++++-------- .../{TypeTraitsTesting.cpp => TypeTraits.cpp} | 2 +- .../Source/Public/Testing/ContainersTesting.h | 23 ------------ .../Source/Public/Testing/IteratorTesting.h | 21 ----------- .../Source/Public/Testing/MemoryTesting.h | 27 -------------- .../Source/Public/Testing/NumericTesting.h | 20 ----------- .../Source/Public/Testing/StringTesting.h | 21 ----------- .../Source/Public/Testing/TemplatesTesting.h | 28 --------------- .../{MiscellaneousTesting.h => Testing.h} | 10 ++++-- .../Source/Public/Testing/TypeTraitsTesting.h | 17 --------- 16 files changed, 114 insertions(+), 238 deletions(-) rename Redcraft.Utility/Source/Private/Testing/{ContainersTesting.cpp => Containers.cpp} (98%) rename Redcraft.Utility/Source/Private/Testing/{IteratorTesting.cpp => Iterator.cpp} (94%) rename Redcraft.Utility/Source/Private/Testing/{MemoryTesting.cpp => Memory.cpp} (98%) rename Redcraft.Utility/Source/Private/Testing/{MiscellaneousTesting.cpp => Miscellaneous.cpp} (98%) rename Redcraft.Utility/Source/Private/Testing/{NumericTesting.cpp => Numeric.cpp} (99%) rename Redcraft.Utility/Source/Private/Testing/{StringTesting.cpp => String.cpp} (99%) rename Redcraft.Utility/Source/Private/Testing/{TemplatesTesting.cpp => Templates.cpp} (99%) rename Redcraft.Utility/Source/Private/Testing/{TypeTraitsTesting.cpp => TypeTraits.cpp} (99%) delete mode 100644 Redcraft.Utility/Source/Public/Testing/ContainersTesting.h delete mode 100644 Redcraft.Utility/Source/Public/Testing/IteratorTesting.h delete mode 100644 Redcraft.Utility/Source/Public/Testing/MemoryTesting.h delete mode 100644 Redcraft.Utility/Source/Public/Testing/NumericTesting.h delete mode 100644 Redcraft.Utility/Source/Public/Testing/StringTesting.h delete mode 100644 Redcraft.Utility/Source/Public/Testing/TemplatesTesting.h rename Redcraft.Utility/Source/Public/Testing/{MiscellaneousTesting.h => Testing.h} (51%) delete mode 100644 Redcraft.Utility/Source/Public/Testing/TypeTraitsTesting.h diff --git a/Redcraft.Utility/Source/Private/Testing/ContainersTesting.cpp b/Redcraft.Utility/Source/Private/Testing/Containers.cpp similarity index 98% rename from Redcraft.Utility/Source/Private/Testing/ContainersTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/Containers.cpp index 5868426..88f6167 100644 --- a/Redcraft.Utility/Source/Private/Testing/ContainersTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/Containers.cpp @@ -1,4 +1,4 @@ -#include "Testing/ContainersTesting.h" +#include "Testing/Testing.h" #include "Containers/Containers.h" #include "Miscellaneous/AssertionMacros.h" @@ -11,15 +11,7 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) -void TestContainers() -{ - TestArray(); - TestStaticArray(); - TestArrayView(); - TestBitset(); - TestStaticBitset(); - TestList(); -} +NAMESPACE_PRIVATE_BEGIN NAMESPACE_UNNAMED_BEGIN @@ -603,6 +595,18 @@ void TestList() } } +NAMESPACE_PRIVATE_END + +void TestContainers() +{ + NAMESPACE_PRIVATE::TestArray(); + NAMESPACE_PRIVATE::TestStaticArray(); + NAMESPACE_PRIVATE::TestArrayView(); + NAMESPACE_PRIVATE::TestBitset(); + NAMESPACE_PRIVATE::TestStaticBitset(); + NAMESPACE_PRIVATE::TestList(); +} + NAMESPACE_END(Testing) // ReSharper restore CppInconsistentNaming diff --git a/Redcraft.Utility/Source/Private/Testing/IteratorTesting.cpp b/Redcraft.Utility/Source/Private/Testing/Iterator.cpp similarity index 94% rename from Redcraft.Utility/Source/Private/Testing/IteratorTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/Iterator.cpp index 8772923..4f3a783 100644 --- a/Redcraft.Utility/Source/Private/Testing/IteratorTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/Iterator.cpp @@ -1,4 +1,4 @@ -#include "Testing/IteratorTesting.h" +#include "Testing/Testing.h" #include "Iterator/Iterator.h" #include "Containers/List.h" @@ -10,13 +10,7 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) -void TestIterator() -{ - TestMoveIterator(); - TestReverseIterator(); - TestCountedIterator(); - TestInsertIterator(); -} +NAMESPACE_PRIVATE_BEGIN void TestMoveIterator() { @@ -219,6 +213,16 @@ void TestInsertIterator() } } +NAMESPACE_PRIVATE_END + +void TestIterator() +{ + NAMESPACE_PRIVATE::TestMoveIterator(); + NAMESPACE_PRIVATE::TestReverseIterator(); + NAMESPACE_PRIVATE::TestCountedIterator(); + NAMESPACE_PRIVATE::TestInsertIterator(); +} + NAMESPACE_END(Testing) NAMESPACE_MODULE_END(Utility) diff --git a/Redcraft.Utility/Source/Private/Testing/MemoryTesting.cpp b/Redcraft.Utility/Source/Private/Testing/Memory.cpp similarity index 98% rename from Redcraft.Utility/Source/Private/Testing/MemoryTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/Memory.cpp index 4704754..0f3ca4a 100644 --- a/Redcraft.Utility/Source/Private/Testing/MemoryTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/Memory.cpp @@ -1,4 +1,4 @@ -#include "Testing/MemoryTesting.h" +#include "Testing/Testing.h" #include "Memory/Memory.h" #include "Memory/Alignment.h" @@ -15,18 +15,7 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) -void TestMemory() -{ - TestAddress(); - TestAlignment(); - TestMemoryBuffer(); - TestMemoryMalloc(); - TestMemoryOperator(); - TestPointerTraits(); - TestUniquePointer(); - TestSharedPointer(); - TestInOutPointer(); -} +NAMESPACE_PRIVATE_BEGIN NAMESPACE_UNNAMED_BEGIN @@ -1072,6 +1061,21 @@ void TestInOutPointer() } } +NAMESPACE_PRIVATE_END + +void TestMemory() +{ + NAMESPACE_PRIVATE::TestAddress(); + NAMESPACE_PRIVATE::TestAlignment(); + NAMESPACE_PRIVATE::TestMemoryBuffer(); + NAMESPACE_PRIVATE::TestMemoryMalloc(); + NAMESPACE_PRIVATE::TestMemoryOperator(); + NAMESPACE_PRIVATE::TestPointerTraits(); + NAMESPACE_PRIVATE::TestUniquePointer(); + NAMESPACE_PRIVATE::TestSharedPointer(); + NAMESPACE_PRIVATE::TestInOutPointer(); +} + NAMESPACE_END(Testing) NAMESPACE_MODULE_END(Utility) diff --git a/Redcraft.Utility/Source/Private/Testing/MiscellaneousTesting.cpp b/Redcraft.Utility/Source/Private/Testing/Miscellaneous.cpp similarity index 98% rename from Redcraft.Utility/Source/Private/Testing/MiscellaneousTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/Miscellaneous.cpp index 8dd3c33..dff080b 100644 --- a/Redcraft.Utility/Source/Private/Testing/MiscellaneousTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/Miscellaneous.cpp @@ -1,4 +1,4 @@ -#include "Testing/MiscellaneousTesting.h" +#include "Testing/Testing.h" #include "Miscellaneous/AssertionMacros.h" #include "Miscellaneous/Compare.h" @@ -10,12 +10,7 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) -void TestMiscellaneous() -{ - TestAssertionMacros(); - TestCompare(); - TestVarArgs(); -} +NAMESPACE_PRIVATE_BEGIN NAMESPACE_UNNAMED_BEGIN @@ -127,7 +122,7 @@ void TestCompare() always_check(( 0 <=> 0) == strong_ordering::equivalent); always_check(( 0 <=> 0) == strong_ordering::equal); always_check(( 0 <=> -1) == strong_ordering::greater); - + always_check((-1 <=> 0) < 0); always_check((-1 <=> 0) <= 0); always_check(( 0 <=> 0) <= 0); @@ -148,12 +143,12 @@ void TestCompare() always_check((-1.0 <=> 0.0) == weak_ordering::less); always_check(( 0.0 <=> 0.0) == weak_ordering::equivalent); always_check(( 0.0 <=> -1.0) == weak_ordering::greater); - + always_check((-1.0 <=> 0.0) == strong_ordering::less); always_check(( 0.0 <=> 0.0) == strong_ordering::equivalent); always_check(( 0.0 <=> 0.0) == strong_ordering::equal); always_check(( 0.0 <=> -1.0) == strong_ordering::greater); - + always_check((-1.0 <=> 0.0) < 0); always_check((-1.0 <=> 0.0) <= 0); always_check(( 0.0 <=> 0.0) <= 0); @@ -162,26 +157,26 @@ void TestCompare() always_check(( 0.0 <=> -1.0) >= 0); always_check(( 0.0 <=> -1.0) > 0); always_check((-1.0 <=> 1.0) != 0); - + always_check((FTestPartialOrdering(-1) <=> FTestPartialOrdering( 0)) == partial_ordering::less); always_check((FTestPartialOrdering( 0) <=> FTestPartialOrdering( 0)) == partial_ordering::equivalent); always_check((FTestPartialOrdering( 0) <=> FTestPartialOrdering(-1)) == partial_ordering::greater); always_check((FTestPartialOrdering( 0, true) <=> FTestPartialOrdering( 0, false)) == partial_ordering::unordered); - + always_check((FTestWeakOrdering(-1) <=> FTestWeakOrdering( 0)) == weak_ordering::less); always_check((FTestWeakOrdering( 0) <=> FTestWeakOrdering( 0)) == weak_ordering::equivalent); always_check((FTestWeakOrdering( 0) <=> FTestWeakOrdering(-1)) == weak_ordering::greater); - + always_check((FTestStrongOrdering(-1) <=> FTestStrongOrdering( 0)) == strong_ordering::less); always_check((FTestStrongOrdering( 0) <=> FTestStrongOrdering( 0)) == strong_ordering::equivalent); always_check((FTestStrongOrdering( 0) <=> FTestStrongOrdering( 0)) == strong_ordering::equal); always_check((FTestStrongOrdering( 0) <=> FTestStrongOrdering(-1)) == strong_ordering::greater); - + always_check((FTestPartialOrdering(-1) < FTestPartialOrdering( 0))); always_check((FTestPartialOrdering( 0) == FTestPartialOrdering( 0))); always_check((FTestPartialOrdering( 0) > FTestPartialOrdering(-1))); - + always_check((FTestWeakOrdering(-1) < FTestWeakOrdering( 0))); always_check((FTestWeakOrdering( 0) == FTestWeakOrdering( 0))); always_check((FTestWeakOrdering( 0) > FTestWeakOrdering(-1))); @@ -216,7 +211,7 @@ void TestCompare() always_check(SynthThreeWayCompare(FTestPartialOrdering( 0), FTestPartialOrdering(-1)) == partial_ordering::greater); always_check(SynthThreeWayCompare(FTestPartialOrdering( 0, true), FTestPartialOrdering( 0, false)) == partial_ordering::unordered); - + always_check(SynthThreeWayCompare(FTestSynth(-1), FTestSynth( 0)) == weak_ordering::less); always_check(SynthThreeWayCompare(FTestSynth( 0), FTestSynth( 0)) == weak_ordering::equivalent); always_check(SynthThreeWayCompare(FTestSynth( 0), FTestSynth(-1)) == weak_ordering::greater); @@ -285,6 +280,15 @@ void TestVarArgs() ); } +NAMESPACE_PRIVATE_END + +void TestMiscellaneous() +{ + NAMESPACE_PRIVATE::TestAssertionMacros(); + NAMESPACE_PRIVATE::TestCompare(); + NAMESPACE_PRIVATE::TestVarArgs(); +} + NAMESPACE_END(Testing) NAMESPACE_MODULE_END(Utility) diff --git a/Redcraft.Utility/Source/Private/Testing/NumericTesting.cpp b/Redcraft.Utility/Source/Private/Testing/Numeric.cpp similarity index 99% rename from Redcraft.Utility/Source/Private/Testing/NumericTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/Numeric.cpp index 4b443a2..9e898d7 100644 --- a/Redcraft.Utility/Source/Private/Testing/NumericTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/Numeric.cpp @@ -1,4 +1,4 @@ -#include "Testing/NumericTesting.h" +#include "Testing/Testing.h" #include "Numeric/Numeric.h" #include "Miscellaneous/AssertionMacros.h" @@ -9,12 +9,7 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) -void TestNumeric() -{ - TestLiteral(); - TestBit(); - TestMath(); -} +NAMESPACE_PRIVATE_BEGIN void TestLiteral() { @@ -606,6 +601,15 @@ void TestMath() always_check(static_cast(Math::LerpStable(0, 255, 1.0)) == 255); } +NAMESPACE_PRIVATE_END + +void TestNumeric() +{ + NAMESPACE_PRIVATE::TestLiteral(); + NAMESPACE_PRIVATE::TestBit(); + NAMESPACE_PRIVATE::TestMath(); +} + NAMESPACE_END(Testing) NAMESPACE_MODULE_END(Utility) diff --git a/Redcraft.Utility/Source/Private/Testing/StringTesting.cpp b/Redcraft.Utility/Source/Private/Testing/String.cpp similarity index 99% rename from Redcraft.Utility/Source/Private/Testing/StringTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/String.cpp index b3fca1f..56c6b40 100644 --- a/Redcraft.Utility/Source/Private/Testing/StringTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/String.cpp @@ -1,4 +1,4 @@ -#include "Testing/StringTesting.h" +#include "Testing/Testing.h" #include "String/Char.h" #include "Memory/Memory.h" @@ -13,13 +13,7 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) -void TestString() -{ - TestChar(); - TestStringView(); - TestTemplateString(); - TestStringConversion(); -} +NAMESPACE_PRIVATE_BEGIN void TestChar() { @@ -32,6 +26,7 @@ void TestChar() always_check(CCharType); always_check(CCharType); } + auto Test = [](TInPlaceType) { always_check(TChar::IsASCII(LITERAL(T, '0'))); @@ -625,6 +620,16 @@ void TestStringConversion() Test(InPlaceType); } +NAMESPACE_PRIVATE_END + +void TestString() +{ + NAMESPACE_PRIVATE::TestChar(); + NAMESPACE_PRIVATE::TestStringView(); + NAMESPACE_PRIVATE::TestTemplateString(); + NAMESPACE_PRIVATE::TestStringConversion(); +} + NAMESPACE_END(Testing) NAMESPACE_MODULE_END(Utility) diff --git a/Redcraft.Utility/Source/Private/Testing/TemplatesTesting.cpp b/Redcraft.Utility/Source/Private/Testing/Templates.cpp similarity index 99% rename from Redcraft.Utility/Source/Private/Testing/TemplatesTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/Templates.cpp index 574111c..f42f948 100644 --- a/Redcraft.Utility/Source/Private/Testing/TemplatesTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/Templates.cpp @@ -1,4 +1,4 @@ -#include "Testing/TemplatesTesting.h" +#include "Testing/Testing.h" #include "Miscellaneous/AssertionMacros.h" #include "Miscellaneous/Compare.h" @@ -14,20 +14,7 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) -void TestTemplates() -{ - TestInvoke(); - TestReferenceWrapper(); - TestOptional(); - TestVariant(); - TestAny(); - TestTuple(); - TestFunction(); - TestAtomic(); - TestScopeHelper(); - TestPropagateConst(); - TestMiscTemplates(); -} +NAMESPACE_PRIVATE_BEGIN NAMESPACE_UNNAMED_BEGIN @@ -1621,6 +1608,23 @@ void TestMiscTemplates() } +NAMESPACE_PRIVATE_END + +void TestTemplates() +{ + NAMESPACE_PRIVATE::TestInvoke(); + NAMESPACE_PRIVATE::TestReferenceWrapper(); + NAMESPACE_PRIVATE::TestOptional(); + NAMESPACE_PRIVATE::TestVariant(); + NAMESPACE_PRIVATE::TestAny(); + NAMESPACE_PRIVATE::TestTuple(); + NAMESPACE_PRIVATE::TestFunction(); + NAMESPACE_PRIVATE::TestAtomic(); + NAMESPACE_PRIVATE::TestScopeHelper(); + NAMESPACE_PRIVATE::TestPropagateConst(); + NAMESPACE_PRIVATE::TestMiscTemplates(); +} + NAMESPACE_END(Testing) NAMESPACE_MODULE_END(Utility) diff --git a/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp b/Redcraft.Utility/Source/Private/Testing/TypeTraits.cpp similarity index 99% rename from Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp rename to Redcraft.Utility/Source/Private/Testing/TypeTraits.cpp index 69c5e36..ed15bb0 100644 --- a/Redcraft.Utility/Source/Private/Testing/TypeTraitsTesting.cpp +++ b/Redcraft.Utility/Source/Private/Testing/TypeTraits.cpp @@ -1,4 +1,4 @@ -#include "Testing/TypeTraitsTesting.h" +#include "Testing/Testing.h" #include "Miscellaneous/AssertionMacros.h" #include "TypeTraits/TypeTraits.h" diff --git a/Redcraft.Utility/Source/Public/Testing/ContainersTesting.h b/Redcraft.Utility/Source/Public/Testing/ContainersTesting.h deleted file mode 100644 index afdc249..0000000 --- a/Redcraft.Utility/Source/Public/Testing/ContainersTesting.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "CoreTypes.h" - -NAMESPACE_REDCRAFT_BEGIN -NAMESPACE_MODULE_BEGIN(Redcraft) -NAMESPACE_MODULE_BEGIN(Utility) - -NAMESPACE_BEGIN(Testing) - -REDCRAFTUTILITY_API void TestContainers(); -REDCRAFTUTILITY_API void TestArray(); -REDCRAFTUTILITY_API void TestStaticArray(); -REDCRAFTUTILITY_API void TestArrayView(); -REDCRAFTUTILITY_API void TestBitset(); -REDCRAFTUTILITY_API void TestStaticBitset(); -REDCRAFTUTILITY_API void TestList(); - -NAMESPACE_END(Testing) - -NAMESPACE_MODULE_END(Utility) -NAMESPACE_MODULE_END(Redcraft) -NAMESPACE_REDCRAFT_END diff --git a/Redcraft.Utility/Source/Public/Testing/IteratorTesting.h b/Redcraft.Utility/Source/Public/Testing/IteratorTesting.h deleted file mode 100644 index fd1b411..0000000 --- a/Redcraft.Utility/Source/Public/Testing/IteratorTesting.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "CoreTypes.h" - -NAMESPACE_REDCRAFT_BEGIN -NAMESPACE_MODULE_BEGIN(Redcraft) -NAMESPACE_MODULE_BEGIN(Utility) - -NAMESPACE_BEGIN(Testing) - -REDCRAFTUTILITY_API void TestIterator(); -REDCRAFTUTILITY_API void TestMoveIterator(); -REDCRAFTUTILITY_API void TestReverseIterator(); -REDCRAFTUTILITY_API void TestCountedIterator(); -REDCRAFTUTILITY_API void TestInsertIterator(); - -NAMESPACE_END(Testing) - -NAMESPACE_MODULE_END(Utility) -NAMESPACE_MODULE_END(Redcraft) -NAMESPACE_REDCRAFT_END diff --git a/Redcraft.Utility/Source/Public/Testing/MemoryTesting.h b/Redcraft.Utility/Source/Public/Testing/MemoryTesting.h deleted file mode 100644 index 156a760..0000000 --- a/Redcraft.Utility/Source/Public/Testing/MemoryTesting.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "CoreTypes.h" - -NAMESPACE_REDCRAFT_BEGIN -NAMESPACE_MODULE_BEGIN(Redcraft) -NAMESPACE_MODULE_BEGIN(Utility) - -NAMESPACE_BEGIN(Testing) - -REDCRAFTUTILITY_API void TestMemory(); -REDCRAFTUTILITY_API void TestAddress(); -REDCRAFTUTILITY_API void TestAlignment(); -REDCRAFTUTILITY_API void TestMemoryBuffer(); -REDCRAFTUTILITY_API void TestMemoryMalloc(); -REDCRAFTUTILITY_API void TestMemoryOperator(); -REDCRAFTUTILITY_API void TestPointerTraits(); -REDCRAFTUTILITY_API void TestUniquePointer(); -REDCRAFTUTILITY_API void TestSharedPointer(); -REDCRAFTUTILITY_API void TestObserverPointer(); -REDCRAFTUTILITY_API void TestInOutPointer(); - -NAMESPACE_END(Testing) - -NAMESPACE_MODULE_END(Utility) -NAMESPACE_MODULE_END(Redcraft) -NAMESPACE_REDCRAFT_END diff --git a/Redcraft.Utility/Source/Public/Testing/NumericTesting.h b/Redcraft.Utility/Source/Public/Testing/NumericTesting.h deleted file mode 100644 index a5e349d..0000000 --- a/Redcraft.Utility/Source/Public/Testing/NumericTesting.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "CoreTypes.h" - -NAMESPACE_REDCRAFT_BEGIN -NAMESPACE_MODULE_BEGIN(Redcraft) -NAMESPACE_MODULE_BEGIN(Utility) - -NAMESPACE_BEGIN(Testing) - -REDCRAFTUTILITY_API void TestNumeric(); -REDCRAFTUTILITY_API void TestLiteral(); -REDCRAFTUTILITY_API void TestBit(); -REDCRAFTUTILITY_API void TestMath(); - -NAMESPACE_END(Testing) - -NAMESPACE_MODULE_END(Utility) -NAMESPACE_MODULE_END(Redcraft) -NAMESPACE_REDCRAFT_END diff --git a/Redcraft.Utility/Source/Public/Testing/StringTesting.h b/Redcraft.Utility/Source/Public/Testing/StringTesting.h deleted file mode 100644 index 42af043..0000000 --- a/Redcraft.Utility/Source/Public/Testing/StringTesting.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "CoreTypes.h" - -NAMESPACE_REDCRAFT_BEGIN -NAMESPACE_MODULE_BEGIN(Redcraft) -NAMESPACE_MODULE_BEGIN(Utility) - -NAMESPACE_BEGIN(Testing) - -REDCRAFTUTILITY_API void TestString(); -REDCRAFTUTILITY_API void TestChar(); -REDCRAFTUTILITY_API void TestStringView(); -REDCRAFTUTILITY_API void TestTemplateString(); -REDCRAFTUTILITY_API void TestStringConversion(); - -NAMESPACE_END(Testing) - -NAMESPACE_MODULE_END(Utility) -NAMESPACE_MODULE_END(Redcraft) -NAMESPACE_REDCRAFT_END diff --git a/Redcraft.Utility/Source/Public/Testing/TemplatesTesting.h b/Redcraft.Utility/Source/Public/Testing/TemplatesTesting.h deleted file mode 100644 index 7754f08..0000000 --- a/Redcraft.Utility/Source/Public/Testing/TemplatesTesting.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "CoreTypes.h" - -NAMESPACE_REDCRAFT_BEGIN -NAMESPACE_MODULE_BEGIN(Redcraft) -NAMESPACE_MODULE_BEGIN(Utility) - -NAMESPACE_BEGIN(Testing) - -REDCRAFTUTILITY_API void TestTemplates(); -REDCRAFTUTILITY_API void TestInvoke(); -REDCRAFTUTILITY_API void TestReferenceWrapper(); -REDCRAFTUTILITY_API void TestOptional(); -REDCRAFTUTILITY_API void TestVariant(); -REDCRAFTUTILITY_API void TestAny(); -REDCRAFTUTILITY_API void TestTuple(); -REDCRAFTUTILITY_API void TestFunction(); -REDCRAFTUTILITY_API void TestAtomic(); -REDCRAFTUTILITY_API void TestScopeHelper(); -REDCRAFTUTILITY_API void TestPropagateConst(); -REDCRAFTUTILITY_API void TestMiscTemplates(); - -NAMESPACE_END(Testing) - -NAMESPACE_MODULE_END(Utility) -NAMESPACE_MODULE_END(Redcraft) -NAMESPACE_REDCRAFT_END diff --git a/Redcraft.Utility/Source/Public/Testing/MiscellaneousTesting.h b/Redcraft.Utility/Source/Public/Testing/Testing.h similarity index 51% rename from Redcraft.Utility/Source/Public/Testing/MiscellaneousTesting.h rename to Redcraft.Utility/Source/Public/Testing/Testing.h index e629c4a..2757bc3 100644 --- a/Redcraft.Utility/Source/Public/Testing/MiscellaneousTesting.h +++ b/Redcraft.Utility/Source/Public/Testing/Testing.h @@ -8,10 +8,14 @@ NAMESPACE_MODULE_BEGIN(Utility) NAMESPACE_BEGIN(Testing) +REDCRAFTUTILITY_API void TestTypeTraits(); +REDCRAFTUTILITY_API void TestTemplates(); +REDCRAFTUTILITY_API void TestNumeric(); +REDCRAFTUTILITY_API void TestIterator(); +REDCRAFTUTILITY_API void TestMemory(); +REDCRAFTUTILITY_API void TestContainers(); +REDCRAFTUTILITY_API void TestString(); REDCRAFTUTILITY_API void TestMiscellaneous(); -REDCRAFTUTILITY_API void TestAssertionMacros(); -REDCRAFTUTILITY_API void TestCompare(); -REDCRAFTUTILITY_API void TestVarArgs(); NAMESPACE_END(Testing) diff --git a/Redcraft.Utility/Source/Public/Testing/TypeTraitsTesting.h b/Redcraft.Utility/Source/Public/Testing/TypeTraitsTesting.h deleted file mode 100644 index e8957ab..0000000 --- a/Redcraft.Utility/Source/Public/Testing/TypeTraitsTesting.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "CoreTypes.h" - -NAMESPACE_REDCRAFT_BEGIN -NAMESPACE_MODULE_BEGIN(Redcraft) -NAMESPACE_MODULE_BEGIN(Utility) - -NAMESPACE_BEGIN(Testing) - -REDCRAFTUTILITY_API void TestTypeTraits(); - -NAMESPACE_END(Testing) - -NAMESPACE_MODULE_END(Utility) -NAMESPACE_MODULE_END(Redcraft) -NAMESPACE_REDCRAFT_END