mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-02 13:01:27 +12:00
tests: Fix failing test and improve msvc setup
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ubuntu-24.04 gcc (push) Waiting to run
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm clang (push) Waiting to run
Build RPCS3 / RPCS3 Linux ubuntu-24.04 clang (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ubuntu-24.04 gcc (push) Waiting to run
Build RPCS3 / RPCS3 Linux ubuntu-24.04-arm clang (push) Waiting to run
Build RPCS3 / RPCS3 Linux ubuntu-24.04 clang (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
This commit is contained in:
parent
947c6ec3e1
commit
b25276deec
4 changed files with 176 additions and 147 deletions
|
@ -201,6 +201,7 @@ elseif(BUILD_RPCS3_TESTS)
|
|||
PRIVATE
|
||||
tests/test.cpp
|
||||
tests/test_fmt.cpp
|
||||
tests/test_simple_array.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(rpcs3_test
|
||||
|
|
|
@ -23,9 +23,9 @@ namespace rsx
|
|||
Ty* _data = _local_capacity ? reinterpret_cast<Ty*>(_local_storage) : nullptr;
|
||||
u32 _size = 0;
|
||||
|
||||
inline u64 offset(const_iterator pos)
|
||||
inline u32 offset(const_iterator pos)
|
||||
{
|
||||
return (_data) ? u64(pos - _data) : 0ull;
|
||||
return (_data) ? u32(pos - _data) : 0u;
|
||||
}
|
||||
|
||||
bool is_local_storage() const
|
||||
|
|
|
@ -88,6 +88,7 @@
|
|||
<ItemGroup>
|
||||
<ClCompile Include="test.cpp" />
|
||||
<ClCompile Include="test_fmt.cpp" />
|
||||
<ClCompile Include="test_simple_array.cpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets" Condition="'$(GTestInstalled)' == 'true'">
|
||||
|
@ -100,4 +101,4 @@
|
|||
</PropertyGroup>
|
||||
<Warning Condition="!Exists('$(GTestPath)')" Text="$([System.String]::Format('$(ErrorText)', '$(GTestPath)'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
@ -1,165 +1,192 @@
|
|||
#include <gtest/gtest.h>
|
||||
|
||||
#define private public
|
||||
#include "Emu/RSX/Common/simple_array.hpp"
|
||||
#undef private
|
||||
|
||||
using namespace rsx;
|
||||
|
||||
TEST(SimpleArray, DefaultConstructor)
|
||||
namespace rsx
|
||||
{
|
||||
simple_array<int> arr;
|
||||
EXPECT_TRUE(arr.empty());
|
||||
EXPECT_EQ(arr.size(), 0);
|
||||
EXPECT_GE(arr.capacity(), 1);
|
||||
}
|
||||
TEST(SimpleArray, DefaultConstructor)
|
||||
{
|
||||
rsx::simple_array<int> arr;
|
||||
|
||||
TEST(SimpleArray, InitialSizeConstructor)
|
||||
{
|
||||
simple_array<int> arr(5);
|
||||
EXPECT_FALSE(arr.empty());
|
||||
EXPECT_EQ(arr.size(), 5);
|
||||
EXPECT_GE(arr.capacity(), 5);
|
||||
}
|
||||
EXPECT_TRUE(arr.empty());
|
||||
EXPECT_EQ(arr.size(), 0);
|
||||
EXPECT_GE(arr.capacity(), 1u);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, InitialSizeValueConstructor)
|
||||
{
|
||||
simple_array<int> arr(3, 42);
|
||||
EXPECT_EQ(arr.size(), 3);
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
EXPECT_EQ(arr[i], 42);
|
||||
}
|
||||
}
|
||||
TEST(SimpleArray, InitialSizeConstructor)
|
||||
{
|
||||
rsx::simple_array<int> arr(5);
|
||||
|
||||
TEST(SimpleArray, InitializerListConstructor)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3, 4, 5};
|
||||
EXPECT_EQ(arr.size(), 5);
|
||||
for (int i = 0; i < 5; ++i) {
|
||||
EXPECT_EQ(arr[i], i + 1);
|
||||
}
|
||||
}
|
||||
EXPECT_FALSE(arr.empty());
|
||||
EXPECT_EQ(arr.size(), 5);
|
||||
EXPECT_GE(arr.capacity(), 5u);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, CopyConstructor)
|
||||
{
|
||||
simple_array<int> arr1{1, 2, 3};
|
||||
simple_array<int> arr2(arr1);
|
||||
EXPECT_EQ(arr1.size(), arr2.size());
|
||||
for (u32 i = 0; i < arr1.size(); ++i) {
|
||||
EXPECT_EQ(arr1[i], arr2[i]);
|
||||
}
|
||||
}
|
||||
TEST(SimpleArray, InitialSizeValueConstructor)
|
||||
{
|
||||
rsx::simple_array<int> arr(3, 42);
|
||||
|
||||
TEST(SimpleArray, MoveConstructor)
|
||||
{
|
||||
simple_array<int> arr1{1, 2, 3};
|
||||
u32 original_size = arr1.size();
|
||||
simple_array<int> arr2(std::move(arr1));
|
||||
EXPECT_EQ(arr2.size(), original_size);
|
||||
EXPECT_TRUE(arr1.empty());
|
||||
}
|
||||
EXPECT_EQ(arr.size(), 3);
|
||||
for (int i = 0; i < 3; ++i)
|
||||
{
|
||||
EXPECT_EQ(arr[i], 42);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(SimpleArray, PushBackAndAccess)
|
||||
{
|
||||
simple_array<int> arr;
|
||||
arr.push_back(1);
|
||||
arr.push_back(2);
|
||||
arr.push_back(3);
|
||||
|
||||
EXPECT_EQ(arr.size(), 3);
|
||||
EXPECT_EQ(arr[0], 1);
|
||||
EXPECT_EQ(arr[1], 2);
|
||||
EXPECT_EQ(arr[2], 3);
|
||||
EXPECT_EQ(arr.front(), 1);
|
||||
EXPECT_EQ(arr.back(), 3);
|
||||
}
|
||||
TEST(SimpleArray, InitializerListConstructor)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
|
||||
|
||||
TEST(SimpleArray, PopBack)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3};
|
||||
EXPECT_EQ(arr.pop_back(), 3);
|
||||
EXPECT_EQ(arr.size(), 2);
|
||||
EXPECT_EQ(arr.back(), 2);
|
||||
}
|
||||
EXPECT_EQ(arr.size(), 5);
|
||||
for (int i = 0; i < 5; ++i)
|
||||
{
|
||||
EXPECT_EQ(arr[i], i + 1);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Insert)
|
||||
{
|
||||
simple_array<int> arr{1, 3, 4};
|
||||
auto it = arr.insert(arr.begin() + 1, 2);
|
||||
EXPECT_EQ(*it, 2);
|
||||
EXPECT_EQ(arr.size(), 4);
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
EXPECT_EQ(arr[i], i + 1);
|
||||
}
|
||||
}
|
||||
TEST(SimpleArray, CopyConstructor)
|
||||
{
|
||||
rsx::simple_array<int> arr1{ 1, 2, 3 };
|
||||
rsx::simple_array<int> arr2(arr1);
|
||||
|
||||
TEST(SimpleArray, Clear)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3};
|
||||
arr.clear();
|
||||
EXPECT_TRUE(arr.empty());
|
||||
EXPECT_EQ(arr.size(), 0);
|
||||
}
|
||||
EXPECT_EQ(arr1.size(), arr2.size());
|
||||
for (u32 i = 0; i < arr1.size(); ++i)
|
||||
{
|
||||
EXPECT_EQ(arr1[i], arr2[i]);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(SimpleArray, SmallBufferOptimization)
|
||||
{
|
||||
// Test with a small type that should use stack storage
|
||||
simple_array<char> small_arr(3, 'a');
|
||||
EXPECT_TRUE(small_arr.is_local_storage());
|
||||
|
||||
// Test with a larger type or more elements that should use heap storage
|
||||
struct LargeType { char data[128]; };
|
||||
simple_array<LargeType> large_arr(10);
|
||||
EXPECT_FALSE(large_arr.is_local_storage());
|
||||
}
|
||||
TEST(SimpleArray, MoveConstructor)
|
||||
{
|
||||
rsx::simple_array<int> arr1{ 1, 2, 3 };
|
||||
u32 original_size = arr1.size();
|
||||
rsx::simple_array<int> arr2(std::move(arr1));
|
||||
|
||||
TEST(SimpleArray, Iterator)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3, 4, 5};
|
||||
int sum = 0;
|
||||
for (const auto& val : arr) {
|
||||
sum += val;
|
||||
}
|
||||
EXPECT_EQ(sum, 15);
|
||||
}
|
||||
EXPECT_EQ(arr2.size(), original_size);
|
||||
EXPECT_TRUE(arr1.empty());
|
||||
}
|
||||
|
||||
TEST(SimpleArray, EraseIf)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3, 4, 5};
|
||||
bool modified = arr.erase_if([](const int& val) { return val % 2 == 0; });
|
||||
EXPECT_TRUE(modified);
|
||||
EXPECT_EQ(arr.size(), 3);
|
||||
EXPECT_EQ(arr[0], 1);
|
||||
EXPECT_EQ(arr[1], 3);
|
||||
EXPECT_EQ(arr[2], 5);
|
||||
}
|
||||
TEST(SimpleArray, PushBackAndAccess)
|
||||
{
|
||||
rsx::simple_array<int> arr;
|
||||
arr.push_back(1);
|
||||
arr.push_back(2);
|
||||
arr.push_back(3);
|
||||
|
||||
TEST(SimpleArray, Map)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3};
|
||||
auto result = arr.map([](const int& val) { return val * 2; });
|
||||
EXPECT_EQ(result.size(), 3);
|
||||
EXPECT_EQ(result[0], 2);
|
||||
EXPECT_EQ(result[1], 4);
|
||||
EXPECT_EQ(result[2], 6);
|
||||
}
|
||||
EXPECT_EQ(arr.size(), 3);
|
||||
EXPECT_EQ(arr[0], 1);
|
||||
EXPECT_EQ(arr[1], 2);
|
||||
EXPECT_EQ(arr[2], 3);
|
||||
EXPECT_EQ(arr.front(), 1);
|
||||
EXPECT_EQ(arr.back(), 3);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Reduce)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3, 4, 5};
|
||||
int sum = arr.reduce(0, [](const int& acc, const int& val) { return acc + val; });
|
||||
EXPECT_EQ(sum, 15);
|
||||
}
|
||||
TEST(SimpleArray, PopBack)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3 };
|
||||
|
||||
TEST(SimpleArray, Any)
|
||||
{
|
||||
simple_array<int> arr{1, 2, 3, 4, 5};
|
||||
EXPECT_TRUE(arr.any([](const int& val) { return val > 3; }));
|
||||
EXPECT_FALSE(arr.any([](const int& val) { return val > 5; }));
|
||||
}
|
||||
EXPECT_EQ(arr.pop_back(), 3);
|
||||
EXPECT_EQ(arr.size(), 2);
|
||||
EXPECT_EQ(arr.back(), 2);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Sort)
|
||||
{
|
||||
simple_array<int> arr{5, 3, 1, 4, 2};
|
||||
arr.sort([](const int& a, const int& b) { return a < b; });
|
||||
for (u32 i = 0; i < arr.size(); ++i) {
|
||||
EXPECT_EQ(arr[i], i + 1);
|
||||
}
|
||||
TEST(SimpleArray, Insert)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 3, 4 };
|
||||
auto it = arr.insert(arr.begin() + 1, 2);
|
||||
|
||||
EXPECT_EQ(*it, 2);
|
||||
EXPECT_EQ(arr.size(), 4);
|
||||
|
||||
for (int i = 0; i < 4; ++i)
|
||||
{
|
||||
EXPECT_EQ(arr[i], i + 1);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Clear)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3 };
|
||||
arr.clear();
|
||||
|
||||
EXPECT_TRUE(arr.empty());
|
||||
EXPECT_EQ(arr.size(), 0);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, SmallBufferOptimization)
|
||||
{
|
||||
// Test with a small type that should use stack storage
|
||||
rsx::simple_array<char> small_arr(3, 'a');
|
||||
EXPECT_TRUE(small_arr.is_local_storage());
|
||||
|
||||
// Test with a larger type or more elements that should use heap storage
|
||||
struct LargeType { char data[128]; };
|
||||
rsx::simple_array<LargeType> large_arr(10);
|
||||
EXPECT_FALSE(large_arr.is_local_storage());
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Iterator)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
|
||||
int sum = 0;
|
||||
for (const auto& val : arr)
|
||||
{
|
||||
sum += val;
|
||||
}
|
||||
|
||||
EXPECT_EQ(sum, 15);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, EraseIf)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
|
||||
bool modified = arr.erase_if([](const int& val) { return val % 2 == 0; });
|
||||
arr.sort(FN(x < y));
|
||||
|
||||
EXPECT_TRUE(modified);
|
||||
EXPECT_EQ(arr.size(), 3);
|
||||
EXPECT_EQ(arr[0], 1);
|
||||
EXPECT_EQ(arr[1], 3);
|
||||
EXPECT_EQ(arr[2], 5);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Map)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3 };
|
||||
auto result = arr.map([](const int& val) { return val * 2; });
|
||||
|
||||
EXPECT_EQ(result.size(), 3);
|
||||
EXPECT_EQ(result[0], 2);
|
||||
EXPECT_EQ(result[1], 4);
|
||||
EXPECT_EQ(result[2], 6);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Reduce)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
|
||||
int sum = arr.reduce(0, [](const int& acc, const int& val) { return acc + val; });
|
||||
|
||||
EXPECT_EQ(sum, 15);
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Any)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 1, 2, 3, 4, 5 };
|
||||
|
||||
EXPECT_TRUE(arr.any([](const int& val) { return val > 3; }));
|
||||
EXPECT_FALSE(arr.any([](const int& val) { return val > 5; }));
|
||||
}
|
||||
|
||||
TEST(SimpleArray, Sort)
|
||||
{
|
||||
rsx::simple_array<int> arr{ 5, 3, 1, 4, 2 };
|
||||
arr.sort([](const int& a, const int& b) { return a < b; });
|
||||
|
||||
for (u32 i = 0; i < arr.size(); ++i)
|
||||
{
|
||||
EXPECT_EQ(arr[i], i + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue