From 5339df8d2b9f496c7d760b1c5f5bb85a3a821293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 1 Jan 2025 20:47:17 +0100 Subject: [PATCH] Test: adapt to Corrade TestSuite changes. --- src/Magnum/Audio/Test/BufferALTest.cpp | 4 +++- src/Magnum/Audio/Test/ContextALTest.cpp | 8 +++++--- src/Magnum/Audio/Test/ListenerALTest.cpp | 2 +- src/Magnum/Audio/Test/PlayableALTest.cpp | 3 ++- src/Magnum/Audio/Test/RendererALTest.cpp | 3 ++- src/Magnum/Audio/Test/SourceALTest.cpp | 3 ++- src/Magnum/GL/OpenGLTester.cpp | 4 +++- src/Magnum/Vk/Test/AssertTest.cpp | 4 +++- src/Magnum/Vk/VulkanTester.cpp | 3 ++- 9 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/Magnum/Audio/Test/BufferALTest.cpp b/src/Magnum/Audio/Test/BufferALTest.cpp index 6e92d385f..451b46356 100644 --- a/src/Magnum/Audio/Test/BufferALTest.cpp +++ b/src/Magnum/Audio/Test/BufferALTest.cpp @@ -25,6 +25,8 @@ DEALINGS IN THE SOFTWARE. */ +#include +#include #include #include "Magnum/Audio/Buffer.h" @@ -52,7 +54,7 @@ struct BufferALTest: TestSuite::Tester { BufferALTest::BufferALTest(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, - _context{arguments().first, arguments().second} + _context{arguments().first(), arguments().second()} { addTests({&BufferALTest::construct, diff --git a/src/Magnum/Audio/Test/ContextALTest.cpp b/src/Magnum/Audio/Test/ContextALTest.cpp index 2a807df3e..b577095d5 100644 --- a/src/Magnum/Audio/Test/ContextALTest.cpp +++ b/src/Magnum/Audio/Test/ContextALTest.cpp @@ -27,6 +27,8 @@ #include #include +#include +#include #include #include @@ -74,7 +76,7 @@ void ContextALTest::constructDefault() { CORRADE_VERIFY(!Context::hasCurrent()); { - Context context{arguments().first, arguments().second}; + Context context{arguments().first(), arguments().second()}; CORRADE_VERIFY(Context::hasCurrent()); CORRADE_COMPARE(&Context::current(), &context); @@ -110,7 +112,7 @@ void ContextALTest::constructConfiguration() { .setMonoSourceCount(5) .setStereoSourceCount(4) .setRefreshRate(25), - arguments().first, arguments().second + arguments().first(), arguments().second() }; CORRADE_VERIFY(Context::hasCurrent()); CORRADE_COMPARE(&Context::current(), &context); @@ -151,7 +153,7 @@ void ContextALTest::constructDeviceNotFound() { CORRADE_VERIFY(!Context::hasCurrent()); { - Context context{NoCreate, arguments().first, arguments().second}; + Context context{NoCreate, arguments().first(), arguments().second()}; { #ifdef CORRADE_TARGET_APPLE CORRADE_EXPECT_FAIL_IF(context.vendorString() == "Apple Computer Inc.", diff --git a/src/Magnum/Audio/Test/ListenerALTest.cpp b/src/Magnum/Audio/Test/ListenerALTest.cpp index 5281922c5..0f9c25255 100644 --- a/src/Magnum/Audio/Test/ListenerALTest.cpp +++ b/src/Magnum/Audio/Test/ListenerALTest.cpp @@ -58,7 +58,7 @@ struct ListenerALTest: TestSuite::Tester { ListenerALTest::ListenerALTest(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, - _context{arguments().first, arguments().second} + _context{arguments().first(), arguments().second()} { addTests({&ListenerALTest::feature2D, &ListenerALTest::feature3D, diff --git a/src/Magnum/Audio/Test/PlayableALTest.cpp b/src/Magnum/Audio/Test/PlayableALTest.cpp index 5926667c4..26dc96e26 100644 --- a/src/Magnum/Audio/Test/PlayableALTest.cpp +++ b/src/Magnum/Audio/Test/PlayableALTest.cpp @@ -25,6 +25,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include "Magnum/Audio/Context.h" @@ -50,7 +51,7 @@ struct PlayableALTest: TestSuite::Tester { PlayableALTest::PlayableALTest(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, - _context{arguments().first, arguments().second} + _context{arguments().first(), arguments().second()} { addTests({&PlayableALTest::feature, &PlayableALTest::group}); diff --git a/src/Magnum/Audio/Test/RendererALTest.cpp b/src/Magnum/Audio/Test/RendererALTest.cpp index 06636741d..6a51f541d 100644 --- a/src/Magnum/Audio/Test/RendererALTest.cpp +++ b/src/Magnum/Audio/Test/RendererALTest.cpp @@ -24,6 +24,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include "Magnum/Audio/Context.h" @@ -47,7 +48,7 @@ struct RendererALTest: TestSuite::Tester { RendererALTest::RendererALTest(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, - _context{arguments().first, arguments().second} + _context{arguments().first(), arguments().second()} { addTests({&RendererALTest::listenerOrientation, &RendererALTest::listenerPosition, diff --git a/src/Magnum/Audio/Test/SourceALTest.cpp b/src/Magnum/Audio/Test/SourceALTest.cpp index e83032091..fe71d2efc 100644 --- a/src/Magnum/Audio/Test/SourceALTest.cpp +++ b/src/Magnum/Audio/Test/SourceALTest.cpp @@ -24,6 +24,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include "Magnum/Audio/Buffer.h" @@ -56,7 +57,7 @@ struct SourceALTest: TestSuite::Tester { SourceALTest::SourceALTest(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, - _context{arguments().first, arguments().second} + _context{arguments().first(), arguments().second()} { addTests({&SourceALTest::construct, diff --git a/src/Magnum/GL/OpenGLTester.cpp b/src/Magnum/GL/OpenGLTester.cpp index 6d59d0e40..fcf31708f 100644 --- a/src/Magnum/GL/OpenGLTester.cpp +++ b/src/Magnum/GL/OpenGLTester.cpp @@ -26,6 +26,8 @@ #include "OpenGLTester.h" +#include + #include "Magnum/GL/Context.h" #include "Magnum/GL/Extensions.h" #ifndef MAGNUM_TARGET_WEBGL @@ -34,7 +36,7 @@ namespace Magnum { namespace GL { -OpenGLTester::OpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{{arguments().first, arguments().second}} {} +OpenGLTester::OpenGLTester(): TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, _windowlessApplication{{arguments().first(), arguments().second()}} {} OpenGLTester::~OpenGLTester() = default; diff --git a/src/Magnum/Vk/Test/AssertTest.cpp b/src/Magnum/Vk/Test/AssertTest.cpp index 6b4d1688f..fb2a58b8b 100644 --- a/src/Magnum/Vk/Test/AssertTest.cpp +++ b/src/Magnum/Vk/Test/AssertTest.cpp @@ -28,6 +28,8 @@ #undef NDEBUG /* So we can test them */ #endif +#include +#include #include #include @@ -59,7 +61,7 @@ AssertTest::AssertTest(): TestSuite::Tester{TesterConfiguration{}.setSkippedArgu .addOption("assert-success-or", "false").setHelp("assert-success-or", "fail on MAGNUM_VK_INTERNAL_ASSERT_SUCCESS_OR() with Vk::Result", "BOOL") .addOption("assert-vk-success", "false").setHelp("assert-vk-success", "fail on MAGNUM_VK_INTERNAL_ASSERT_SUCCESS() with VkResult", "BOOL") .addOption("assert-vk-success-or", "false").setHelp("assert-vk-success-or", "fail on MAGNUM_VK_INTERNAL_ASSERT_SUCCESS_OR() with VkResult", "BOOL") - .parse(arguments().first, arguments().second); + .parse(arguments().first(), arguments().second()); _failAssertSuccess = args.value("assert-success"); _failAssertSuccessOr = args.value("assert-success-or"); diff --git a/src/Magnum/Vk/VulkanTester.cpp b/src/Magnum/Vk/VulkanTester.cpp index a50c28cd4..3a2621c2b 100644 --- a/src/Magnum/Vk/VulkanTester.cpp +++ b/src/Magnum/Vk/VulkanTester.cpp @@ -26,6 +26,7 @@ #include "VulkanTester.h" +#include #include #include "Magnum/Vk/DeviceCreateInfo.h" @@ -43,7 +44,7 @@ VulkanTester::VulkanTester(): VulkanTester{NoCreate} { } VulkanTester::VulkanTester(NoCreateT): VulkanTester{NoCreate, NoCreate} { - _instance.create(Vk::InstanceCreateInfo{arguments().first, arguments().second} + _instance.create(Vk::InstanceCreateInfo{arguments().first(), arguments().second()} .setApplicationInfo(testName(), {}) ); }