Browse Source

Test: adapt to Corrade TestSuite changes.

pull/659/head
Vladimír Vondruš 1 year ago
parent
commit
5339df8d2b
  1. 4
      src/Magnum/Audio/Test/BufferALTest.cpp
  2. 8
      src/Magnum/Audio/Test/ContextALTest.cpp
  3. 2
      src/Magnum/Audio/Test/ListenerALTest.cpp
  4. 3
      src/Magnum/Audio/Test/PlayableALTest.cpp
  5. 3
      src/Magnum/Audio/Test/RendererALTest.cpp
  6. 3
      src/Magnum/Audio/Test/SourceALTest.cpp
  7. 4
      src/Magnum/GL/OpenGLTester.cpp
  8. 4
      src/Magnum/Vk/Test/AssertTest.cpp
  9. 3
      src/Magnum/Vk/VulkanTester.cpp

4
src/Magnum/Audio/Test/BufferALTest.cpp

@ -25,6 +25,8 @@
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
#include <Corrade/Containers/Pair.h>
#include <Corrade/Containers/Reference.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include "Magnum/Audio/Buffer.h" #include "Magnum/Audio/Buffer.h"
@ -52,7 +54,7 @@ struct BufferALTest: TestSuite::Tester {
BufferALTest::BufferALTest(): BufferALTest::BufferALTest():
TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})},
_context{arguments().first, arguments().second} _context{arguments().first(), arguments().second()}
{ {
addTests({&BufferALTest::construct, addTests({&BufferALTest::construct,

8
src/Magnum/Audio/Test/ContextALTest.cpp

@ -27,6 +27,8 @@
#include <sstream> #include <sstream>
#include <Corrade/Containers/ArrayView.h> #include <Corrade/Containers/ArrayView.h>
#include <Corrade/Containers/Pair.h>
#include <Corrade/Containers/Reference.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include <Corrade/TestSuite/Compare/Numeric.h> #include <Corrade/TestSuite/Compare/Numeric.h>
@ -74,7 +76,7 @@ void ContextALTest::constructDefault() {
CORRADE_VERIFY(!Context::hasCurrent()); CORRADE_VERIFY(!Context::hasCurrent());
{ {
Context context{arguments().first, arguments().second}; Context context{arguments().first(), arguments().second()};
CORRADE_VERIFY(Context::hasCurrent()); CORRADE_VERIFY(Context::hasCurrent());
CORRADE_COMPARE(&Context::current(), &context); CORRADE_COMPARE(&Context::current(), &context);
@ -110,7 +112,7 @@ void ContextALTest::constructConfiguration() {
.setMonoSourceCount(5) .setMonoSourceCount(5)
.setStereoSourceCount(4) .setStereoSourceCount(4)
.setRefreshRate(25), .setRefreshRate(25),
arguments().first, arguments().second arguments().first(), arguments().second()
}; };
CORRADE_VERIFY(Context::hasCurrent()); CORRADE_VERIFY(Context::hasCurrent());
CORRADE_COMPARE(&Context::current(), &context); CORRADE_COMPARE(&Context::current(), &context);
@ -151,7 +153,7 @@ void ContextALTest::constructDeviceNotFound() {
CORRADE_VERIFY(!Context::hasCurrent()); CORRADE_VERIFY(!Context::hasCurrent());
{ {
Context context{NoCreate, arguments().first, arguments().second}; Context context{NoCreate, arguments().first(), arguments().second()};
{ {
#ifdef CORRADE_TARGET_APPLE #ifdef CORRADE_TARGET_APPLE
CORRADE_EXPECT_FAIL_IF(context.vendorString() == "Apple Computer Inc.", CORRADE_EXPECT_FAIL_IF(context.vendorString() == "Apple Computer Inc.",

2
src/Magnum/Audio/Test/ListenerALTest.cpp

@ -58,7 +58,7 @@ struct ListenerALTest: TestSuite::Tester {
ListenerALTest::ListenerALTest(): ListenerALTest::ListenerALTest():
TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})},
_context{arguments().first, arguments().second} _context{arguments().first(), arguments().second()}
{ {
addTests({&ListenerALTest::feature2D, addTests({&ListenerALTest::feature2D,
&ListenerALTest::feature3D, &ListenerALTest::feature3D,

3
src/Magnum/Audio/Test/PlayableALTest.cpp

@ -25,6 +25,7 @@
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
#include <Corrade/Containers/Reference.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include "Magnum/Audio/Context.h" #include "Magnum/Audio/Context.h"
@ -50,7 +51,7 @@ struct PlayableALTest: TestSuite::Tester {
PlayableALTest::PlayableALTest(): PlayableALTest::PlayableALTest():
TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})},
_context{arguments().first, arguments().second} _context{arguments().first(), arguments().second()}
{ {
addTests({&PlayableALTest::feature, addTests({&PlayableALTest::feature,
&PlayableALTest::group}); &PlayableALTest::group});

3
src/Magnum/Audio/Test/RendererALTest.cpp

@ -24,6 +24,7 @@
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
#include <Corrade/Containers/Reference.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include "Magnum/Audio/Context.h" #include "Magnum/Audio/Context.h"
@ -47,7 +48,7 @@ struct RendererALTest: TestSuite::Tester {
RendererALTest::RendererALTest(): RendererALTest::RendererALTest():
TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})},
_context{arguments().first, arguments().second} _context{arguments().first(), arguments().second()}
{ {
addTests({&RendererALTest::listenerOrientation, addTests({&RendererALTest::listenerOrientation,
&RendererALTest::listenerPosition, &RendererALTest::listenerPosition,

3
src/Magnum/Audio/Test/SourceALTest.cpp

@ -24,6 +24,7 @@
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
#include <Corrade/Containers/Reference.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include "Magnum/Audio/Buffer.h" #include "Magnum/Audio/Buffer.h"
@ -56,7 +57,7 @@ struct SourceALTest: TestSuite::Tester {
SourceALTest::SourceALTest(): SourceALTest::SourceALTest():
TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})}, TestSuite::Tester{TestSuite::Tester::TesterConfiguration{}.setSkippedArgumentPrefixes({"magnum"})},
_context{arguments().first, arguments().second} _context{arguments().first(), arguments().second()}
{ {
addTests({&SourceALTest::construct, addTests({&SourceALTest::construct,

4
src/Magnum/GL/OpenGLTester.cpp

@ -26,6 +26,8 @@
#include "OpenGLTester.h" #include "OpenGLTester.h"
#include <Corrade/Containers/Reference.h>
#include "Magnum/GL/Context.h" #include "Magnum/GL/Context.h"
#include "Magnum/GL/Extensions.h" #include "Magnum/GL/Extensions.h"
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
@ -34,7 +36,7 @@
namespace Magnum { namespace GL { 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; OpenGLTester::~OpenGLTester() = default;

4
src/Magnum/Vk/Test/AssertTest.cpp

@ -28,6 +28,8 @@
#undef NDEBUG /* So we can test them */ #undef NDEBUG /* So we can test them */
#endif #endif
#include <Corrade/Containers/Pair.h>
#include <Corrade/Containers/Reference.h>
#include <Corrade/TestSuite/Tester.h> #include <Corrade/TestSuite/Tester.h>
#include <Corrade/Utility/Arguments.h> #include <Corrade/Utility/Arguments.h>
@ -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-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", "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") .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<bool>("assert-success"); _failAssertSuccess = args.value<bool>("assert-success");
_failAssertSuccessOr = args.value<bool>("assert-success-or"); _failAssertSuccessOr = args.value<bool>("assert-success-or");

3
src/Magnum/Vk/VulkanTester.cpp

@ -26,6 +26,7 @@
#include "VulkanTester.h" #include "VulkanTester.h"
#include <Corrade/Containers/Pair.h>
#include <Corrade/Containers/StringView.h> #include <Corrade/Containers/StringView.h>
#include "Magnum/Vk/DeviceCreateInfo.h" #include "Magnum/Vk/DeviceCreateInfo.h"
@ -43,7 +44,7 @@ VulkanTester::VulkanTester(): VulkanTester{NoCreate} {
} }
VulkanTester::VulkanTester(NoCreateT): VulkanTester{NoCreate, 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(), {}) .setApplicationInfo(testName(), {})
); );
} }

Loading…
Cancel
Save