From 6bdffb2796e5ddb3b123399ce3189a58741c17fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 27 Jun 2022 16:38:14 +0200 Subject: [PATCH] Test: make use of CORRADE_SKIP_IF_NO_ASSERT(). --- .../Animation/Test/InterpolationTest.cpp | 48 +- src/Magnum/Animation/Test/PlayerTest.cpp | 4 +- .../Audio/Test/AbstractImporterTest.cpp | 28 +- .../DebugTools/Test/CompareImageTest.cpp | 16 +- .../DebugTools/Test/FrameProfilerTest.cpp | 36 +- src/Magnum/GL/Test/AbstractTextureGLTest.cpp | 48 +- src/Magnum/GL/Test/AttributeTest.cpp | 20 +- src/Magnum/GL/Test/BufferImageGLTest.cpp | 4 +- src/Magnum/GL/Test/CubeMapTextureGLTest.cpp | 64 +- src/Magnum/GL/Test/FramebufferGLTest.cpp | 8 +- src/Magnum/GL/Test/MeshGLTest.cpp | 56 +- src/Magnum/GL/Test/MeshTest.cpp | 20 +- src/Magnum/GL/Test/PixelFormatTest.cpp | 52 +- src/Magnum/GL/Test/SamplerTest.cpp | 12 +- src/Magnum/Math/Test/ComplexTest.cpp | 20 +- src/Magnum/Math/Test/CubicHermiteTest.cpp | 32 +- src/Magnum/Math/Test/DistanceTest.cpp | 4 +- src/Magnum/Math/Test/DualComplexTest.cpp | 8 +- src/Magnum/Math/Test/DualQuaternionTest.cpp | 20 +- src/Magnum/Math/Test/FrustumTest.cpp | 4 +- src/Magnum/Math/Test/FunctionsTest.cpp | 16 +- src/Magnum/Math/Test/IntersectionTest.cpp | 4 +- src/Magnum/Math/Test/Matrix3Test.cpp | 20 +- src/Magnum/Math/Test/Matrix4Test.cpp | 24 +- src/Magnum/Math/Test/MatrixTest.cpp | 4 +- src/Magnum/Math/Test/PackingBatchTest.cpp | 12 +- src/Magnum/Math/Test/QuaternionTest.cpp | 44 +- src/Magnum/Math/Test/VectorTest.cpp | 8 +- .../Test/CombineIndexedArraysTest.cpp | 4 +- src/Magnum/MeshTools/Test/CombineTest.cpp | 52 +- src/Magnum/MeshTools/Test/CompileGLTest.cpp | 24 +- .../MeshTools/Test/CompressIndicesTest.cpp | 24 +- src/Magnum/MeshTools/Test/ConcatenateTest.cpp | 32 +- src/Magnum/MeshTools/Test/DuplicateTest.cpp | 48 +- .../MeshTools/Test/FilterAttributesTest.cpp | 8 +- src/Magnum/MeshTools/Test/FlipNormalsTest.cpp | 12 +- .../MeshTools/Test/GenerateIndicesTest.cpp | 56 +- .../MeshTools/Test/GenerateNormalsTest.cpp | 28 +- src/Magnum/MeshTools/Test/InterleaveTest.cpp | 44 +- src/Magnum/MeshTools/Test/ReferenceTest.cpp | 4 +- .../MeshTools/Test/RemoveDuplicatesTest.cpp | 60 +- src/Magnum/MeshTools/Test/SubdivideTest.cpp | 12 +- src/Magnum/MeshTools/Test/TransformTest.cpp | 80 +-- .../Test/DualComplexTransformationTest.cpp | 8 +- .../Test/DualQuaternionTransformationTest.cpp | 12 +- src/Magnum/SceneGraph/Test/ObjectTest.cpp | 8 +- .../Test/RigidMatrixTransformation2DTest.cpp | 12 +- .../Test/RigidMatrixTransformation3DTest.cpp | 12 +- .../Test/TranslationTransformationTest.cpp | 4 +- .../Test/FlattenMeshHierarchyTest.cpp | 8 +- .../Test/OrderClusterParentsTest.cpp | 28 +- .../Test/AbstractConverterTest.cpp | 188 ++---- .../Test/DistanceFieldVectorGLTest.cpp | 24 +- src/Magnum/Shaders/Test/FlatGLTest.cpp | 48 +- .../Shaders/Test/MeshVisualizerGLTest.cpp | 108 +--- src/Magnum/Shaders/Test/PhongGLTest.cpp | 64 +- src/Magnum/Shaders/Test/VectorGLTest.cpp | 24 +- src/Magnum/Shaders/Test/VertexColorGLTest.cpp | 16 +- src/Magnum/Test/ImageTest.cpp | 12 +- src/Magnum/Test/ImageViewTest.cpp | 16 +- src/Magnum/Test/MeshTest.cpp | 24 +- src/Magnum/Test/PixelFormatTest.cpp | 56 +- src/Magnum/Test/ResourceManagerTest.cpp | 12 +- src/Magnum/Test/VertexFormatTest.cpp | 80 +-- .../Text/Test/AbstractFontConverterTest.cpp | 88 +-- src/Magnum/Text/Test/AbstractFontTest.cpp | 60 +- .../Text/Test/AbstractGlyphCacheTest.cpp | 12 +- src/Magnum/TextureTools/Test/AtlasTest.cpp | 8 +- .../Trade/Test/AbstractImageConverterTest.cpp | 332 +++-------- .../Trade/Test/AbstractImporterTest.cpp | 556 +++++------------- .../Trade/Test/AbstractSceneConverterTest.cpp | 40 +- src/Magnum/Trade/Test/AnimationDataTest.cpp | 24 +- src/Magnum/Trade/Test/CameraDataTest.cpp | 12 +- .../Trade/Test/FlatMaterialDataTest.cpp | 4 +- src/Magnum/Trade/Test/ImageDataTest.cpp | 36 +- src/Magnum/Trade/Test/LightDataTest.cpp | 4 +- src/Magnum/Trade/Test/MaterialDataTest.cpp | 156 ++--- src/Magnum/Trade/Test/MeshDataTest.cpp | 196 ++---- src/Magnum/Trade/Test/ObjectData2DTest.cpp | 4 +- src/Magnum/Trade/Test/ObjectData3DTest.cpp | 4 +- .../Test/PbrClearCoatMaterialDataTest.cpp | 8 +- .../PbrMetallicRoughnessMaterialDataTest.cpp | 8 +- .../PbrSpecularGlossinessMaterialDataTest.cpp | 8 +- .../Trade/Test/PhongMaterialDataTest.cpp | 20 +- src/Magnum/Trade/Test/SceneDataTest.cpp | 212 ++----- src/Magnum/Trade/Test/SkinDataTest.cpp | 4 +- src/Magnum/Vk/Test/BufferTest.cpp | 8 +- src/Magnum/Vk/Test/BufferVkTest.cpp | 4 +- src/Magnum/Vk/Test/DescriptorPoolTest.cpp | 12 +- src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp | 8 +- src/Magnum/Vk/Test/DevicePropertiesVkTest.cpp | 12 +- src/Magnum/Vk/Test/DeviceVkTest.cpp | 20 +- .../Vk/Test/ExtensionPropertiesVkTest.cpp | 4 +- src/Magnum/Vk/Test/ImageTest.cpp | 16 +- src/Magnum/Vk/Test/ImageViewTest.cpp | 4 +- src/Magnum/Vk/Test/ImageVkTest.cpp | 8 +- src/Magnum/Vk/Test/InstanceVkTest.cpp | 8 +- src/Magnum/Vk/Test/LayerPropertiesVkTest.cpp | 4 +- src/Magnum/Vk/Test/MemoryTest.cpp | 8 +- src/Magnum/Vk/Test/MeshLayoutTest.cpp | 20 +- src/Magnum/Vk/Test/MeshTest.cpp | 12 +- src/Magnum/Vk/Test/MeshVkTest.cpp | 8 +- src/Magnum/Vk/Test/PipelineTest.cpp | 4 +- src/Magnum/Vk/Test/PipelineVkTest.cpp | 8 +- src/Magnum/Vk/Test/PixelFormatTest.cpp | 16 +- src/Magnum/Vk/Test/RenderPassTest.cpp | 24 +- src/Magnum/Vk/Test/RenderPassVkTest.cpp | 8 +- src/Magnum/Vk/Test/SamplerTest.cpp | 12 +- src/Magnum/Vk/Test/ShaderSetTest.cpp | 4 +- src/Magnum/Vk/Test/VertexFormatTest.cpp | 8 +- 110 files changed, 981 insertions(+), 2943 deletions(-) diff --git a/src/Magnum/Animation/Test/InterpolationTest.cpp b/src/Magnum/Animation/Test/InterpolationTest.cpp index 1b26b477d..06550a12c 100644 --- a/src/Magnum/Animation/Test/InterpolationTest.cpp +++ b/src/Magnum/Animation/Test/InterpolationTest.cpp @@ -222,9 +222,7 @@ void InterpolationTest::interpolatorFor() { } void InterpolationTest::interpolatorForInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -244,9 +242,7 @@ void InterpolationTest::interpolatorForBool() { } void InterpolationTest::interpolatorForBoolInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -266,9 +262,7 @@ void InterpolationTest::interpolatorForBoolVector() { } void InterpolationTest::interpolatorForBoolVectorInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -292,9 +286,7 @@ void InterpolationTest::interpolatorForComplex() { } void InterpolationTest::interpolatorForComplexInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -318,9 +310,7 @@ void InterpolationTest::interpolatorForQuaternion() { } void InterpolationTest::interpolatorForQuaternionInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -344,9 +334,7 @@ void InterpolationTest::interpolatorForDualQuaternion() { } void InterpolationTest::interpolatorForDualQuaternionInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -367,9 +355,7 @@ void InterpolationTest::interpolatorForCubicHermiteScalar() { } void InterpolationTest::interpolatorForCubicHermiteScalarInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -390,9 +376,7 @@ void InterpolationTest::interpolatorForCubicHermiteVector() { } void InterpolationTest::interpolatorForCubicHermiteVectorInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -413,9 +397,7 @@ void InterpolationTest::interpolatorForCubicHermiteComplex() { } void InterpolationTest::interpolatorForCubicHermiteComplexInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -442,9 +424,7 @@ void InterpolationTest::interpolatorForCubicHermiteQuaternion() { } void InterpolationTest::interpolatorForCubicHermiteQuaternionInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -561,9 +541,7 @@ void InterpolationTest::interpolateStrictIntegerKey() { } void InterpolationTest::interpolateError() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -578,9 +556,7 @@ void InterpolationTest::interpolateError() { } void InterpolationTest::interpolateStrictError() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Animation/Test/PlayerTest.cpp b/src/Magnum/Animation/Test/PlayerTest.cpp index b821d677d..252c9ebe0 100644 --- a/src/Magnum/Animation/Test/PlayerTest.cpp +++ b/src/Magnum/Animation/Test/PlayerTest.cpp @@ -326,9 +326,7 @@ void PlayerTest::setDurationReplace() { } void PlayerTest::trackInvalidIndex() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp index 3d4846b0d..650244065 100644 --- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp @@ -194,9 +194,7 @@ void AbstractImporterTest::openFileAsDataNotFound() { } void AbstractImporterTest::openFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Importer: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -216,9 +214,7 @@ void AbstractImporterTest::openFileNotImplemented() { } void AbstractImporterTest::openDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -238,9 +234,7 @@ void AbstractImporterTest::openDataNotSupported() { } void AbstractImporterTest::openDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return ImporterFeature::OpenData; } @@ -274,9 +268,7 @@ void AbstractImporterTest::format() { } void AbstractImporterTest::formatNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -310,9 +302,7 @@ void AbstractImporterTest::frequency() { } void AbstractImporterTest::frequencyNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -350,9 +340,7 @@ void AbstractImporterTest::data() { } void AbstractImporterTest::dataNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -372,9 +360,7 @@ void AbstractImporterTest::dataNoFile() { } void AbstractImporterTest::dataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } diff --git a/src/Magnum/DebugTools/Test/CompareImageTest.cpp b/src/Magnum/DebugTools/Test/CompareImageTest.cpp index 3369f5828..32e0f892b 100644 --- a/src/Magnum/DebugTools/Test/CompareImageTest.cpp +++ b/src/Magnum/DebugTools/Test/CompareImageTest.cpp @@ -244,9 +244,7 @@ const ImageView2D ActualRed{PixelFormat::R32F, {3, 3}, ActualRedData}; const ImageView2D ExpectedRed{PixelFormat::R32F, {3, 3}, ExpectedRedData}; void CompareImageTest::formatUnknown() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -258,9 +256,7 @@ void CompareImageTest::formatUnknown() { } void CompareImageTest::formatPackedDepthStencil() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -272,9 +268,7 @@ void CompareImageTest::formatPackedDepthStencil() { } void CompareImageTest::formatImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -904,9 +898,7 @@ void CompareImageTest::compareSpecialsMeanOnly() { } void CompareImageTest::compareSpecialsDisallowedThreshold() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; diff --git a/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp b/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp index 738014624..49f0e30da 100644 --- a/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp +++ b/src/Magnum/DebugTools/Test/FrameProfilerTest.cpp @@ -778,9 +778,7 @@ void FrameProfilerTest::move() { } void FrameProfilerTest::delayZero() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -790,9 +788,7 @@ void FrameProfilerTest::delayZero() { } void FrameProfilerTest::frameCountZero() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -801,9 +797,7 @@ void FrameProfilerTest::frameCountZero() { } void FrameProfilerTest::delayTooLittleFrames() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -815,9 +809,7 @@ void FrameProfilerTest::delayTooLittleFrames() { } void FrameProfilerTest::startStopFrameUnexpected() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); FrameProfiler profiler; @@ -837,9 +829,7 @@ void FrameProfilerTest::startStopFrameUnexpected() { } void FrameProfilerTest::measurementOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); FrameProfiler profiler{{ FrameProfiler::Measurement{"", FrameProfiler::Units::Count, @@ -864,9 +854,7 @@ void FrameProfilerTest::measurementOutOfBounds() { } void FrameProfilerTest::frameOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); FrameProfiler profiler{{ FrameProfiler::Measurement{"", FrameProfiler::Units::Count, @@ -889,9 +877,7 @@ void FrameProfilerTest::frameOutOfBounds() { } void FrameProfilerTest::dataNotAvailableYet() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); FrameProfiler profiler{{ FrameProfiler::Measurement{"", FrameProfiler::Units::Count, 3, @@ -955,9 +941,7 @@ void FrameProfilerTest::dataNotAvailableYet() { } void FrameProfilerTest::meanNotAvailableYet() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); FrameProfiler profiler{{ FrameProfiler::Measurement{"", FrameProfiler::Units::Count, 3, @@ -1171,9 +1155,7 @@ void FrameProfilerTest::gl() { } void FrameProfilerTest::glNotEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); FrameProfilerGL profiler{{}, 5}; diff --git a/src/Magnum/GL/Test/AbstractTextureGLTest.cpp b/src/Magnum/GL/Test/AbstractTextureGLTest.cpp index 7153c6deb..fe72b840d 100644 --- a/src/Magnum/GL/Test/AbstractTextureGLTest.cpp +++ b/src/Magnum/GL/Test/AbstractTextureGLTest.cpp @@ -122,9 +122,7 @@ void AbstractTextureGLTest::constructMove() { #ifndef MAGNUM_TARGET_GLES void AbstractTextureGLTest::imageQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Texture2D texture; texture.setStorage(1, TextureFormat::RGBA8, Vector2i{2}); @@ -140,9 +138,7 @@ void AbstractTextureGLTest::imageQueryViewNullptr() { } void AbstractTextureGLTest::imageQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Texture2D texture; texture.setStorage(1, TextureFormat::RGBA8, Vector2i{2}); @@ -159,9 +155,7 @@ void AbstractTextureGLTest::imageQueryViewBadSize() { } void AbstractTextureGLTest::subImageQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Texture2D texture; texture.setStorage(1, TextureFormat::RGBA8, Vector2i{2}); @@ -177,9 +171,7 @@ void AbstractTextureGLTest::subImageQueryViewNullptr() { } void AbstractTextureGLTest::subImageQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::get_texture_sub_image::string() << "is not supported."); @@ -199,9 +191,7 @@ void AbstractTextureGLTest::subImageQueryViewBadSize() { } void AbstractTextureGLTest::compressedImageQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -220,9 +210,7 @@ void AbstractTextureGLTest::compressedImageQueryViewNullptr() { } void AbstractTextureGLTest::compressedImageQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -242,9 +230,7 @@ void AbstractTextureGLTest::compressedImageQueryViewBadSize() { } void AbstractTextureGLTest::compressedImageQueryViewBadDataSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -264,9 +250,7 @@ void AbstractTextureGLTest::compressedImageQueryViewBadDataSize() { } void AbstractTextureGLTest::compressedImageQueryViewBadFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -286,9 +270,7 @@ void AbstractTextureGLTest::compressedImageQueryViewBadFormat() { } void AbstractTextureGLTest::compressedSubImageQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::get_texture_sub_image::string() << "is not supported."); @@ -311,9 +293,7 @@ void AbstractTextureGLTest::compressedSubImageQueryViewNullptr() { } void AbstractTextureGLTest::compressedSubImageQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::get_texture_sub_image::string() << "is not supported."); @@ -337,9 +317,7 @@ void AbstractTextureGLTest::compressedSubImageQueryViewBadSize() { } void AbstractTextureGLTest::compressedSubImageQueryViewBadDataSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::get_texture_sub_image::string() << "is not supported."); @@ -363,9 +341,7 @@ void AbstractTextureGLTest::compressedSubImageQueryViewBadDataSize() { } void AbstractTextureGLTest::compressedSubImageQueryViewBadFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::ARB::get_texture_sub_image::string() << "is not supported."); diff --git a/src/Magnum/GL/Test/AttributeTest.cpp b/src/Magnum/GL/Test/AttributeTest.cpp index 3c5f4b7a1..ce95b5689 100644 --- a/src/Magnum/GL/Test/AttributeTest.cpp +++ b/src/Magnum/GL/Test/AttributeTest.cpp @@ -776,9 +776,7 @@ void AttributeTest::attributeFromGenericFormatEnableNormalized() { } void AttributeTest::attributeFromGenericFormatUnexpectedForNormalizedKind() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -790,9 +788,7 @@ void AttributeTest::attributeFromGenericFormatUnexpectedForNormalizedKind() { #ifndef MAGNUM_TARGET_GLES2 void AttributeTest::attributeFromGenericFormatUnexpectedForIntegralKind() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -808,9 +804,7 @@ void AttributeTest::attributeFromGenericFormatUnexpectedForIntegralKind() { #ifndef MAGNUM_TARGET_GLES void AttributeTest::attributeFromGenericFormatUnexpectedForLongKind() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -822,9 +816,7 @@ void AttributeTest::attributeFromGenericFormatUnexpectedForLongKind() { #endif void AttributeTest::attributeFromGenericFormatTooManyVectors() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -834,9 +826,7 @@ void AttributeTest::attributeFromGenericFormatTooManyVectors() { } void AttributeTest::attributeFromGenericFormatTooManyComponents() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/GL/Test/BufferImageGLTest.cpp b/src/Magnum/GL/Test/BufferImageGLTest.cpp index 915f48587..734086971 100644 --- a/src/Magnum/GL/Test/BufferImageGLTest.cpp +++ b/src/Magnum/GL/Test/BufferImageGLTest.cpp @@ -330,9 +330,7 @@ void BufferImageGLTest::constructBufferCompressedGeneric() { } void BufferImageGLTest::constructInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp b/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp index f6f00669f..8a6ca729d 100644 --- a/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp +++ b/src/Magnum/GL/Test/CubeMapTextureGLTest.cpp @@ -962,9 +962,7 @@ void CubeMapTextureGLTest::imageQueryView() { } void CubeMapTextureGLTest::imageQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); CubeMapTexture texture; texture.setStorage(1, TextureFormat::RGBA8, Vector2i{2}); @@ -981,9 +979,7 @@ void CubeMapTextureGLTest::imageQueryViewNullptr() { } void CubeMapTextureGLTest::imageQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); CubeMapTexture texture; texture.setStorage(1, TextureFormat::RGBA8, Vector2i{2}); @@ -1318,9 +1314,7 @@ void CubeMapTextureGLTest::compressedImageQueryView() { } void CubeMapTextureGLTest::compressedImageQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1339,9 +1333,7 @@ void CubeMapTextureGLTest::compressedImageQueryViewNullptr() { } void CubeMapTextureGLTest::compressedImageQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1361,9 +1353,7 @@ void CubeMapTextureGLTest::compressedImageQueryViewBadSize() { } void CubeMapTextureGLTest::compressedImageQueryViewBadDataSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1383,9 +1373,7 @@ void CubeMapTextureGLTest::compressedImageQueryViewBadDataSize() { } void CubeMapTextureGLTest::compressedImageQueryViewBadFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1678,9 +1666,7 @@ void CubeMapTextureGLTest::compressedSubImageQueryView() { } void CubeMapTextureGLTest::compressedSubImageQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1699,9 +1685,7 @@ void CubeMapTextureGLTest::compressedSubImageQueryViewNullptr() { } void CubeMapTextureGLTest::compressedSubImageQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1721,9 +1705,7 @@ void CubeMapTextureGLTest::compressedSubImageQueryViewBadSize() { } void CubeMapTextureGLTest::compressedSubImageQueryViewBadDataSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1743,9 +1725,7 @@ void CubeMapTextureGLTest::compressedSubImageQueryViewBadDataSize() { } void CubeMapTextureGLTest::compressedSubImageQueryViewBadFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -1893,9 +1873,7 @@ void CubeMapTextureGLTest::image3DQueryView() { } void CubeMapTextureGLTest::image3DQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); CubeMapTexture texture; texture.setStorage(1, TextureFormat::RGBA8, Vector2i{2}); @@ -1912,9 +1890,7 @@ void CubeMapTextureGLTest::image3DQueryViewNullptr() { } void CubeMapTextureGLTest::image3DQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); CubeMapTexture texture; texture.setStorage(1, TextureFormat::RGBA8, Vector2i{2}); @@ -2091,9 +2067,7 @@ void CubeMapTextureGLTest::compressedImage3DQueryView() { } void CubeMapTextureGLTest::compressedImage3DQueryViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -2112,9 +2086,7 @@ void CubeMapTextureGLTest::compressedImage3DQueryViewNullptr() { } void CubeMapTextureGLTest::compressedImage3DQueryViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -2134,9 +2106,7 @@ void CubeMapTextureGLTest::compressedImage3DQueryViewBadSize() { } void CubeMapTextureGLTest::compressedImage3DQueryViewBadDataSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); @@ -2156,9 +2126,7 @@ void CubeMapTextureGLTest::compressedImage3DQueryViewBadDataSize() { } void CubeMapTextureGLTest::compressedImage3DQueryViewBadFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(!Context::current().isExtensionSupported()) CORRADE_SKIP(Extensions::EXT::texture_compression_s3tc::string() << "is not supported."); diff --git a/src/Magnum/GL/Test/FramebufferGLTest.cpp b/src/Magnum/GL/Test/FramebufferGLTest.cpp index e8a48276a..c1bcad208 100644 --- a/src/Magnum/GL/Test/FramebufferGLTest.cpp +++ b/src/Magnum/GL/Test/FramebufferGLTest.cpp @@ -1655,9 +1655,7 @@ void FramebufferGLTest::readView() { } void FramebufferGLTest::readViewNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!Context::current().isExtensionSupported()) @@ -1683,9 +1681,7 @@ void FramebufferGLTest::readViewNullptr() { } void FramebufferGLTest::readViewBadSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!Context::current().isExtensionSupported()) diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index 2015acb61..85137729b 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -2271,9 +2271,7 @@ void MeshGLTest::addVertexBufferMultipleGaps() { } void MeshGLTest::addVertexBufferMovedOutInstance() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Buffer buffer{NoCreate}; Mesh mesh; @@ -2598,9 +2596,7 @@ void MeshGLTest::setIndexBufferUnsignedInt() { } void MeshGLTest::setIndexBufferMovedOutInstance() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Buffer buffer{NoCreate}; Mesh mesh; @@ -4396,9 +4392,7 @@ void MeshGLTest::multiDrawIndexedViews() { } void MeshGLTest::multiDrawWrongVertexOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; MultiDrawShader shader; @@ -4415,9 +4409,7 @@ void MeshGLTest::multiDrawWrongVertexOffsetSize() { } void MeshGLTest::multiDrawIndexedWrongVertexOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; mesh.setIndexBuffer(Buffer{Buffer::TargetHint::ElementArray, {2, 1, 0}}, 0, MeshIndexType::UnsignedInt); @@ -4435,9 +4427,7 @@ void MeshGLTest::multiDrawIndexedWrongVertexOffsetSize() { } void MeshGLTest::multiDrawIndexedWrongIndexOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; mesh.setIndexBuffer(Buffer{Buffer::TargetHint::ElementArray, {2, 1, 0}}, 0, MeshIndexType::UnsignedInt); @@ -4547,9 +4537,7 @@ void MeshGLTest::multiDrawIndexedViewsBaseVertexNoExtensionAvailable() { #endif void MeshGLTest::multiDrawViewsInstanced() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; MeshView view{mesh}; @@ -4563,9 +4551,7 @@ void MeshGLTest::multiDrawViewsInstanced() { } void MeshGLTest::multiDrawViewsDifferentMeshes() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh a, b; MeshView viewA{a}, viewB{b}; @@ -5042,9 +5028,7 @@ template void MeshGLTest::multiDrawInstancedIndexedSparseArrays() { } void MeshGLTest::multiDrawInstancedWrongInstanceCountSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; MultiDrawInstancedShader shader; @@ -5061,9 +5045,7 @@ void MeshGLTest::multiDrawInstancedWrongInstanceCountSize() { } void MeshGLTest::multiDrawInstancedWrongVertexOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; MultiDrawInstancedShader shader; @@ -5082,9 +5064,7 @@ void MeshGLTest::multiDrawInstancedWrongVertexOffsetSize() { #ifndef MAGNUM_TARGET_GLES2 void MeshGLTest::multiDrawInstancedWrongInstanceOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; MultiDrawInstancedShader shader; @@ -5102,9 +5082,7 @@ void MeshGLTest::multiDrawInstancedWrongInstanceOffsetSize() { #endif void MeshGLTest::multiDrawInstancedIndexedWrongInstanceCountSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; mesh.setIndexBuffer(Buffer{Buffer::TargetHint::ElementArray, {2, 1, 0}}, 0, MeshIndexType::UnsignedInt); @@ -5122,9 +5100,7 @@ void MeshGLTest::multiDrawInstancedIndexedWrongInstanceCountSize() { } void MeshGLTest::multiDrawInstancedIndexedWrongVertexOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; mesh.setIndexBuffer(Buffer{Buffer::TargetHint::ElementArray, {2, 1, 0}}, 0, MeshIndexType::UnsignedInt); @@ -5143,9 +5119,7 @@ void MeshGLTest::multiDrawInstancedIndexedWrongVertexOffsetSize() { } void MeshGLTest::multiDrawInstancedIndexedWrongIndexOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; mesh.setIndexBuffer(Buffer{Buffer::TargetHint::ElementArray, {2, 1, 0}}, 0, MeshIndexType::UnsignedInt); @@ -5165,9 +5139,7 @@ void MeshGLTest::multiDrawInstancedIndexedWrongIndexOffsetSize() { #ifndef MAGNUM_TARGET_GLES2 void MeshGLTest::multiDrawInstancedIndexedWrongInstanceOffsetSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; mesh.setIndexBuffer(Buffer{Buffer::TargetHint::ElementArray, {2, 1, 0}}, 0, MeshIndexType::UnsignedInt); diff --git a/src/Magnum/GL/Test/MeshTest.cpp b/src/Magnum/GL/Test/MeshTest.cpp index 82d9ec71b..4f311145e 100644 --- a/src/Magnum/GL/Test/MeshTest.cpp +++ b/src/Magnum/GL/Test/MeshTest.cpp @@ -133,9 +133,7 @@ struct Shader: AbstractShaderProgram { }; void MeshTest::drawCountNotSet() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -147,9 +145,7 @@ void MeshTest::drawCountNotSet() { } void MeshTest::drawViewCountNotSet() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -201,9 +197,7 @@ void MeshTest::mapPrimitiveImplementationSpecific() { } void MeshTest::mapPrimitiveUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -212,9 +206,7 @@ void MeshTest::mapPrimitiveUnsupported() { } void MeshTest::mapPrimitiveInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -260,9 +252,7 @@ void MeshTest::mapIndexTypeImplementationSpecific() { } void MeshTest::mapIndexTypeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/GL/Test/PixelFormatTest.cpp b/src/Magnum/GL/Test/PixelFormatTest.cpp index e2a35dff6..e647793f0 100644 --- a/src/Magnum/GL/Test/PixelFormatTest.cpp +++ b/src/Magnum/GL/Test/PixelFormatTest.cpp @@ -197,9 +197,7 @@ void PixelFormatTest::mapFormatImplementationSpecific() { } void PixelFormatTest::mapFormatUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES2 CORRADE_SKIP("All pixel formats are supported on ES3+."); @@ -214,9 +212,7 @@ void PixelFormatTest::mapFormatUnsupported() { } void PixelFormatTest::mapFormatInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -238,9 +234,7 @@ void PixelFormatTest::mapTypeImplementationSpecific() { } void PixelFormatTest::mapTypeImplementationSpecificZero() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -250,9 +244,7 @@ void PixelFormatTest::mapTypeImplementationSpecificZero() { } void PixelFormatTest::mapTypeUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES2 CORRADE_SKIP("All pixel formats are supported on ES3+."); @@ -267,9 +259,7 @@ void PixelFormatTest::mapTypeUnsupported() { } void PixelFormatTest::mapTypeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -281,9 +271,7 @@ void PixelFormatTest::mapTypeInvalid() { } void PixelFormatTest::mapTextureFormatImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -295,9 +283,7 @@ void PixelFormatTest::mapTextureFormatImplementationSpecific() { } void PixelFormatTest::mapTextureFormatUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #if defined(MAGNUM_TARGET_GLES) && !defined(MAGNUM_TARGET_GLES2) CORRADE_SKIP("All pixel formats are supported on ES3+."); @@ -317,9 +303,7 @@ void PixelFormatTest::mapTextureFormatUnsupported() { } void PixelFormatTest::mapTextureFormatInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -352,9 +336,7 @@ void PixelFormatTest::size() { } void PixelFormatTest::sizeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -436,9 +418,7 @@ void PixelFormatTest::mapCompressedFormatImplementationSpecific() { } void PixelFormatTest::mapCompressedFormatUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifdef MAGNUM_TARGET_GLES2 CORRADE_VERIFY(!hasCompressedPixelFormat(Magnum::CompressedPixelFormat::Astc3x3x3RGBAUnorm)); @@ -460,9 +440,7 @@ void PixelFormatTest::mapCompressedFormatUnsupported() { } void PixelFormatTest::mapCompressedFormatInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -485,9 +463,7 @@ void PixelFormatTest::mapCompressedTextureFormatImplementationSpecific() { } void PixelFormatTest::mapCompressedTextureFormatUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifdef MAGNUM_TARGET_GLES2 CORRADE_VERIFY(!hasTextureFormat(Magnum::CompressedPixelFormat::Astc3x3x3RGBAUnorm)); @@ -509,9 +485,7 @@ void PixelFormatTest::mapCompressedTextureFormatUnsupported() { } void PixelFormatTest::mapCompressedTextureFormatInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/GL/Test/SamplerTest.cpp b/src/Magnum/GL/Test/SamplerTest.cpp index c5b2e1a75..b89c7008a 100644 --- a/src/Magnum/GL/Test/SamplerTest.cpp +++ b/src/Magnum/GL/Test/SamplerTest.cpp @@ -85,9 +85,7 @@ void SamplerTest::mapFilter() { } void SamplerTest::mapFilterInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -104,9 +102,7 @@ void SamplerTest::mapMipmap() { } void SamplerTest::mapMipmapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -142,9 +138,7 @@ void SamplerTest::mapWrappingVector() { } void SamplerTest::mapWrappingInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/ComplexTest.cpp b/src/Magnum/Math/Test/ComplexTest.cpp index 0a2d09932..54919e528 100644 --- a/src/Magnum/Math/Test/ComplexTest.cpp +++ b/src/Magnum/Math/Test/ComplexTest.cpp @@ -431,9 +431,7 @@ void ComplexTest::invertedNormalized() { } void ComplexTest::invertedNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -472,9 +470,7 @@ void ComplexTest::angleNormalizedButOver1() { } void ComplexTest::angleNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -514,9 +510,7 @@ void ComplexTest::matrix() { } void ComplexTest::matrixNotRotation() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -551,9 +545,7 @@ void ComplexTest::lerp() { } void ComplexTest::lerpNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -581,9 +573,7 @@ void ComplexTest::slerp() { } void ComplexTest::slerpNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/CubicHermiteTest.cpp b/src/Magnum/Math/Test/CubicHermiteTest.cpp index 09d8b9dda..03684d199 100644 --- a/src/Magnum/Math/Test/CubicHermiteTest.cpp +++ b/src/Magnum/Math/Test/CubicHermiteTest.cpp @@ -890,9 +890,7 @@ void CubicHermiteTest::lerpComplex() { } void CubicHermiteTest::lerpComplexNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -935,9 +933,7 @@ void CubicHermiteTest::lerpQuaternion() { } void CubicHermiteTest::lerpQuaternionNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -979,9 +975,7 @@ void CubicHermiteTest::lerpQuaternionShortestPath() { } void CubicHermiteTest::lerpQuaternionShortestPathNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1019,9 +1013,7 @@ void CubicHermiteTest::slerpComplex() { } void CubicHermiteTest::slerpComplexNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1064,9 +1056,7 @@ void CubicHermiteTest::slerpQuaternion() { } void CubicHermiteTest::slerpQuaternionNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1109,9 +1099,7 @@ void CubicHermiteTest::slerpQuaternionShortestPath() { } void CubicHermiteTest::slerpQuaternionShortestPathNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1185,9 +1173,7 @@ void CubicHermiteTest::splerpComplex() { } void CubicHermiteTest::splerpComplexNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1226,9 +1212,7 @@ void CubicHermiteTest::splerpQuaternion() { } void CubicHermiteTest::splerpQuaternionNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/DistanceTest.cpp b/src/Magnum/Math/Test/DistanceTest.cpp index c2e93204e..e21fea367 100644 --- a/src/Magnum/Math/Test/DistanceTest.cpp +++ b/src/Magnum/Math/Test/DistanceTest.cpp @@ -234,9 +234,7 @@ void DistanceTest::pointPlaneNormalized() { } void DistanceTest::pointPlaneNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/DualComplexTest.cpp b/src/Magnum/Math/Test/DualComplexTest.cpp index 4aab835e4..2bf63608a 100644 --- a/src/Magnum/Math/Test/DualComplexTest.cpp +++ b/src/Magnum/Math/Test/DualComplexTest.cpp @@ -397,9 +397,7 @@ void DualComplexTest::invertedNormalized() { } void DualComplexTest::invertedNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -461,9 +459,7 @@ void DualComplexTest::matrix() { } void DualComplexTest::matrixNotOrthogonal() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream o; Error redirectError{&o}; diff --git a/src/Magnum/Math/Test/DualQuaternionTest.cpp b/src/Magnum/Math/Test/DualQuaternionTest.cpp index 80c84f10f..e8dc87d66 100644 --- a/src/Magnum/Math/Test/DualQuaternionTest.cpp +++ b/src/Magnum/Math/Test/DualQuaternionTest.cpp @@ -434,9 +434,7 @@ void DualQuaternionTest::invertedNormalized() { } void DualQuaternionTest::invertedNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -464,9 +462,7 @@ void DualQuaternionTest::rotation() { } void DualQuaternionTest::rotationNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -520,9 +516,7 @@ void DualQuaternionTest::matrix() { } void DualQuaternionTest::matrixNotOrthogonal() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -559,9 +553,7 @@ void DualQuaternionTest::transformVectorNormalized() { } void DualQuaternionTest::transformVectorNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -605,9 +597,7 @@ void DualQuaternionTest::transformPointNormalized() { } void DualQuaternionTest::transformPointNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/FrustumTest.cpp b/src/Magnum/Math/Test/FrustumTest.cpp index 8bea6e78f..950cacc38 100644 --- a/src/Magnum/Math/Test/FrustumTest.cpp +++ b/src/Magnum/Math/Test/FrustumTest.cpp @@ -349,9 +349,7 @@ void FrustumTest::data() { } void FrustumTest::dataOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Frustum a; constexpr Frustum ca; diff --git a/src/Magnum/Math/Test/FunctionsTest.cpp b/src/Magnum/Math/Test/FunctionsTest.cpp index 5e5ebeb5f..c110c92f2 100644 --- a/src/Magnum/Math/Test/FunctionsTest.cpp +++ b/src/Magnum/Math/Test/FunctionsTest.cpp @@ -323,9 +323,7 @@ void FunctionsTest::binomialCoefficient() { } void FunctionsTest::binomialCoefficientInvalidInput() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -334,9 +332,7 @@ void FunctionsTest::binomialCoefficientInvalidInput() { } void FunctionsTest::binomialCoefficientOverflow() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -520,9 +516,7 @@ void FunctionsTest::reflect() { } void FunctionsTest::reflectNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -549,9 +543,7 @@ void FunctionsTest::refract() { } void FunctionsTest::refractNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/IntersectionTest.cpp b/src/Magnum/Math/Test/IntersectionTest.cpp index b0138f404..a66fbc7f1 100644 --- a/src/Magnum/Math/Test/IntersectionTest.cpp +++ b/src/Magnum/Math/Test/IntersectionTest.cpp @@ -460,9 +460,7 @@ void IntersectionTest::sphereConeView() { } void IntersectionTest::sphereConeViewNotRigid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/Matrix3Test.cpp b/src/Magnum/Math/Test/Matrix3Test.cpp index 28395adbf..63584fd4f 100644 --- a/src/Magnum/Math/Test/Matrix3Test.cpp +++ b/src/Magnum/Math/Test/Matrix3Test.cpp @@ -372,9 +372,7 @@ void Matrix3Test::reflection() { } void Matrix3Test::reflectionNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -502,9 +500,7 @@ void Matrix3Test::rotationPart() { } void Matrix3Test::rotationPartNotOrthogonal() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -556,9 +552,7 @@ void Matrix3Test::rotationNormalizedPart() { } void Matrix3Test::rotationNormalizedPartNotOrthogonal() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -620,9 +614,7 @@ void Matrix3Test::uniformScalingPart() { } void Matrix3Test::uniformScalingPartNotUniform() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -668,9 +660,7 @@ void Matrix3Test::invertedRigid() { } void Matrix3Test::invertedRigidNotRigid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/Matrix4Test.cpp b/src/Magnum/Math/Test/Matrix4Test.cpp index 446a1c2ff..47bff862f 100644 --- a/src/Magnum/Math/Test/Matrix4Test.cpp +++ b/src/Magnum/Math/Test/Matrix4Test.cpp @@ -421,9 +421,7 @@ void Matrix4Test::rotation() { } void Matrix4Test::rotationNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -473,9 +471,7 @@ void Matrix4Test::reflection() { } void Matrix4Test::reflectionNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -737,9 +733,7 @@ void Matrix4Test::rotationPart() { } void Matrix4Test::rotationPartNotOrthogonal() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -799,9 +793,7 @@ void Matrix4Test::rotationNormalizedPart() { } void Matrix4Test::rotationNormalizedPartNotOrthogonal() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -864,9 +856,7 @@ void Matrix4Test::uniformScalingPart() { } void Matrix4Test::uniformScalingPartNotUniform() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; Matrix4::scaling(Vector3::yScale(3.0f)).uniformScaling(); @@ -999,9 +989,7 @@ void Matrix4Test::invertedRigid() { } void Matrix4Test::invertedRigidNotRigid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/MatrixTest.cpp b/src/Magnum/Math/Test/MatrixTest.cpp index d1f8cd9c1..9ea8c89bd 100644 --- a/src/Magnum/Math/Test/MatrixTest.cpp +++ b/src/Magnum/Math/Test/MatrixTest.cpp @@ -407,9 +407,7 @@ void MatrixTest::invertedOrthogonal() { } void MatrixTest::invertedOrthogonalNotOrthogonal() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream o; Error redirectError{&o}; diff --git a/src/Magnum/Math/Test/PackingBatchTest.cpp b/src/Magnum/Math/Test/PackingBatchTest.cpp index 641efa867..87f5a0c98 100644 --- a/src/Magnum/Math/Test/PackingBatchTest.cpp +++ b/src/Magnum/Math/Test/PackingBatchTest.cpp @@ -638,9 +638,7 @@ void PackingBatchTest::castFloatDouble() { } template void PackingBatchTest::assertionsPackUnpack() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Math::Vector2 data[2]{}; Vector2 resultWrongCount[1]{}; @@ -674,9 +672,7 @@ template void PackingBatchTest::assertionsPackUnpack() { } void PackingBatchTest::assertionsPackUnpackHalf() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2us data[2]{}; Vector2 resultWrongCount[1]{}; @@ -710,9 +706,7 @@ void PackingBatchTest::assertionsPackUnpackHalf() { } template void PackingBatchTest::assertionsCast() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); setTestCaseTemplateName({TypeTraits::name(), TypeTraits::name()}); diff --git a/src/Magnum/Math/Test/QuaternionTest.cpp b/src/Magnum/Math/Test/QuaternionTest.cpp index 4b36c918e..7db81c627 100644 --- a/src/Magnum/Math/Test/QuaternionTest.cpp +++ b/src/Magnum/Math/Test/QuaternionTest.cpp @@ -370,9 +370,7 @@ void QuaternionTest::axisAngle() { } void QuaternionTest::axisAngleNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -472,9 +470,7 @@ void QuaternionTest::invertedNormalized() { } void QuaternionTest::invertedNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -504,9 +500,7 @@ void QuaternionTest::rotation() { } void QuaternionTest::rotationNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -548,9 +542,7 @@ void QuaternionTest::angleNormalizedButOver1() { } void QuaternionTest::angleNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -613,9 +605,7 @@ void QuaternionTest::matrix() { } void QuaternionTest::matrixNotRotation() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -659,9 +649,7 @@ void QuaternionTest::euler() { } void QuaternionTest::eulerNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -698,9 +686,7 @@ void QuaternionTest::lerp2D() { } void QuaternionTest::lerpNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -732,9 +718,7 @@ void QuaternionTest::lerpShortestPath() { } void QuaternionTest::lerpShortestPathNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -819,9 +803,7 @@ void QuaternionTest::slerpNormalizedButOver1() { } void QuaternionTest::slerpNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -882,9 +864,7 @@ template void QuaternionTest::slerpShortestPathLinearFallbackIsNormaliz } void QuaternionTest::slerpShortestPathNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -918,9 +898,7 @@ void QuaternionTest::transformVectorNormalized() { } void QuaternionTest::transformVectorNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Math/Test/VectorTest.cpp b/src/Magnum/Math/Test/VectorTest.cpp index e79c695c1..5bee04396 100644 --- a/src/Magnum/Math/Test/VectorTest.cpp +++ b/src/Magnum/Math/Test/VectorTest.cpp @@ -570,9 +570,7 @@ void VectorTest::projectedOntoNormalized() { } void VectorTest::projectedOntoNormalizedNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector3 vector(1.0f, 2.0f, 3.0f); Vector3 line(1.0f, -1.0f, 0.5f); @@ -617,9 +615,7 @@ void VectorTest::angleNormalizedButOver1() { } void VectorTest::angleNotNormalized() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp index c9cdc362b..7ab1b31c7 100644 --- a/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp +++ b/src/Magnum/MeshTools/Test/CombineIndexedArraysTest.cpp @@ -51,9 +51,7 @@ CombineIndexedArraysTest::CombineIndexedArraysTest() { CORRADE_IGNORE_DEPRECATED_PUSH void CombineIndexedArraysTest::wrongIndexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream ss; Error redirectError{&ss}; diff --git a/src/Magnum/MeshTools/Test/CombineTest.cpp b/src/Magnum/MeshTools/Test/CombineTest.cpp index 74f70ee30..0f40e4639 100644 --- a/src/Magnum/MeshTools/Test/CombineTest.cpp +++ b/src/Magnum/MeshTools/Test/CombineTest.cpp @@ -186,9 +186,7 @@ void CombineTest::combineIndexedAttributesSingleMesh() { } void CombineTest::combineIndexedAttributesNoMeshes() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -197,9 +195,7 @@ void CombineTest::combineIndexedAttributesNoMeshes() { } void CombineTest::combineIndexedAttributesNotIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort indices[5]{}; Trade::MeshData a{MeshPrimitive::Lines, @@ -215,9 +211,7 @@ void CombineTest::combineIndexedAttributesNotIndexed() { } void CombineTest::combineIndexedAttributesDifferentPrimitive() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort indices[5]{}; Trade::MeshData a{MeshPrimitive::Lines, @@ -232,9 +226,7 @@ void CombineTest::combineIndexedAttributesDifferentPrimitive() { } void CombineTest::combineIndexedAttributesDifferentIndexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort indices[5]{}; Trade::MeshData a{MeshPrimitive::Lines, @@ -252,9 +244,7 @@ void CombineTest::combineIndexedAttributesDifferentIndexCount() { } void CombineTest::combineIndexedAttributesImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData a{MeshPrimitive::Points, nullptr, Trade::MeshIndexData{MeshIndexType::UnsignedShort, nullptr}, @@ -274,9 +264,7 @@ void CombineTest::combineIndexedAttributesImplementationSpecificIndexType() { } void CombineTest::combineIndexedAttributesImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData a{MeshPrimitive::Points, nullptr, Trade::MeshIndexData{MeshIndexType::UnsignedShort, nullptr}, @@ -420,9 +408,7 @@ void CombineTest::combineFaceAttributes() { } void CombineTest::combineFaceAttributesMeshNotIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const Trade::MeshData mesh{MeshPrimitive::Triangles, 3}; const Trade::MeshData faceAttributes{MeshPrimitive::Faces, 0}; @@ -435,9 +421,7 @@ void CombineTest::combineFaceAttributesMeshNotIndexed() { } void CombineTest::combineFaceAttributesUnexpectedPrimitive() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedInt indices[] { 0, 0, 0 }; const Trade::MeshData a{MeshPrimitive::Triangles, @@ -457,9 +441,7 @@ void CombineTest::combineFaceAttributesUnexpectedPrimitive() { } void CombineTest::combineFaceAttributesUnexpectedFaceCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedInt indices[] { 0, 0, 0 }; const Trade::MeshData mesh{MeshPrimitive::Triangles, @@ -474,9 +456,7 @@ void CombineTest::combineFaceAttributesUnexpectedFaceCount() { } void CombineTest::combineFaceAttributesImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData triangles{MeshPrimitive::Triangles, nullptr, Trade::MeshIndexData{MeshIndexType::UnsignedShort, nullptr}, @@ -510,9 +490,7 @@ void CombineTest::combineFaceAttributesImplementationSpecificIndexType() { } void CombineTest::combineFaceAttributesImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData triangles{MeshPrimitive::Triangles, nullptr, Trade::MeshIndexData{MeshIndexType::UnsignedShort, nullptr}, @@ -552,9 +530,7 @@ void CombineTest::combineFaceAttributesImplementationSpecificVertexFormat() { } void CombineTest::combineFaceAttributesFacesNotInterleaved() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); using namespace Math::Literals; @@ -584,9 +560,7 @@ void CombineTest::combineFaceAttributesFacesNotInterleaved() { } void CombineTest::combineFaceAttributesFaceAttributeOffsetOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/MeshTools/Test/CompileGLTest.cpp b/src/Magnum/MeshTools/Test/CompileGLTest.cpp index ca78aafbf..ae85bfb11 100644 --- a/src/Magnum/MeshTools/Test/CompileGLTest.cpp +++ b/src/Magnum/MeshTools/Test/CompileGLTest.cpp @@ -1177,9 +1177,7 @@ void CompileGLTest::packedAttributes() { } void CompileGLTest::unsupportedIndexStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedShort indices[2]{}; Trade::MeshData data{MeshPrimitive::Points, @@ -1234,9 +1232,7 @@ void CompileGLTest::unsupportedAttribute() { } void CompileGLTest::unsupportedAttributeStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector3 data[2]{}; Trade::MeshData zero{MeshPrimitive::Points, {}, data, { @@ -1274,9 +1270,7 @@ void CompileGLTest::implementationSpecificAttributeFormat() { } void CompileGLTest::generateNormalsNoPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Triangles, 1}; @@ -1288,9 +1282,7 @@ void CompileGLTest::generateNormalsNoPosition() { } void CompileGLTest::generateNormals2DPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Triangles, nullptr, {Trade::MeshAttributeData{Trade::MeshAttribute::Position, @@ -1304,9 +1296,7 @@ void CompileGLTest::generateNormals2DPosition() { } void CompileGLTest::generateNormalsNoFloats() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Triangles, nullptr, { @@ -1406,9 +1396,7 @@ void CompileGLTest::externalBuffers() { } void CompileGLTest::externalBuffersInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Triangles, 5}; Trade::MeshData indexedData{MeshPrimitive::Triangles, diff --git a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp index 7d87c6d93..5334e0e8e 100644 --- a/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp +++ b/src/Magnum/MeshTools/Test/CompressIndicesTest.cpp @@ -212,9 +212,7 @@ template void CompressIndicesTest::compressOffsetNegative() { } void CompressIndicesTest::compressErasedNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char indices[6*4]{}; @@ -226,9 +224,7 @@ void CompressIndicesTest::compressErasedNonContiguous() { } void CompressIndicesTest::compressErasedWrongIndexSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char indices[6*3]{}; @@ -343,9 +339,7 @@ void CompressIndicesTest::compressMeshDataMove() { } void CompressIndicesTest::compressMeshDataNonIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::TriangleFan, 5}; @@ -360,9 +354,7 @@ void CompressIndicesTest::compressMeshDataNonIndexed() { } void CompressIndicesTest::compressMeshDataImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, Trade::MeshIndexData{meshIndexTypeWrap(0xcaca), Containers::StridedArrayView1D{}}, 1}; @@ -378,9 +370,7 @@ void CompressIndicesTest::compressMeshDataImplementationSpecificIndexType() { } void CompressIndicesTest::compressMeshDataImplementationSpecificAtLeastIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt indices[5]{}; Trade::MeshData mesh{MeshPrimitive::Points, @@ -395,9 +385,7 @@ void CompressIndicesTest::compressMeshDataImplementationSpecificAtLeastIndexType #ifdef MAGNUM_BUILD_DEPRECATED void CompressIndicesTest::compressAsShort() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_IGNORE_DEPRECATED_PUSH CORRADE_COMPARE_AS(MeshTools::compressIndicesAs({123, 456}), diff --git a/src/Magnum/MeshTools/Test/ConcatenateTest.cpp b/src/Magnum/MeshTools/Test/ConcatenateTest.cpp index 48cd1ac02..d2090818f 100644 --- a/src/Magnum/MeshTools/Test/ConcatenateTest.cpp +++ b/src/Magnum/MeshTools/Test/ConcatenateTest.cpp @@ -398,9 +398,7 @@ void ConcatenateTest::concatenateOne() { } void ConcatenateTest::concatenateNone() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -577,9 +575,7 @@ void ConcatenateTest::concatenateIntoNonOwnedAttributeArray() { } void ConcatenateTest::concatenateUnsupportedPrimitive() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData a{MeshPrimitive::TriangleStrip, 0}; @@ -593,9 +589,7 @@ void ConcatenateTest::concatenateUnsupportedPrimitive() { } void ConcatenateTest::concatenateInconsistentPrimitive() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Things are a bit duplicated to test correct numbering */ Trade::MeshData a{MeshPrimitive::Triangles, 0}; @@ -611,9 +605,7 @@ void ConcatenateTest::concatenateInconsistentPrimitive() { } void ConcatenateTest::concatenateInconsistentAttributeFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Things are a bit duplicated to test correct numbering */ Trade::MeshData a{MeshPrimitive::Lines, nullptr, { @@ -641,9 +633,7 @@ void ConcatenateTest::concatenateInconsistentAttributeFormat() { } void ConcatenateTest::concatenateInconsistentAttributeArraySize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Things are a bit duplicated to test correct numbering */ Trade::MeshData a{MeshPrimitive::Lines, nullptr, { @@ -671,9 +661,7 @@ void ConcatenateTest::concatenateInconsistentAttributeArraySize() { } void ConcatenateTest::concatenateImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Things are a bit duplicated to test correct numbering */ Trade::MeshData a{MeshPrimitive::Lines, nullptr, { @@ -707,9 +695,7 @@ void ConcatenateTest::concatenateImplementationSpecificIndexType() { } void ConcatenateTest::concatenateImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Things are a bit duplicated to test correct numbering */ Trade::MeshData a{MeshPrimitive::Lines, nullptr, { @@ -737,9 +723,7 @@ void ConcatenateTest::concatenateImplementationSpecificVertexFormat() { } void ConcatenateTest::concatenateIntoNoMeshes() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData destination{MeshPrimitive::Triangles, 0}; diff --git a/src/Magnum/MeshTools/Test/DuplicateTest.cpp b/src/Magnum/MeshTools/Test/DuplicateTest.cpp index 42429287f..e0d627d7d 100644 --- a/src/Magnum/MeshTools/Test/DuplicateTest.cpp +++ b/src/Magnum/MeshTools/Test/DuplicateTest.cpp @@ -115,9 +115,7 @@ void DuplicateTest::duplicate() { } void DuplicateTest::duplicateOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); constexpr UnsignedByte indices[]{1, 1, 0, 4, 2, 2}; constexpr Int data[]{-7, 35, 12, -18}; @@ -151,9 +149,7 @@ void DuplicateTest::duplicateInto() { } void DuplicateTest::duplicateIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); constexpr UnsignedByte indices[]{1, 1, 0, 3, 2, 2}; constexpr Int data[]{-7, 35, 12, -18}; @@ -184,9 +180,7 @@ template void DuplicateTest::duplicateIntoErased() { } void DuplicateTest::duplicateIntoErasedWrongTypeSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); constexpr UnsignedByte indices[]{1, 1, 0, 3, 2, 2}; constexpr Int data[]{-7, 35, 12, -18}; @@ -204,9 +198,7 @@ void DuplicateTest::duplicateIntoErasedWrongTypeSize() { } void DuplicateTest::duplicateIntoErasedNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); constexpr UnsignedByte indices[]{1, 1, 0, 3, 2, 2}; constexpr Int data[]{-7, 35, 12, -18}; @@ -240,9 +232,7 @@ template void DuplicateTest::duplicateErasedIndicesIntoErased() { } void DuplicateTest::duplicateErasedIndicesIntoErasedWrongTypeSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); constexpr char indices[6*3]{}; constexpr Int data[]{-7, 35, 12, -18}; @@ -260,9 +250,7 @@ void DuplicateTest::duplicateErasedIndicesIntoErasedWrongTypeSize() { } void DuplicateTest::duplicateErasedIndicesIntoErasedNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); constexpr char indices[3*6]{}; constexpr Int data[]{-7, 35, 12, -18}; @@ -322,9 +310,7 @@ template void DuplicateTest::duplicateMeshData() { } void DuplicateTest::duplicateMeshDataNotIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -333,9 +319,7 @@ void DuplicateTest::duplicateMeshDataNotIndexed() { } void DuplicateTest::duplicateMeshDataImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData a{MeshPrimitive::Lines, nullptr, Trade::MeshIndexData{meshIndexTypeWrap(0xcaca), Containers::StridedArrayView1D{}}, @@ -351,9 +335,7 @@ void DuplicateTest::duplicateMeshDataImplementationSpecificIndexType() { } void DuplicateTest::duplicateMeshDataImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData a{MeshPrimitive::Lines, nullptr, Trade::MeshIndexData{MeshIndexType::UnsignedShort, nullptr}, @@ -437,9 +419,7 @@ void DuplicateTest::duplicateMeshDataExtraEmpty() { } void DuplicateTest::duplicateMeshDataExtraWrongCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedByte indices[]{0, 1, 2, 2, 1, 0}; Vector2 positions[]{{1.3f, 0.3f}, {0.87f, 1.1f}, {1.0f, -0.5f}}; @@ -460,9 +440,7 @@ void DuplicateTest::duplicateMeshDataExtraWrongCount() { } void DuplicateTest::duplicateMeshDataExtraOffsetOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedByte indices[]{0, 1, 2, 2, 1, 0}; Trade::MeshData data{MeshPrimitive::TriangleFan, @@ -478,9 +456,7 @@ void DuplicateTest::duplicateMeshDataExtraOffsetOnly() { } void DuplicateTest::duplicateMeshDataExtraImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData a{MeshPrimitive::Lines, nullptr, Trade::MeshIndexData{MeshIndexType::UnsignedShort, nullptr}, diff --git a/src/Magnum/MeshTools/Test/FilterAttributesTest.cpp b/src/Magnum/MeshTools/Test/FilterAttributesTest.cpp index d058f2b8a..7d8d2c60c 100644 --- a/src/Magnum/MeshTools/Test/FilterAttributesTest.cpp +++ b/src/Magnum/MeshTools/Test/FilterAttributesTest.cpp @@ -256,9 +256,7 @@ void FilterAttributesTest::filterOnlyAttributeIds() { } void FilterAttributesTest::filterOnlyAttributeIdsOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* GCC 4.8 dies if I try to initialize this with a {}. I won't, then. */ Vertex vertices[3]; @@ -491,9 +489,7 @@ void FilterAttributesTest::filterExceptAttributeIds() { } void FilterAttributesTest::filterExceptAttributeIdsOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* GCC 4.8 dies if I try to initialize this with a {}. I won't, then. */ Vertex vertices[3]; diff --git a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp index 2f9f14bb0..494c6fa52 100644 --- a/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp +++ b/src/Magnum/MeshTools/Test/FlipNormalsTest.cpp @@ -71,9 +71,7 @@ FlipNormalsTest::FlipNormalsTest() { } void FlipNormalsTest::wrongIndexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream ss; Error redirectError{&ss}; @@ -107,9 +105,7 @@ template void FlipNormalsTest::flipFaceWindingErased() { } void FlipNormalsTest::flipFaceWindingErasedNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char indices[6*4]{}; @@ -121,9 +117,7 @@ void FlipNormalsTest::flipFaceWindingErasedNonContiguous() { } void FlipNormalsTest::flipFaceWindingErasedWrongIndexSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char indices[6*3]{}; diff --git a/src/Magnum/MeshTools/Test/GenerateIndicesTest.cpp b/src/Magnum/MeshTools/Test/GenerateIndicesTest.cpp index b653a9e47..9c33a6a47 100644 --- a/src/Magnum/MeshTools/Test/GenerateIndicesTest.cpp +++ b/src/Magnum/MeshTools/Test/GenerateIndicesTest.cpp @@ -228,9 +228,7 @@ void GenerateIndicesTest::primitiveCount() { } void GenerateIndicesTest::primitiveCountInvalidPrimitive() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -267,9 +265,7 @@ void GenerateIndicesTest::generateLineStripIndices() { } void GenerateIndicesTest::generateLineStripIndicesWrongVertexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -279,9 +275,7 @@ void GenerateIndicesTest::generateLineStripIndicesWrongVertexCount() { } void GenerateIndicesTest::generateLineStripIndicesIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt indices[7]; @@ -323,9 +317,7 @@ void GenerateIndicesTest::generateLineLoopIndices() { } void GenerateIndicesTest::generateLineLoopIndicesWrongVertexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -335,9 +327,7 @@ void GenerateIndicesTest::generateLineLoopIndicesWrongVertexCount() { } void GenerateIndicesTest::generateLineLoopIndicesIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt indices[9]; @@ -378,9 +368,7 @@ void GenerateIndicesTest::generateTriangleStripIndices() { } void GenerateIndicesTest::generateTriangleStripIndicesWrongVertexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -390,9 +378,7 @@ void GenerateIndicesTest::generateTriangleStripIndicesWrongVertexCount() { } void GenerateIndicesTest::generateTriangleStripIndicesIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt indices[8]; @@ -433,9 +419,7 @@ void GenerateIndicesTest::generateTriangleFanIndices() { } void GenerateIndicesTest::generateTriangleFanIndicesWrongVertexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -445,9 +429,7 @@ void GenerateIndicesTest::generateTriangleFanIndicesWrongVertexCount() { } void GenerateIndicesTest::generateTriangleFanIndicesIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt indices[8]; @@ -561,9 +543,7 @@ template void GenerateIndicesTest::generateQuadIndicesInto() { } void GenerateIndicesTest::generateQuadIndicesWrongIndexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt quads[13]; @@ -575,9 +555,7 @@ void GenerateIndicesTest::generateQuadIndicesWrongIndexCount() { } void GenerateIndicesTest::generateQuadIndicesIndexOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt quads[]{5, 4, 6, 7}; Vector3 positions[7]; @@ -590,9 +568,7 @@ void GenerateIndicesTest::generateQuadIndicesIndexOutOfBounds() { } void GenerateIndicesTest::generateQuadIndicesIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt quads[12]; UnsignedInt output[19]; @@ -717,9 +693,7 @@ void GenerateIndicesTest::generateIndicesMeshDataMove() { } void GenerateIndicesTest::generateIndicesMeshDataIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedByte indices[]{0}; Trade::MeshData mesh{MeshPrimitive::TriangleFan, @@ -737,9 +711,7 @@ void GenerateIndicesTest::generateIndicesMeshDataIndexed() { } void GenerateIndicesTest::generateIndicesMeshDataInvalidPrimitive() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Triangles, 2}; diff --git a/src/Magnum/MeshTools/Test/GenerateNormalsTest.cpp b/src/Magnum/MeshTools/Test/GenerateNormalsTest.cpp index 733c4b7b9..76de1a99e 100644 --- a/src/Magnum/MeshTools/Test/GenerateNormalsTest.cpp +++ b/src/Magnum/MeshTools/Test/GenerateNormalsTest.cpp @@ -154,9 +154,7 @@ void GenerateNormalsTest::flatDeprecated() { #endif void GenerateNormalsTest::flatWrongCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -167,9 +165,7 @@ void GenerateNormalsTest::flatWrongCount() { } void GenerateNormalsTest::flatIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -395,9 +391,7 @@ void GenerateNormalsTest::smoothNanPosition() { } void GenerateNormalsTest::smoothWrongCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -409,9 +403,7 @@ void GenerateNormalsTest::smoothWrongCount() { } void GenerateNormalsTest::smoothOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -423,9 +415,7 @@ void GenerateNormalsTest::smoothOutOfBounds() { } void GenerateNormalsTest::smoothIntoWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -477,9 +467,7 @@ template void GenerateNormalsTest::smoothErased() { } void GenerateNormalsTest::smoothErasedNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char indices[6*4]{}; const Vector3 positions[3]; @@ -492,9 +480,7 @@ void GenerateNormalsTest::smoothErasedNonContiguous() { } void GenerateNormalsTest::smoothErasedWrongIndexSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char indices[6*3]{}; const Vector3 positions[3]; diff --git a/src/Magnum/MeshTools/Test/InterleaveTest.cpp b/src/Magnum/MeshTools/Test/InterleaveTest.cpp index 72022aea2..da19bd1f9 100644 --- a/src/Magnum/MeshTools/Test/InterleaveTest.cpp +++ b/src/Magnum/MeshTools/Test/InterleaveTest.cpp @@ -207,9 +207,7 @@ void InterleaveTest::attributeCountGaps() { } void InterleaveTest::attributeCountInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream ss; Error redirectError{&ss}; @@ -531,9 +529,7 @@ void InterleaveTest::interleavedDataNoVertices() { } void InterleaveTest::interleavedDataNotInterleaved() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{100 + 3*20}; auto positions = Containers::arrayCast(vertexData.exceptPrefix(100).prefix(3*8)); @@ -622,9 +618,7 @@ void InterleaveTest::interleavedDataVertexDataWholeMemory() { } void InterleaveTest::interleavedMutableDataNotMutable() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char a[1]; Trade::MeshData data{MeshPrimitive::Lines, {}, a, {}, 15}; @@ -781,9 +775,7 @@ void InterleaveTest::interleavedLayout() { } void InterleaveTest::interleavedLayoutImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -871,9 +863,7 @@ void InterleaveTest::interleavedLayoutExtraAliased() { } void InterleaveTest::interleavedLayoutExtraTooNegativePadding() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*12}; Trade::MeshAttributeData positions{Trade::MeshAttribute::Position, @@ -916,9 +906,7 @@ void InterleaveTest::interleavedLayoutExtraOnly() { } void InterleaveTest::interleavedLayoutExtraImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -1232,9 +1220,7 @@ void InterleaveTest::interleaveMeshDataIndexed() { } void InterleaveTest::interleaveMeshDataImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Points, nullptr, Trade::MeshIndexData{meshIndexTypeWrap(0xcaca), Containers::StridedArrayView1D{}}, @@ -1249,9 +1235,7 @@ void InterleaveTest::interleaveMeshDataImplementationSpecificIndexType() { } void InterleaveTest::interleaveMeshDataImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -1337,9 +1321,7 @@ void InterleaveTest::interleaveMeshDataExtraOriginalEmpty() { } void InterleaveTest::interleaveMeshDataExtraWrongCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2 positions[]{{1.3f, 0.3f}, {0.87f, 1.1f}, {1.0f, -0.5f}}; Trade::MeshData data{MeshPrimitive::TriangleFan, @@ -1358,9 +1340,7 @@ void InterleaveTest::interleaveMeshDataExtraWrongCount() { } void InterleaveTest::interleaveMeshDataExtraOffsetOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::TriangleFan, 5}; @@ -1374,9 +1354,7 @@ void InterleaveTest::interleaveMeshDataExtraOffsetOnly() { } void InterleaveTest::interleaveMeshDataExtraImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData data{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, diff --git a/src/Magnum/MeshTools/Test/ReferenceTest.cpp b/src/Magnum/MeshTools/Test/ReferenceTest.cpp index 805917c2b..d556609bf 100644 --- a/src/Magnum/MeshTools/Test/ReferenceTest.cpp +++ b/src/Magnum/MeshTools/Test/ReferenceTest.cpp @@ -212,9 +212,7 @@ void ReferenceTest::mutableReferenceNoIndexVertexAttributeData() { } void ReferenceTest::mutableReferenceNotMutable() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData cube = Primitives::cubeSolid(); CORRADE_COMPARE(cube.indexDataFlags(), Trade::DataFlags{}); diff --git a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp index 293f58b36..7aab3d6bd 100644 --- a/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp +++ b/src/Magnum/MeshTools/Test/RemoveDuplicatesTest.cpp @@ -254,9 +254,7 @@ void RemoveDuplicatesTest::removeDuplicates() { } void RemoveDuplicatesTest::removeDuplicatesNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Int data[8]{}; @@ -270,9 +268,7 @@ void RemoveDuplicatesTest::removeDuplicatesNonContiguous() { } void RemoveDuplicatesTest::removeDuplicatesIntoWrongOutputSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Int data[8]{}; UnsignedInt output[7]; @@ -307,9 +303,7 @@ template void RemoveDuplicatesTest::removeDuplicatesIndexedInPlace() { } void RemoveDuplicatesTest::removeDuplicatesIndexedInPlaceSmallType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -356,9 +350,7 @@ template void RemoveDuplicatesTest::removeDuplicatesIndexedInPlaceErase } void RemoveDuplicatesTest::removeDuplicatesIndexedInPlaceErasedNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char indices[6*4]{}; Int data[1]{}; @@ -373,9 +365,7 @@ void RemoveDuplicatesTest::removeDuplicatesIndexedInPlaceErasedNonContiguous() { } void RemoveDuplicatesTest::removeDuplicatesIndexedInPlaceErasedWrongIndexSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char indices[6*3]{}; Int data[1]{}; @@ -463,9 +453,7 @@ template void RemoveDuplicatesTest::removeDuplicatesFuzzyInPlaceInto() } void RemoveDuplicatesTest::removeDuplicatesFuzzyInPlaceIntoWrongOutputSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2 data[8]{}; UnsignedInt output[7]; @@ -525,9 +513,7 @@ template void RemoveDuplicatesTest::removeDuplicatesFu } void RemoveDuplicatesTest::removeDuplicatesFuzzyIndexedInPlaceSmallType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -586,9 +572,7 @@ template void RemoveDuplicatesTest::removeDuplicatesFu } void RemoveDuplicatesTest::removeDuplicatesFuzzyIndexedInPlaceErasedNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char indices[6*4]{}; Vector2 data[1]; @@ -603,9 +587,7 @@ void RemoveDuplicatesTest::removeDuplicatesFuzzyIndexedInPlaceErasedNonContiguou } void RemoveDuplicatesTest::removeDuplicatesFuzzyIndexedInPlaceErasedWrongIndexSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char indices[6*3]{}; Vector2 data[1]; @@ -815,9 +797,7 @@ void RemoveDuplicatesTest::removeDuplicatesMeshDataPaddedAttributes() { } void RemoveDuplicatesTest::removeDuplicatesMeshDataAttributeless() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -827,9 +807,7 @@ void RemoveDuplicatesTest::removeDuplicatesMeshDataAttributeless() { } void RemoveDuplicatesTest::removeDuplicatesMeshDataImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -843,9 +821,7 @@ void RemoveDuplicatesTest::removeDuplicatesMeshDataImplementationSpecificIndexTy } void RemoveDuplicatesTest::removeDuplicatesMeshDataImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1164,9 +1140,7 @@ void RemoveDuplicatesTest::removeDuplicatesMeshDataFuzzyDouble() { } void RemoveDuplicatesTest::removeDuplicatesMeshDataFuzzyAttributeless() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1176,9 +1150,7 @@ void RemoveDuplicatesTest::removeDuplicatesMeshDataFuzzyAttributeless() { } void RemoveDuplicatesTest::removeDuplicatesMeshDataFuzzyImplementationSpecificIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1192,9 +1164,7 @@ void RemoveDuplicatesTest::removeDuplicatesMeshDataFuzzyImplementationSpecificIn } void RemoveDuplicatesTest::removeDuplicatesMeshDataFuzzyImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/MeshTools/Test/SubdivideTest.cpp b/src/Magnum/MeshTools/Test/SubdivideTest.cpp index 04baf138d..6ca95c9ca 100644 --- a/src/Magnum/MeshTools/Test/SubdivideTest.cpp +++ b/src/Magnum/MeshTools/Test/SubdivideTest.cpp @@ -109,9 +109,7 @@ void SubdivideTest::subdivideStl() { #endif void SubdivideTest::subdivideWrongIndexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -139,9 +137,7 @@ template void SubdivideTest::subdivideInPlace() { } void SubdivideTest::subdivideInPlaceWrongIndexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; @@ -154,9 +150,7 @@ void SubdivideTest::subdivideInPlaceWrongIndexCount() { } void SubdivideTest::subdivideInPlaceSmallIndexType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::stringstream out; Error redirectError{&out}; diff --git a/src/Magnum/MeshTools/Test/TransformTest.cpp b/src/Magnum/MeshTools/Test/TransformTest.cpp index 8faac5150..88b303e92 100644 --- a/src/Magnum/MeshTools/Test/TransformTest.cpp +++ b/src/Magnum/MeshTools/Test/TransformTest.cpp @@ -482,9 +482,7 @@ template void TransformTest::meshData2D() { } void TransformTest::meshData2DNoPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -497,9 +495,7 @@ void TransformTest::meshData2DNoPosition() { } void TransformTest::meshData2DNot2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector3, nullptr} @@ -535,9 +531,7 @@ void TransformTest::meshData2DImplementationSpecificIndexType() { } void TransformTest::meshData2DImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -702,9 +696,7 @@ void TransformTest::meshData2DRvaluePassthroughVertexDataNotOwned() { } void TransformTest::meshData2DRvaluePassthroughNoPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Mainly to verify there's no other accidental assertion from checking vertex format, this message comes from the l-value overload */ @@ -749,9 +741,7 @@ void TransformTest::meshData2DRvaluePassthroughWrongFormat() { } void TransformTest::meshData2DInPlaceNotMutable() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, Trade::DataFlags{}, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -764,9 +754,7 @@ void TransformTest::meshData2DInPlaceNotMutable() { } void TransformTest::meshData2DInPlaceNoPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -779,9 +767,7 @@ void TransformTest::meshData2DInPlaceNoPosition() { } void TransformTest::meshData2DInPlaceWrongFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr}, @@ -921,9 +907,7 @@ template void TransformTest::meshData3D() { } void TransformTest::meshData3DNoPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector3, nullptr}, @@ -936,9 +920,7 @@ void TransformTest::meshData3DNoPosition() { } void TransformTest::meshData3DNot3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector2, nullptr} @@ -977,9 +959,7 @@ void TransformTest::meshData3DImplementationSpecificVertexFormat() { auto&& data = MeshData3DIMplementationSpecificVertexFormatData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector3, nullptr}, @@ -1204,9 +1184,7 @@ void TransformTest::meshData3DRvaluePassthroughVertexDataNotOwned() { } void TransformTest::meshData3DRvaluePassthroughNoPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Mainly to verify there's no other accidental assertion from checking vertex format, this message comes from the l-value overload */ @@ -1306,9 +1284,7 @@ void TransformTest::meshData3DRvaluePassthroughWrongFormat() { } void TransformTest::meshData3DInPlaceNotMutable() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, Trade::DataFlags{}, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector3, nullptr}, @@ -1321,9 +1297,7 @@ void TransformTest::meshData3DInPlaceNotMutable() { } void TransformTest::meshData3DInPlaceNoPosition() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::Position, VertexFormat::Vector3, nullptr}, @@ -1336,9 +1310,7 @@ void TransformTest::meshData3DInPlaceNoPosition() { } void TransformTest::meshData3DInPlaceWrongFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); auto&& data = MeshData3DWrongFormatData[testCaseInstanceId()]; setTestCaseDescription(data.name); @@ -1426,9 +1398,7 @@ template void TransformTest::meshDataTextureCoordinates2D() { } void TransformTest::meshDataTextureCoordinates2DNoCoordinates() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::TextureCoordinates, VertexFormat::Vector2, nullptr}, @@ -1464,9 +1434,7 @@ void TransformTest::meshDataTextureCoordinates2DImplementationSpecificIndexType( } void TransformTest::meshDataTextureCoordinates2DImplementationSpecificVertexFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::TextureCoordinates, VertexFormat::Vector2, nullptr}, @@ -1631,9 +1599,7 @@ void TransformTest::meshDataTextureCoordinates2DRvaluePassthroughVertexDataNotOw } void TransformTest::meshDataTextureCoordinates2DRvaluePassthroughNoCoordinates() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Mainly to verify there's no other accidental assertion from checking vertex format, this message comes from the l-value overload */ @@ -1678,9 +1644,7 @@ void TransformTest::meshDataTextureCoordinates2DRvaluePassthroughWrongFormat() { } void TransformTest::meshDataTextureCoordinates2DInPlaceNotMutable() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, Trade::DataFlags{}, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::TextureCoordinates, VertexFormat::Vector2, nullptr}, @@ -1693,9 +1657,7 @@ void TransformTest::meshDataTextureCoordinates2DInPlaceNotMutable() { } void TransformTest::meshDataTextureCoordinates2DInPlaceNoCoordinates() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::TextureCoordinates, VertexFormat::Vector2, nullptr}, @@ -1708,9 +1670,7 @@ void TransformTest::meshDataTextureCoordinates2DInPlaceNoCoordinates() { } void TransformTest::meshDataTextureCoordinates2DInPlaceWrongFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::MeshData mesh{MeshPrimitive::Points, nullptr, { Trade::MeshAttributeData{Trade::MeshAttribute::TextureCoordinates, VertexFormat::Vector2, nullptr}, diff --git a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp index c4e599416..984fbf465 100644 --- a/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/DualComplexTransformationTest.cpp @@ -139,9 +139,7 @@ template void DualComplexTransformationTest::setTransformation() { template void DualComplexTransformationTest::setTransformationInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Object2D o; @@ -181,9 +179,7 @@ template void DualComplexTransformationTest::transform() { template void DualComplexTransformationTest::transformInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Can't transform with non-rigid transformation */ Object2D o; diff --git a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp index 61d952837..d5fbff7ef 100644 --- a/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/DualQuaternionTransformationTest.cpp @@ -99,9 +99,7 @@ template void DualQuaternionTransformationTest::fromMatrix() { template void DualQuaternionTransformationTest::fromMatrixInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -156,9 +154,7 @@ template void DualQuaternionTransformationTest::setTransformation() { template void DualQuaternionTransformationTest::setTransformationInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Object3D o; @@ -198,9 +194,7 @@ template void DualQuaternionTransformationTest::transform() { template void DualQuaternionTransformationTest::transformInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Can't transform with non-rigid transformation */ Object3D o; diff --git a/src/Magnum/SceneGraph/Test/ObjectTest.cpp b/src/Magnum/SceneGraph/Test/ObjectTest.cpp index 5023e49b0..25e2bec98 100644 --- a/src/Magnum/SceneGraph/Test/ObjectTest.cpp +++ b/src/Magnum/SceneGraph/Test/ObjectTest.cpp @@ -248,9 +248,7 @@ template void ObjectTest::setParentKeepTransformation() { template void ObjectTest::setParentKeepTransformationInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Object3D root; root.rotateZ(Math::Deg{35.0}); @@ -365,9 +363,7 @@ template void ObjectTest::transformationsRelative() { template void ObjectTest::transformationsOrphan() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream o; Error redirectError{&o}; diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp index f67c79cb0..37565e485 100644 --- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp +++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation2DTest.cpp @@ -102,9 +102,7 @@ template void RigidMatrixTransformation2DTest::fromMatrix() { template void RigidMatrixTransformation2DTest::fromMatrixInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -157,9 +155,7 @@ template void RigidMatrixTransformation2DTest::setTransformation() { template void RigidMatrixTransformation2DTest::setTransformationInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Object2D o; @@ -199,9 +195,7 @@ template void RigidMatrixTransformation2DTest::transform() { template void RigidMatrixTransformation2DTest::transformInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Can't transform with non-rigid transformation */ Object2D o; diff --git a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp index 41327c31f..89cad9667 100644 --- a/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp +++ b/src/Magnum/SceneGraph/Test/RigidMatrixTransformation3DTest.cpp @@ -102,9 +102,7 @@ template void RigidMatrixTransformation3DTest::fromMatrix() { template void RigidMatrixTransformation3DTest::fromMatrixInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream o; Error redirectError{&o}; @@ -158,9 +156,7 @@ template void RigidMatrixTransformation3DTest::setTransformation() { template void RigidMatrixTransformation3DTest::setTransformationInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Object3D o; @@ -200,9 +196,7 @@ template void RigidMatrixTransformation3DTest::transform() { template void RigidMatrixTransformation3DTest::transformInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Can't transform with non-rigid transformation */ Object3D o; diff --git a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp index 5d3a8a117..412dd8532 100644 --- a/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp +++ b/src/Magnum/SceneGraph/Test/TranslationTransformationTest.cpp @@ -89,9 +89,7 @@ template void TranslationTransformationTest::fromMatrix() { template void TranslationTransformationTest::fromMatrixInvalid() { setTestCaseTemplateName(Math::TypeTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream o; Error redirectError{&o}; diff --git a/src/Magnum/SceneTools/Test/FlattenMeshHierarchyTest.cpp b/src/Magnum/SceneTools/Test/FlattenMeshHierarchyTest.cpp index 4c504e6e7..39240bd9a 100644 --- a/src/Magnum/SceneTools/Test/FlattenMeshHierarchyTest.cpp +++ b/src/Magnum/SceneTools/Test/FlattenMeshHierarchyTest.cpp @@ -367,9 +367,7 @@ void FlattenMeshHierarchyTest::test3D() { } void FlattenMeshHierarchyTest::not2DNot3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::SceneData scene{Trade::SceneMappingType::UnsignedInt, 0, nullptr, {}}; @@ -383,9 +381,7 @@ void FlattenMeshHierarchyTest::not2DNot3D() { } void FlattenMeshHierarchyTest::noParentField() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::SceneData scene{Trade::SceneMappingType::UnsignedInt, 0, nullptr, { Trade::SceneFieldData{Trade::SceneField::Transformation, Trade::SceneMappingType::UnsignedInt, nullptr, Trade::SceneFieldType::Matrix3x3, nullptr} diff --git a/src/Magnum/SceneTools/Test/OrderClusterParentsTest.cpp b/src/Magnum/SceneTools/Test/OrderClusterParentsTest.cpp index 80ad46331..b29a74035 100644 --- a/src/Magnum/SceneTools/Test/OrderClusterParentsTest.cpp +++ b/src/Magnum/SceneTools/Test/OrderClusterParentsTest.cpp @@ -119,9 +119,7 @@ void OrderClusterParentsTest::test() { } void OrderClusterParentsTest::noParentField() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::SceneData scene{Trade::SceneMappingType::UnsignedByte, 0, nullptr, {}}; @@ -143,9 +141,7 @@ void OrderClusterParentsTest::emptyParentField() { } void OrderClusterParentsTest::intoNoParentField() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::SceneData scene{Trade::SceneMappingType::UnsignedByte, 0, nullptr, {}}; @@ -166,9 +162,7 @@ void OrderClusterParentsTest::intoEmptyParentField() { } void OrderClusterParentsTest::intoWrongDestinationSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -199,9 +193,7 @@ void OrderClusterParentsTest::intoWrongDestinationSize() { } void OrderClusterParentsTest::sparse() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -229,9 +221,7 @@ void OrderClusterParentsTest::sparse() { } void OrderClusterParentsTest::cyclic() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -257,9 +247,7 @@ void OrderClusterParentsTest::cyclic() { } void OrderClusterParentsTest::cyclicDeep() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -287,9 +275,7 @@ void OrderClusterParentsTest::cyclicDeep() { } void OrderClusterParentsTest::sparseAndCyclic() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; diff --git a/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp b/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp index 4b49d7e9d..1ce7185ac 100644 --- a/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp +++ b/src/Magnum/ShaderTools/Test/AbstractConverterTest.cpp @@ -350,9 +350,7 @@ AbstractConverterTest::AbstractConverterTest() { } void AbstractConverterTest::featuresNone() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -401,9 +399,7 @@ void AbstractConverterTest::setFlags() { } void AbstractConverterTest::setFlagsBothQuietAndVerbose() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -420,9 +416,7 @@ void AbstractConverterTest::setFlagsBothQuietAndVerbose() { } void AbstractConverterTest::setFlagsPreprocessNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -439,9 +433,7 @@ void AbstractConverterTest::setFlagsPreprocessNotSupported() { } void AbstractConverterTest::setFlagsPreprocessOnlyNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -541,9 +533,7 @@ void AbstractConverterTest::setDefinitions() { } void AbstractConverterTest::setDefinitionsNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -560,9 +550,7 @@ void AbstractConverterTest::setDefinitionsNotSupported() { } void AbstractConverterTest::setDefinitionsNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -598,9 +586,7 @@ void AbstractConverterTest::setOptimizationLevel() { } void AbstractConverterTest::setOptimizationLevelNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -617,9 +603,7 @@ void AbstractConverterTest::setOptimizationLevelNotSupported() { } void AbstractConverterTest::setOptimizationLevelNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -655,9 +639,7 @@ void AbstractConverterTest::setDebugInfoLevel() { } void AbstractConverterTest::setDebugInfoLevelNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -674,9 +656,7 @@ void AbstractConverterTest::setDebugInfoLevelNotSupported() { } void AbstractConverterTest::setDebugInfoLevelNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -731,9 +711,7 @@ void AbstractConverterTest::validateDataFailed() { } void AbstractConverterTest::validateDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -750,9 +728,7 @@ void AbstractConverterTest::validateDataNotSupported() { } void AbstractConverterTest::validateDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -769,9 +745,7 @@ void AbstractConverterTest::validateDataNotImplemented() { } void AbstractConverterTest::validateDataPreprocessOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -789,9 +763,7 @@ void AbstractConverterTest::validateDataPreprocessOnly() { } void AbstractConverterTest::validateDataCustomStringDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -893,9 +865,7 @@ void AbstractConverterTest::validateFileAsDataNotFound() { } void AbstractConverterTest::validateFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -912,9 +882,7 @@ void AbstractConverterTest::validateFileNotSupported() { } void AbstractConverterTest::validateFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -931,9 +899,7 @@ void AbstractConverterTest::validateFileNotImplemented() { } void AbstractConverterTest::validateFilePreprocessOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -951,9 +917,7 @@ void AbstractConverterTest::validateFilePreprocessOnly() { } void AbstractConverterTest::validateFileCustomStringDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1014,9 +978,7 @@ void AbstractConverterTest::convertDataToDataFailed() { } void AbstractConverterTest::convertDataToDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1033,9 +995,7 @@ void AbstractConverterTest::convertDataToDataNotSupported() { } void AbstractConverterTest::convertDataToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1053,9 +1013,7 @@ void AbstractConverterTest::convertDataToDataNotImplemented() { } void AbstractConverterTest::convertDataToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1148,9 +1106,7 @@ void AbstractConverterTest::convertDataToFileThroughDataNotWritable() { } void AbstractConverterTest::convertDataToFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1167,9 +1123,7 @@ void AbstractConverterTest::convertDataToFileNotSupported() { } void AbstractConverterTest::convertDataToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1327,9 +1281,7 @@ void AbstractConverterTest::convertFileToFileThroughDataNotWritable() { } void AbstractConverterTest::convertFileToFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1346,9 +1298,7 @@ void AbstractConverterTest::convertFileToFileNotSupported() { } void AbstractConverterTest::convertFileToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1450,9 +1400,7 @@ void AbstractConverterTest::convertFileToDataAsDataNotFound() { } void AbstractConverterTest::convertFileToDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1470,9 +1418,7 @@ void AbstractConverterTest::convertFileToDataNotSupported() { } void AbstractConverterTest::convertFileToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1489,9 +1435,7 @@ void AbstractConverterTest::convertFileToDataNotImplemented() { } void AbstractConverterTest::convertFileToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1561,9 +1505,7 @@ void AbstractConverterTest::linkDataToDataFailed() { } void AbstractConverterTest::linkDataToDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1580,9 +1522,7 @@ void AbstractConverterTest::linkDataToDataNotSupported() { } void AbstractConverterTest::linkDataToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1600,9 +1540,7 @@ void AbstractConverterTest::linkDataToDataNotImplemented() { } void AbstractConverterTest::linkDataToDataPreprocessOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1620,9 +1558,7 @@ void AbstractConverterTest::linkDataToDataPreprocessOnly() { } void AbstractConverterTest::linkDataToDataNoData() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1639,9 +1575,7 @@ void AbstractConverterTest::linkDataToDataNoData() { } void AbstractConverterTest::linkDataToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1743,9 +1677,7 @@ void AbstractConverterTest::linkDataToFileThroughDataNotWritable() { } void AbstractConverterTest::linkDataToFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1762,9 +1694,7 @@ void AbstractConverterTest::linkDataToFileNotSupported() { } void AbstractConverterTest::linkDataToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1782,9 +1712,7 @@ void AbstractConverterTest::linkDataToFileNotImplemented() { } void AbstractConverterTest::linkDataToFilePreprocessOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1802,9 +1730,7 @@ void AbstractConverterTest::linkDataToFilePreprocessOnly() { } void AbstractConverterTest::linkDataToFileNoData() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -1987,9 +1913,7 @@ void AbstractConverterTest::linkFilesToFileThroughDataNotWritable() { } void AbstractConverterTest::linkFilesToFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2006,9 +1930,7 @@ void AbstractConverterTest::linkFilesToFileNotSupported() { } void AbstractConverterTest::linkFilesToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2026,9 +1948,7 @@ void AbstractConverterTest::linkFilesToFileNotImplemented() { } void AbstractConverterTest::linkFilesToFilePreprocessOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2046,9 +1966,7 @@ void AbstractConverterTest::linkFilesToFilePreprocessOnly() { } void AbstractConverterTest::linkFilesToFileNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2174,9 +2092,7 @@ void AbstractConverterTest::linkFilesToDataAsDataNotFound() { } void AbstractConverterTest::linkFilesToDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2193,9 +2109,7 @@ void AbstractConverterTest::linkFilesToDataNotSupported() { } void AbstractConverterTest::linkFilesToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2214,9 +2128,7 @@ void AbstractConverterTest::linkFilesToDataNotImplemented() { } void AbstractConverterTest::linkFilesToDataPreprocessOnly() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2234,9 +2146,7 @@ void AbstractConverterTest::linkFilesToDataPreprocessOnly() { } void AbstractConverterTest::linkFilesToDataNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2253,9 +2163,7 @@ void AbstractConverterTest::linkFilesToDataNoFile() { } void AbstractConverterTest::linkFilesToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { @@ -2397,9 +2305,7 @@ void AbstractConverterTest::setInputFileCallbackNotImplemented() { } void AbstractConverterTest::setInputFileCallbackNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractConverter { ConverterFeatures doFeatures() const override { diff --git a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp index 80f289c36..d8bf027ac 100644 --- a/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/DistanceFieldVectorGLTest.cpp @@ -475,9 +475,7 @@ template void DistanceFieldVectorGLTest::constructUnifor setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -496,9 +494,7 @@ template void DistanceFieldVectorGLTest::constructUnifor template void DistanceFieldVectorGLTest::setUniformUniformBuffersEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -527,9 +523,7 @@ template void DistanceFieldVectorGLTest::setUniformUnifo template void DistanceFieldVectorGLTest::bindBufferUniformBuffersNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -561,9 +555,7 @@ template void DistanceFieldVectorGLTest::bindBufferUnifo template void DistanceFieldVectorGLTest::setTextureMatrixNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -579,9 +571,7 @@ template void DistanceFieldVectorGLTest::setTextureMatri template void DistanceFieldVectorGLTest::bindTextureTransformBufferNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -605,9 +595,7 @@ template void DistanceFieldVectorGLTest::bindTextureTran template void DistanceFieldVectorGLTest::setWrongDrawOffset() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) diff --git a/src/Magnum/Shaders/Test/FlatGLTest.cpp b/src/Magnum/Shaders/Test/FlatGLTest.cpp index cb7097940..730bb0fad 100644 --- a/src/Magnum/Shaders/Test/FlatGLTest.cpp +++ b/src/Magnum/Shaders/Test/FlatGLTest.cpp @@ -956,9 +956,7 @@ template void FlatGLTest::constructInvalid() { setTestCaseTemplateName(Utility::format("{}", dimensions)); setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -973,9 +971,7 @@ template void FlatGLTest::constructUniformBuffersInvalid setTestCaseTemplateName(Utility::format("{}", dimensions)); setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -994,9 +990,7 @@ template void FlatGLTest::constructUniformBuffersInvalid template void FlatGLTest::setUniformUniformBuffersEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1025,9 +1019,7 @@ template void FlatGLTest::setUniformUniformBuffersEnable template void FlatGLTest::bindBufferUniformBuffersNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1061,9 +1053,7 @@ template void FlatGLTest::bindTexturesInvalid() { setTestCaseTemplateName(Utility::format("{}", dimensions)); setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if((data.flags & FlatGL::Flag::TextureArrays) && !GL::Context::current().isExtensionSupported()) @@ -1088,9 +1078,7 @@ template void FlatGLTest::bindTextureArraysInvalid() { setTestCaseTemplateName(Utility::format("{}", dimensions)); setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1111,9 +1099,7 @@ template void FlatGLTest::bindTextureArraysInvalid() { template void FlatGLTest::setAlphaMaskNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1128,9 +1114,7 @@ template void FlatGLTest::setAlphaMaskNotEnabled() { template void FlatGLTest::setTextureMatrixNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1146,9 +1130,7 @@ template void FlatGLTest::setTextureMatrixNotEnabled() { template void FlatGLTest::setTextureLayerNotArray() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1165,9 +1147,7 @@ template void FlatGLTest::setTextureLayerNotArray() { template void FlatGLTest::bindTextureTransformBufferNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1191,9 +1171,7 @@ template void FlatGLTest::bindTextureTransformBufferNotE template void FlatGLTest::setObjectIdNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1210,9 +1188,7 @@ template void FlatGLTest::setObjectIdNotEnabled() { template void FlatGLTest::setWrongDrawOffset() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) diff --git a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp index be7d8781a..7ac0ac612 100644 --- a/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp +++ b/src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp @@ -1624,9 +1624,7 @@ void MeshVisualizerGLTest::construct2DInvalid() { auto&& data = ConstructInvalidData2D[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1639,9 +1637,7 @@ void MeshVisualizerGLTest::constructUniformBuffers2DInvalid() { auto&& data = ConstructUniformBuffersInvalidData2D[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1659,9 +1655,7 @@ void MeshVisualizerGLTest::construct3DInvalid() { auto&& data = ConstructInvalidData3D[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1674,9 +1668,7 @@ void MeshVisualizerGLTest::constructUniformBuffers3DInvalid() { auto&& data = ConstructUniformBuffersInvalidData3D[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1790,9 +1782,7 @@ void MeshVisualizerGLTest::constructMoveUniformBuffers3D() { #ifndef MAGNUM_TARGET_GLES2 void MeshVisualizerGLTest::setUniformUniformBuffersEnabled2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1826,9 +1816,7 @@ void MeshVisualizerGLTest::setUniformUniformBuffersEnabled2D() { } void MeshVisualizerGLTest::setUniformUniformBuffersEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1877,9 +1865,7 @@ void MeshVisualizerGLTest::setUniformUniformBuffersEnabled3D() { } void MeshVisualizerGLTest::bindBufferUniformBuffersNotEnabled2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1908,9 +1894,7 @@ void MeshVisualizerGLTest::bindBufferUniformBuffersNotEnabled2D() { } void MeshVisualizerGLTest::bindBufferUniformBuffersNotEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1948,9 +1932,7 @@ void MeshVisualizerGLTest::bindObjectIdTextureInvalid2D() { auto&& data = BindObjectIdTextureInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if((data.flags2D & MeshVisualizerGL2D::Flag::TextureArrays) && !GL::Context::current().isExtensionSupported()) @@ -1970,9 +1952,7 @@ void MeshVisualizerGLTest::bindObjectIdTextureInvalid3D() { auto&& data = BindObjectIdTextureInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if((data.flags3D & MeshVisualizerGL3D::Flag::TextureArrays) && !GL::Context::current().isExtensionSupported()) @@ -1992,9 +1972,7 @@ void MeshVisualizerGLTest::bindObjectIdTextureArrayInvalid2D() { auto&& data = BindObjectIdTextureArrayInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -2015,9 +1993,7 @@ void MeshVisualizerGLTest::bindObjectIdTextureArrayInvalid3D() { auto&& data = BindObjectIdTextureArrayInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -2036,9 +2012,7 @@ void MeshVisualizerGLTest::bindObjectIdTextureArrayInvalid3D() { #endif void MeshVisualizerGLTest::setWireframeNotEnabled2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -2070,9 +2044,7 @@ void MeshVisualizerGLTest::setWireframeNotEnabled2D() { } void MeshVisualizerGLTest::setWireframeNotEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -2106,9 +2078,7 @@ void MeshVisualizerGLTest::setWireframeNotEnabled3D() { #ifndef MAGNUM_TARGET_GLES2 void MeshVisualizerGLTest::setTextureMatrixNotEnabled2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshVisualizerGL2D shader{MeshVisualizerGL2D::Flag::ObjectIdTexture}; @@ -2120,9 +2090,7 @@ void MeshVisualizerGLTest::setTextureMatrixNotEnabled2D() { } void MeshVisualizerGLTest::setTextureMatrixNotEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshVisualizerGL3D shader{MeshVisualizerGL3D::Flag::ObjectIdTexture}; @@ -2134,9 +2102,7 @@ void MeshVisualizerGLTest::setTextureMatrixNotEnabled3D() { } void MeshVisualizerGLTest::setTextureLayerNotArray2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshVisualizerGL2D shader{MeshVisualizerGL2D::Flag::ObjectIdTexture}; @@ -2148,9 +2114,7 @@ void MeshVisualizerGLTest::setTextureLayerNotArray2D() { } void MeshVisualizerGLTest::setTextureLayerNotArray3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshVisualizerGL3D shader{MeshVisualizerGL3D::Flag::ObjectIdTexture}; @@ -2162,9 +2126,7 @@ void MeshVisualizerGLTest::setTextureLayerNotArray3D() { } void MeshVisualizerGLTest::bindTextureTransformBufferNotEnabled2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -2184,9 +2146,7 @@ void MeshVisualizerGLTest::bindTextureTransformBufferNotEnabled2D() { } void MeshVisualizerGLTest::bindTextureTransformBufferNotEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -2208,9 +2168,7 @@ void MeshVisualizerGLTest::bindTextureTransformBufferNotEnabled3D() { #ifndef MAGNUM_TARGET_GLES2 void MeshVisualizerGLTest::setObjectIdNotEnabled2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshVisualizerGL2D shader{NoCreate}; @@ -2221,9 +2179,7 @@ void MeshVisualizerGLTest::setObjectIdNotEnabled2D() { } void MeshVisualizerGLTest::setObjectIdNotEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshVisualizerGL3D shader{NoCreate}; @@ -2234,9 +2190,7 @@ void MeshVisualizerGLTest::setObjectIdNotEnabled3D() { } void MeshVisualizerGLTest::setColorMapNotEnabled2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -2252,9 +2206,7 @@ void MeshVisualizerGLTest::setColorMapNotEnabled2D() { } void MeshVisualizerGLTest::setColorMapNotEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -2272,9 +2224,7 @@ void MeshVisualizerGLTest::setColorMapNotEnabled3D() { #if !defined(MAGNUM_TARGET_GLES2) && !defined(MAGNUM_TARGET_WEBGL) void MeshVisualizerGLTest::setTangentBitangentNormalNotEnabled3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -2301,9 +2251,7 @@ void MeshVisualizerGLTest::setTangentBitangentNormalNotEnabled3D() { #ifndef MAGNUM_TARGET_GLES2 void MeshVisualizerGLTest::setWrongDrawOffset2D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -2319,9 +2267,7 @@ void MeshVisualizerGLTest::setWrongDrawOffset2D() { } void MeshVisualizerGLTest::setWrongDrawOffset3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) diff --git a/src/Magnum/Shaders/Test/PhongGLTest.cpp b/src/Magnum/Shaders/Test/PhongGLTest.cpp index 6a87fd813..e6414a2c2 100644 --- a/src/Magnum/Shaders/Test/PhongGLTest.cpp +++ b/src/Magnum/Shaders/Test/PhongGLTest.cpp @@ -1293,9 +1293,7 @@ void PhongGLTest::constructInvalid() { auto&& data = ConstructInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1309,9 +1307,7 @@ void PhongGLTest::constructUniformBuffersInvalid() { auto&& data = ConstructUniformBuffersInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1328,9 +1324,7 @@ void PhongGLTest::constructUniformBuffersInvalid() { #ifndef MAGNUM_TARGET_GLES2 void PhongGLTest::setUniformUniformBuffersEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1385,9 +1379,7 @@ void PhongGLTest::setUniformUniformBuffersEnabled() { } void PhongGLTest::bindBufferUniformBuffersNotEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1428,9 +1420,7 @@ void PhongGLTest::bindTexturesInvalid() { auto&& data = BindTexturesInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if((data.flags & PhongGL::Flag::TextureArrays) && !GL::Context::current().isExtensionSupported()) @@ -1459,9 +1449,7 @@ void PhongGLTest::bindTextureArraysInvalid() { auto&& data = BindTextureArraysInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1484,9 +1472,7 @@ void PhongGLTest::bindTextureArraysInvalid() { #endif void PhongGLTest::setAlphaMaskNotEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1499,9 +1485,7 @@ void PhongGLTest::setAlphaMaskNotEnabled() { } void PhongGLTest::setSpecularDisabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1521,9 +1505,7 @@ void PhongGLTest::setSpecularDisabled() { } void PhongGLTest::setTextureMatrixNotEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1536,9 +1518,7 @@ void PhongGLTest::setTextureMatrixNotEnabled() { } void PhongGLTest::setNormalTextureScaleNotEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1552,9 +1532,7 @@ void PhongGLTest::setNormalTextureScaleNotEnabled() { #ifndef MAGNUM_TARGET_GLES2 void PhongGLTest::setTextureLayerNotArray() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1569,9 +1547,7 @@ void PhongGLTest::setTextureLayerNotArray() { #ifndef MAGNUM_TARGET_GLES2 void PhongGLTest::bindTextureTransformBufferNotEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -1593,9 +1569,7 @@ void PhongGLTest::bindTextureTransformBufferNotEnabled() { #ifndef MAGNUM_TARGET_GLES2 void PhongGLTest::setObjectIdNotEnabled() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1609,9 +1583,7 @@ void PhongGLTest::setObjectIdNotEnabled() { #endif void PhongGLTest::setWrongLightCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1626,9 +1598,7 @@ void PhongGLTest::setWrongLightCount() { } void PhongGLTest::setWrongLightId() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1644,9 +1614,7 @@ void PhongGLTest::setWrongLightId() { #ifndef MAGNUM_TARGET_GLES2 void PhongGLTest::setWrongDrawOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) diff --git a/src/Magnum/Shaders/Test/VectorGLTest.cpp b/src/Magnum/Shaders/Test/VectorGLTest.cpp index b0d74e6e4..670886fb7 100644 --- a/src/Magnum/Shaders/Test/VectorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VectorGLTest.cpp @@ -469,9 +469,7 @@ template void VectorGLTest::constructUniformBuffersInval setTestCaseTemplateName(Utility::format("{}", dimensions)); setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -490,9 +488,7 @@ template void VectorGLTest::constructUniformBuffersInval template void VectorGLTest::setUniformUniformBuffersEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -517,9 +513,7 @@ template void VectorGLTest::setUniformUniformBuffersEnab template void VectorGLTest::bindBufferUniformBuffersNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -551,9 +545,7 @@ template void VectorGLTest::bindBufferUniformBuffersNotE template void VectorGLTest::setTextureMatrixNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -569,9 +561,7 @@ template void VectorGLTest::setTextureMatrixNotEnabled() template void VectorGLTest::bindTextureTransformBufferNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -595,9 +585,7 @@ template void VectorGLTest::bindTextureTransformBufferNo template void VectorGLTest::setWrongDrawOffset() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) diff --git a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp index 2952838bb..abbd56bf4 100644 --- a/src/Magnum/Shaders/Test/VertexColorGLTest.cpp +++ b/src/Magnum/Shaders/Test/VertexColorGLTest.cpp @@ -402,9 +402,7 @@ template void VertexColorGLTest::constructMoveUniformBuf template void VertexColorGLTest::constructUniformBuffersZeroDraws() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -423,9 +421,7 @@ template void VertexColorGLTest::constructUniformBuffers template void VertexColorGLTest::setUniformUniformBuffersEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) @@ -444,9 +440,7 @@ template void VertexColorGLTest::setUniformUniformBuffer template void VertexColorGLTest::bindBufferUniformBuffersNotEnabled() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -465,9 +459,7 @@ template void VertexColorGLTest::bindBufferUniformBuffer template void VertexColorGLTest::setWrongDrawOffset() { setTestCaseTemplateName(Utility::format("{}", dimensions)); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #ifndef MAGNUM_TARGET_GLES if(!GL::Context::current().isExtensionSupported()) diff --git a/src/Magnum/Test/ImageTest.cpp b/src/Magnum/Test/ImageTest.cpp index 14015261c..69c57bf25 100644 --- a/src/Magnum/Test/ImageTest.cpp +++ b/src/Magnum/Test/ImageTest.cpp @@ -446,9 +446,7 @@ void ImageTest::constructCompressedImplementationSpecific() { } void ImageTest::constructInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -459,9 +457,7 @@ void ImageTest::constructInvalidSize() { } void ImageTest::constructInvalidCubeMap() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -496,9 +492,7 @@ void ImageTest::constructCompressedInvalidSize() { } void ImageTest::constructCompressedInvalidCubeMap() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Test/ImageViewTest.cpp b/src/Magnum/Test/ImageViewTest.cpp index 8c7c95aaf..bdffdc7a9 100644 --- a/src/Magnum/Test/ImageViewTest.cpp +++ b/src/Magnum/Test/ImageViewTest.cpp @@ -669,9 +669,7 @@ void ImageViewTest::constructNullptr() { } void ImageViewTest::constructInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -683,9 +681,7 @@ void ImageViewTest::constructInvalidSize() { } void ImageViewTest::constructInvalidCubeMap() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char data[4*3*18*4]{}; @@ -727,9 +723,7 @@ void ImageViewTest::constructCompressedInvalidSize() { } void ImageViewTest::constructCompressedInvalidCubeMap() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char data[8*18]{}; @@ -807,9 +801,7 @@ template void ImageViewTest::setDataCompressed() { } void ImageViewTest::setDataInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Test/MeshTest.cpp b/src/Magnum/Test/MeshTest.cpp index c6a0b30d8..336177d91 100644 --- a/src/Magnum/Test/MeshTest.cpp +++ b/src/Magnum/Test/MeshTest.cpp @@ -148,9 +148,7 @@ void MeshTest::primitiveWrap() { } void MeshTest::primitiveWrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -166,9 +164,7 @@ void MeshTest::primitiveUnwrap() { } void MeshTest::primitiveUnwrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -229,9 +225,7 @@ void MeshTest::indexTypeWrap() { } void MeshTest::indexTypeWrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -245,9 +239,7 @@ void MeshTest::indexTypeUnwrap() { } void MeshTest::indexTypeUnwrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -264,9 +256,7 @@ void MeshTest::indexTypeSize() { } void MeshTest::indexTypeSizeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -280,9 +270,7 @@ void MeshTest::indexTypeSizeInvalid() { } void MeshTest::indexTypeSizeImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Test/PixelFormatTest.cpp b/src/Magnum/Test/PixelFormatTest.cpp index 4c06f7c53..e11b9149e 100644 --- a/src/Magnum/Test/PixelFormatTest.cpp +++ b/src/Magnum/Test/PixelFormatTest.cpp @@ -240,9 +240,7 @@ void PixelFormatTest::size() { } void PixelFormatTest::sizeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -256,9 +254,7 @@ void PixelFormatTest::sizeInvalid() { } void PixelFormatTest::sizeImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -290,9 +286,7 @@ void PixelFormatTest::channelFormatCount() { } void PixelFormatTest::channelFormatCountInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -308,9 +302,7 @@ void PixelFormatTest::channelFormatCountInvalid() { } void PixelFormatTest::channelFormatCountDepthStencilImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -332,9 +324,7 @@ void PixelFormatTest::isSrgb() { } void PixelFormatTest::isSrgbInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -346,9 +336,7 @@ void PixelFormatTest::isSrgbInvalid() { } void PixelFormatTest::isSrgbImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -364,9 +352,7 @@ void PixelFormatTest::isDepthOrStencil() { } void PixelFormatTest::isDepthOrStencilInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -378,9 +364,7 @@ void PixelFormatTest::isDepthOrStencilInvalid() { } void PixelFormatTest::isDepthOrStencilImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -403,9 +387,7 @@ void PixelFormatTest::compressedBlockSize() { } void PixelFormatTest::compressedBlockSizeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -423,9 +405,7 @@ void PixelFormatTest::compressedBlockSizeInvalid() { } void PixelFormatTest::compressedBlockSizeImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -451,9 +431,7 @@ void PixelFormatTest::wrap() { } void PixelFormatTest::wrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -469,9 +447,7 @@ void PixelFormatTest::unwrap() { } void PixelFormatTest::unwrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -491,9 +467,7 @@ void PixelFormatTest::compressedWrap() { } void PixelFormatTest::compressedWrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -508,9 +482,7 @@ void PixelFormatTest::compressedUnwrap() { } void PixelFormatTest::compressedUnwrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Test/ResourceManagerTest.cpp b/src/Magnum/Test/ResourceManagerTest.cpp index 0f8deaeb7..bcb3105c5 100644 --- a/src/Magnum/Test/ResourceManagerTest.cpp +++ b/src/Magnum/Test/ResourceManagerTest.cpp @@ -261,9 +261,7 @@ void ResourceManagerTest::stateFallback() { } void ResourceManagerTest::stateDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); ResourceManager rm; @@ -304,9 +302,7 @@ void ResourceManagerTest::basic() { } void ResourceManagerTest::changeFinalResource() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); ResourceManager rm; @@ -412,9 +408,7 @@ void ResourceManagerTest::clear() { } void ResourceManagerTest::clearWhileReferenced() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Should cover also the destruction case */ diff --git a/src/Magnum/Test/VertexFormatTest.cpp b/src/Magnum/Test/VertexFormatTest.cpp index f2c4e83b7..934defab0 100644 --- a/src/Magnum/Test/VertexFormatTest.cpp +++ b/src/Magnum/Test/VertexFormatTest.cpp @@ -231,9 +231,7 @@ void VertexFormatTest::wrap() { } void VertexFormatTest::wrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -249,9 +247,7 @@ void VertexFormatTest::unwrap() { } void VertexFormatTest::unwrapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -275,9 +271,7 @@ void VertexFormatTest::size() { } void VertexFormatTest::sizeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -291,9 +285,7 @@ void VertexFormatTest::sizeInvalid() { } void VertexFormatTest::sizeImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -316,9 +308,7 @@ void VertexFormatTest::componentCount() { } void VertexFormatTest::componentCountInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -332,9 +322,7 @@ void VertexFormatTest::componentCountInvalid() { } void VertexFormatTest::componentCountImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -365,9 +353,7 @@ void VertexFormatTest::componentFormat() { } void VertexFormatTest::componentFormatInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -381,9 +367,7 @@ void VertexFormatTest::componentFormatInvalid() { } void VertexFormatTest::componentFormatImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -405,9 +389,7 @@ void VertexFormatTest::vectorCount() { } void VertexFormatTest::vectorCountInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -421,9 +403,7 @@ void VertexFormatTest::vectorCountInvalid() { } void VertexFormatTest::vectorCountImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -447,9 +427,7 @@ void VertexFormatTest::vectorStride() { } void VertexFormatTest::vectorStrideInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -463,9 +441,7 @@ void VertexFormatTest::vectorStrideInvalid() { } void VertexFormatTest::vectorStrideImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -485,9 +461,7 @@ void VertexFormatTest::isNormalized() { } void VertexFormatTest::isNormalizedInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -501,9 +475,7 @@ void VertexFormatTest::isNormalizedInvalid() { } void VertexFormatTest::isNormalizedImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -551,9 +523,7 @@ void VertexFormatTest::assembleRoundtrip() { } void VertexFormatTest::assembleCantNormalize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -563,9 +533,7 @@ void VertexFormatTest::assembleCantNormalize() { } void VertexFormatTest::assembleInvalidComponentCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -575,9 +543,7 @@ void VertexFormatTest::assembleInvalidComponentCount() { } void VertexFormatTest::assembleImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -628,9 +594,7 @@ void VertexFormatTest::assembleMatrixRoundtrip() { } void VertexFormatTest::assembleMatrixInvalidType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -646,9 +610,7 @@ void VertexFormatTest::assembleMatrixInvalidType() { } void VertexFormatTest::assembleMatrixInvalidCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -664,9 +626,7 @@ void VertexFormatTest::assembleMatrixInvalidCount() { } void VertexFormatTest::assembleMatrixImplementationSpecific() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index a5f3e4cfe..a30d36da4 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -213,9 +213,7 @@ void AbstractFontConverterTest::exportFontToSingleData() { } void AbstractFontConverterTest::exportFontToSingleDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -230,9 +228,7 @@ void AbstractFontConverterTest::exportFontToSingleDataNotSupported() { } void AbstractFontConverterTest::exportFontToSingleDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -247,9 +243,7 @@ void AbstractFontConverterTest::exportFontToSingleDataNotImplemented() { } void AbstractFontConverterTest::exportFontToSingleDataNotSingleFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -291,9 +285,7 @@ void AbstractFontConverterTest::exportFontToData() { } void AbstractFontConverterTest::exportFontToDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -308,9 +300,7 @@ void AbstractFontConverterTest::exportFontToDataNotSupported() { } void AbstractFontConverterTest::exportFontToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -392,9 +382,7 @@ void AbstractFontConverterTest::exportFontToFile() { } void AbstractFontConverterTest::exportFontToFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -409,9 +397,7 @@ void AbstractFontConverterTest::exportFontToFileNotSupported() { } void AbstractFontConverterTest::exportFontToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -517,9 +503,7 @@ void AbstractFontConverterTest::exportGlyphCacheToSingleData() { } void AbstractFontConverterTest::exportGlyphCacheToSingleDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -534,9 +518,7 @@ void AbstractFontConverterTest::exportGlyphCacheToSingleDataNotSupported() { } void AbstractFontConverterTest::exportGlyphCacheToSingleDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -551,9 +533,7 @@ void AbstractFontConverterTest::exportGlyphCacheToSingleDataNotImplemented() { } void AbstractFontConverterTest::exportGlyphCacheToSingleDataNotSingleFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -594,9 +574,7 @@ void AbstractFontConverterTest::exportGlyphCacheToData() { } void AbstractFontConverterTest::exportGlyphCacheToDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -611,9 +589,7 @@ void AbstractFontConverterTest::exportGlyphCacheToDataNotSupported() { } void AbstractFontConverterTest::exportGlyphCacheToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -696,9 +672,7 @@ void AbstractFontConverterTest::exportGlyphCacheToFile() { } void AbstractFontConverterTest::exportGlyphCacheToFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -713,9 +687,7 @@ void AbstractFontConverterTest::exportGlyphCacheToFileNotSupported() { } void AbstractFontConverterTest::exportGlyphCacheToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -820,9 +792,7 @@ void AbstractFontConverterTest::importGlyphCacheFromSingleData() { } void AbstractFontConverterTest::importGlyphCacheFromSingleDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -837,9 +807,7 @@ void AbstractFontConverterTest::importGlyphCacheFromSingleDataNotSupported() { } void AbstractFontConverterTest::importGlyphCacheFromSingleDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -854,9 +822,7 @@ void AbstractFontConverterTest::importGlyphCacheFromSingleDataNotImplemented() { } void AbstractFontConverterTest::importGlyphCacheFromSingleDataNotSingleFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -890,9 +856,7 @@ void AbstractFontConverterTest::importGlyphCacheFromData() { } void AbstractFontConverterTest::importGlyphCacheFromDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -907,9 +871,7 @@ void AbstractFontConverterTest::importGlyphCacheFromDataNotSupported() { } void AbstractFontConverterTest::importGlyphCacheFromDataNoData() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -924,9 +886,7 @@ void AbstractFontConverterTest::importGlyphCacheFromDataNoData() { } void AbstractFontConverterTest::importGlyphCacheFromDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -983,9 +943,7 @@ void AbstractFontConverterTest::importGlyphCacheFromFile() { } void AbstractFontConverterTest::importGlyphCacheFromFileNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { @@ -1000,9 +958,7 @@ void AbstractFontConverterTest::importGlyphCacheFromFileNotSupported() { } void AbstractFontConverterTest::importGlyphCacheFromFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFontConverter { FontConverterFeatures doFeatures() const override { diff --git a/src/Magnum/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp index 9a2925b54..f0df222a6 100644 --- a/src/Magnum/Text/Test/AbstractFontTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontTest.cpp @@ -256,9 +256,7 @@ void AbstractFontTest::openFileAsDataNotFound() { } void AbstractFontTest::openFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFont { /* Supports neither file nor data opening */ @@ -280,9 +278,7 @@ void AbstractFontTest::openFileNotImplemented() { } void AbstractFontTest::openDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFont { /* Supports neither file nor data opening */ @@ -304,9 +300,7 @@ void AbstractFontTest::openDataNotSupported() { } void AbstractFontTest::openDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFont { FontFeatures doFeatures() const override { return FontFeature::OpenData; } @@ -509,9 +503,7 @@ void AbstractFontTest::setFileCallbackTemplateConst() { } void AbstractFontTest::setFileCallbackFileOpened() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -558,9 +550,7 @@ void AbstractFontTest::setFileCallbackNotImplemented() { } void AbstractFontTest::setFileCallbackNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -836,9 +826,7 @@ void AbstractFontTest::properties() { } void AbstractFontTest::propertiesNoFont() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -882,9 +870,7 @@ void AbstractFontTest::glyphId() { } void AbstractFontTest::glyphIdNoFont() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -921,9 +907,7 @@ void AbstractFontTest::glyphAdvance() { } void AbstractFontTest::glyphAdvanceNoFont() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -974,9 +958,7 @@ void AbstractFontTest::layout() { } void AbstractFontTest::layoutNoFont() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -1023,9 +1005,7 @@ void AbstractFontTest::fillGlyphCache() { } void AbstractFontTest::fillGlyphCacheNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return FontFeature::PreparedGlyphCache; } @@ -1045,9 +1025,7 @@ void AbstractFontTest::fillGlyphCacheNotSupported() { } void AbstractFontTest::fillGlyphCacheNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -1067,9 +1045,7 @@ void AbstractFontTest::fillGlyphCacheNotImplemented() { } void AbstractFontTest::fillGlyphCacheNoFont() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -1115,9 +1091,7 @@ void AbstractFontTest::createGlyphCache() { } void AbstractFontTest::createGlyphCacheNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return {}; } @@ -1136,9 +1110,7 @@ void AbstractFontTest::createGlyphCacheNotSupported() { } void AbstractFontTest::createGlyphCacheNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return FontFeature::PreparedGlyphCache; } @@ -1157,9 +1129,7 @@ void AbstractFontTest::createGlyphCacheNotImplemented() { } void AbstractFontTest::createGlyphCacheNoFont() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyFont: AbstractFont { FontFeatures doFeatures() const override { return FontFeature::PreparedGlyphCache; } diff --git a/src/Magnum/Text/Test/AbstractGlyphCacheTest.cpp b/src/Magnum/Text/Test/AbstractGlyphCacheTest.cpp index 27060f77a..c48472030 100644 --- a/src/Magnum/Text/Test/AbstractGlyphCacheTest.cpp +++ b/src/Magnum/Text/Test/AbstractGlyphCacheTest.cpp @@ -134,9 +134,7 @@ void AbstractGlyphCacheTest::setImage() { } void AbstractGlyphCacheTest::setImageOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); DummyGlyphCache cache{{100, 200}}; @@ -166,9 +164,7 @@ void AbstractGlyphCacheTest::image() { } void AbstractGlyphCacheTest::imageNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyGlyphCache: AbstractGlyphCache { using AbstractGlyphCache::AbstractGlyphCache; @@ -184,9 +180,7 @@ void AbstractGlyphCacheTest::imageNotSupported() { } void AbstractGlyphCacheTest::imageNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct MyGlyphCache: AbstractGlyphCache { using AbstractGlyphCache::AbstractGlyphCache; diff --git a/src/Magnum/TextureTools/Test/AtlasTest.cpp b/src/Magnum/TextureTools/Test/AtlasTest.cpp index 594d30af7..6e8beedde 100644 --- a/src/Magnum/TextureTools/Test/AtlasTest.cpp +++ b/src/Magnum/TextureTools/Test/AtlasTest.cpp @@ -277,9 +277,7 @@ void AtlasTest::arrayPowerOfTwoWrongLayerSize() { auto&& data = ArrayPowerOfTwoWrongSizeData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -291,9 +289,7 @@ void AtlasTest::arrayPowerOfTwoWrongSize() { auto&& data = ArrayPowerOfTwoWrongSizeData[testCaseInstanceId()]; setTestCaseDescription(data.name); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index 9a50296e9..71af13a11 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -591,9 +591,7 @@ void AbstractImageConverterTest::setFlagsNotImplemented() { } void AbstractImageConverterTest::thingNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return {}; } @@ -761,9 +759,7 @@ void AbstractImageConverterTest::convert3DFailed() { } void AbstractImageConverterTest::convert1DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert1D; } @@ -776,9 +772,7 @@ void AbstractImageConverterTest::convert1DNotImplemented() { } void AbstractImageConverterTest::convert2DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2D; } @@ -791,9 +785,7 @@ void AbstractImageConverterTest::convert2DNotImplemented() { } void AbstractImageConverterTest::convert3DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert3D; } @@ -806,9 +798,7 @@ void AbstractImageConverterTest::convert3DNotImplemented() { } void AbstractImageConverterTest::convert1DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert1D; } @@ -824,9 +814,7 @@ void AbstractImageConverterTest::convert1DCustomDeleter() { } void AbstractImageConverterTest::convert2DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2D; } @@ -842,9 +830,7 @@ void AbstractImageConverterTest::convert2DCustomDeleter() { } void AbstractImageConverterTest::convert3DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert3D; } @@ -956,9 +942,7 @@ void AbstractImageConverterTest::convertCompressed3DFailed() { } void AbstractImageConverterTest::convertCompressed1DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed1D; } @@ -971,9 +955,7 @@ void AbstractImageConverterTest::convertCompressed1DNotImplemented() { } void AbstractImageConverterTest::convertCompressed2DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed2D; } @@ -986,9 +968,7 @@ void AbstractImageConverterTest::convertCompressed2DNotImplemented() { } void AbstractImageConverterTest::convertCompressed3DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed3D; } @@ -1001,9 +981,7 @@ void AbstractImageConverterTest::convertCompressed3DNotImplemented() { } void AbstractImageConverterTest::convertCompressed1DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed1D; } @@ -1019,9 +997,7 @@ void AbstractImageConverterTest::convertCompressed1DCustomDeleter() { } void AbstractImageConverterTest::convertCompressed2DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed2D; } @@ -1037,9 +1013,7 @@ void AbstractImageConverterTest::convertCompressed2DCustomDeleter() { } void AbstractImageConverterTest::convertCompressed3DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed3D; } @@ -1250,9 +1224,7 @@ void AbstractImageConverterTest::convert3DToDataFailed() { } void AbstractImageConverterTest::convert1DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert1DToData; } @@ -1265,9 +1237,7 @@ void AbstractImageConverterTest::convert1DToDataInvalidImage() { } void AbstractImageConverterTest::convert2DToDataZeroSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2DToData; } @@ -1281,9 +1251,7 @@ void AbstractImageConverterTest::convert2DToDataZeroSize() { } void AbstractImageConverterTest::convert2DToDataNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2DToData; } @@ -1296,9 +1264,7 @@ void AbstractImageConverterTest::convert2DToDataNullptr() { } void AbstractImageConverterTest::convert3DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert3DToData; } @@ -1311,9 +1277,7 @@ void AbstractImageConverterTest::convert3DToDataInvalidImage() { } void AbstractImageConverterTest::convert1DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert1DToData; } @@ -1327,9 +1291,7 @@ void AbstractImageConverterTest::convert1DToDataNotImplemented() { } void AbstractImageConverterTest::convert2DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2DToData; } @@ -1343,9 +1305,7 @@ void AbstractImageConverterTest::convert2DToDataNotImplemented() { } void AbstractImageConverterTest::convert3DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert3DToData; } @@ -1359,9 +1319,7 @@ void AbstractImageConverterTest::convert3DToDataNotImplemented() { } void AbstractImageConverterTest::convert1DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert1DToData; } @@ -1378,9 +1336,7 @@ void AbstractImageConverterTest::convert1DToDataCustomDeleter() { } void AbstractImageConverterTest::convert2DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2DToData; } @@ -1397,9 +1353,7 @@ void AbstractImageConverterTest::convert2DToDataCustomDeleter() { } void AbstractImageConverterTest::convert3DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert3DToData; } @@ -1515,9 +1469,7 @@ void AbstractImageConverterTest::convertCompressed3DToDataFailed() { } void AbstractImageConverterTest::convertCompressed1DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed1DToData; } @@ -1530,9 +1482,7 @@ void AbstractImageConverterTest::convertCompressed1DToDataInvalidImage() { } void AbstractImageConverterTest::convertCompressed2DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed2DToData; } @@ -1545,9 +1495,7 @@ void AbstractImageConverterTest::convertCompressed2DToDataInvalidImage() { } void AbstractImageConverterTest::convertCompressed3DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed3DToData; } @@ -1560,9 +1508,7 @@ void AbstractImageConverterTest::convertCompressed3DToDataInvalidImage() { } void AbstractImageConverterTest::convertCompressed1DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed1DToData; } @@ -1576,9 +1522,7 @@ void AbstractImageConverterTest::convertCompressed1DToDataNotImplemented() { } void AbstractImageConverterTest::convertCompressed2DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed2DToData; } @@ -1592,9 +1536,7 @@ void AbstractImageConverterTest::convertCompressed2DToDataNotImplemented() { } void AbstractImageConverterTest::convertCompressed3DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed3DToData; } @@ -1608,9 +1550,7 @@ void AbstractImageConverterTest::convertCompressed3DToDataNotImplemented() { } void AbstractImageConverterTest::convertCompressed1DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed1DToData; } @@ -1627,9 +1567,7 @@ void AbstractImageConverterTest::convertCompressed1DToDataCustomDeleter() { } void AbstractImageConverterTest::convertCompressed2DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed2DToData; } @@ -1646,9 +1584,7 @@ void AbstractImageConverterTest::convertCompressed2DToDataCustomDeleter() { } void AbstractImageConverterTest::convertCompressed3DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed3DToData; } @@ -1883,9 +1819,7 @@ void AbstractImageConverterTest::convertLevels3DToDataFailed() { } void AbstractImageConverterTest::convertLevels1DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels1DToData; } @@ -1898,9 +1832,7 @@ void AbstractImageConverterTest::convertLevels1DToDataInvalidImage() { } void AbstractImageConverterTest::convertLevels2DToDataNoLevels() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -1913,9 +1845,7 @@ void AbstractImageConverterTest::convertLevels2DToDataNoLevels() { } void AbstractImageConverterTest::convertLevels2DToDataZeroSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -1932,9 +1862,7 @@ void AbstractImageConverterTest::convertLevels2DToDataZeroSize() { } void AbstractImageConverterTest::convertLevels2DToDataNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -1951,9 +1879,7 @@ void AbstractImageConverterTest::convertLevels2DToDataNullptr() { } void AbstractImageConverterTest::convertLevels2DToDataInconsistentFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -1971,9 +1897,7 @@ void AbstractImageConverterTest::convertLevels2DToDataInconsistentFormat() { } void AbstractImageConverterTest::convertLevels2DToDataInconsistentFormatExtra() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -1991,9 +1915,7 @@ void AbstractImageConverterTest::convertLevels2DToDataInconsistentFormatExtra() } void AbstractImageConverterTest::convertLevels2DToDataInconsistentFlags() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -2011,9 +1933,7 @@ void AbstractImageConverterTest::convertLevels2DToDataInconsistentFlags() { } void AbstractImageConverterTest::convertLevels3DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels3DToData; } @@ -2026,9 +1946,7 @@ void AbstractImageConverterTest::convertLevels3DToDataInvalidImage() { } void AbstractImageConverterTest::convertLevels1DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels1DToData; } @@ -2042,9 +1960,7 @@ void AbstractImageConverterTest::convertLevels1DToDataNotImplemented() { } void AbstractImageConverterTest::convertLevels2DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -2058,9 +1974,7 @@ void AbstractImageConverterTest::convertLevels2DToDataNotImplemented() { } void AbstractImageConverterTest::convertLevels3DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels3DToData; } @@ -2074,9 +1988,7 @@ void AbstractImageConverterTest::convertLevels3DToDataNotImplemented() { } void AbstractImageConverterTest::convertLevels1DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels1DToData; } @@ -2093,9 +2005,7 @@ void AbstractImageConverterTest::convertLevels1DToDataCustomDeleter() { } void AbstractImageConverterTest::convertLevels2DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToData; } @@ -2112,9 +2022,7 @@ void AbstractImageConverterTest::convertLevels2DToDataCustomDeleter() { } void AbstractImageConverterTest::convertLevels3DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels3DToData; } @@ -2245,9 +2153,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToDataFailed() { } void AbstractImageConverterTest::convertCompressedLevels1DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels1DToData; } @@ -2260,9 +2166,7 @@ void AbstractImageConverterTest::convertCompressedLevels1DToDataInvalidImage() { } void AbstractImageConverterTest::convertCompressedLevels2DToDataNoLevels() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToData; } @@ -2275,9 +2179,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToDataNoLevels() { } void AbstractImageConverterTest::convertCompressedLevels2DToDataZeroSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToData; } @@ -2294,9 +2196,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToDataZeroSize() { } void AbstractImageConverterTest::convertCompressedLevels2DToDataNullptr() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToData; } @@ -2313,9 +2213,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToDataNullptr() { } void AbstractImageConverterTest::convertCompressedLevels2DToDataInconsistentFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToData; } @@ -2333,9 +2231,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToDataInconsistentForm } void AbstractImageConverterTest::convertCompressedLevels2DToDataInconsistentFlags() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToData; } @@ -2353,9 +2249,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToDataInconsistentFlag } void AbstractImageConverterTest::convertCompressedLevels3DToDataInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels3DToData; } @@ -2368,9 +2262,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToDataInvalidImage() { } void AbstractImageConverterTest::convertCompressedLevels1DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels1DToData; } @@ -2384,9 +2276,7 @@ void AbstractImageConverterTest::convertCompressedLevels1DToDataNotImplemented() } void AbstractImageConverterTest::convertCompressedLevels2DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToData; } @@ -2400,9 +2290,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToDataNotImplemented() } void AbstractImageConverterTest::convertCompressedLevels3DToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels3DToData; } @@ -2416,9 +2304,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToDataNotImplemented() } void AbstractImageConverterTest::convertCompressedLevels1DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels1DToData; } @@ -2435,9 +2321,7 @@ void AbstractImageConverterTest::convertCompressedLevels1DToDataCustomDeleter() } void AbstractImageConverterTest::convertCompressedLevels2DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToData; } @@ -2454,9 +2338,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToDataCustomDeleter() } void AbstractImageConverterTest::convertCompressedLevels3DToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels3DToData; } @@ -2860,9 +2742,7 @@ void AbstractImageConverterTest::convert3DToFileThroughDataNotWritable() { } void AbstractImageConverterTest::convert1DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert1DToFile; } @@ -2875,9 +2755,7 @@ void AbstractImageConverterTest::convert1DToFileInvalidImage() { } void AbstractImageConverterTest::convert2DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2DToFile; } @@ -2890,9 +2768,7 @@ void AbstractImageConverterTest::convert2DToFileInvalidImage() { } void AbstractImageConverterTest::convert3DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert3DToFile; } @@ -2905,9 +2781,7 @@ void AbstractImageConverterTest::convert3DToFileInvalidImage() { } void AbstractImageConverterTest::convert1DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert1DToFile; } @@ -2921,9 +2795,7 @@ void AbstractImageConverterTest::convert1DToFileNotImplemented() { } void AbstractImageConverterTest::convert2DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert2DToFile; } @@ -2937,9 +2809,7 @@ void AbstractImageConverterTest::convert2DToFileNotImplemented() { } void AbstractImageConverterTest::convert3DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::Convert3DToFile; } @@ -3256,9 +3126,7 @@ void AbstractImageConverterTest::convertCompressed3DToFileThroughDataNotWritable } void AbstractImageConverterTest::convertCompressed1DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed1DToFile; } @@ -3271,9 +3139,7 @@ void AbstractImageConverterTest::convertCompressed1DToFileInvalidImage() { } void AbstractImageConverterTest::convertCompressed2DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed2DToFile; } @@ -3286,9 +3152,7 @@ void AbstractImageConverterTest::convertCompressed2DToFileInvalidImage() { } void AbstractImageConverterTest::convertCompressed3DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed3DToFile; } @@ -3301,9 +3165,7 @@ void AbstractImageConverterTest::convertCompressed3DToFileInvalidImage() { } void AbstractImageConverterTest::convertCompressed1DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed1DToFile; } @@ -3317,9 +3179,7 @@ void AbstractImageConverterTest::convertCompressed1DToFileNotImplemented() { } void AbstractImageConverterTest::convertCompressed2DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed2DToFile; } @@ -3333,9 +3193,7 @@ void AbstractImageConverterTest::convertCompressed2DToFileNotImplemented() { } void AbstractImageConverterTest::convertCompressed3DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressed3DToFile; } @@ -3724,9 +3582,7 @@ void AbstractImageConverterTest::convertLevels3DToFileThroughDataNotWritable() { } void AbstractImageConverterTest::convertLevels1DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels1DToFile; } @@ -3739,9 +3595,7 @@ void AbstractImageConverterTest::convertLevels1DToFileInvalidImage() { } void AbstractImageConverterTest::convertLevels2DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToFile; } @@ -3754,9 +3608,7 @@ void AbstractImageConverterTest::convertLevels2DToFileInvalidImage() { } void AbstractImageConverterTest::convertLevels3DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels3DToFile; } @@ -3769,9 +3621,7 @@ void AbstractImageConverterTest::convertLevels3DToFileInvalidImage() { } void AbstractImageConverterTest::convertLevels1DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels1DToFile; } @@ -3785,9 +3635,7 @@ void AbstractImageConverterTest::convertLevels1DToFileNotImplemented() { } void AbstractImageConverterTest::convertLevels2DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels2DToFile; } @@ -3801,9 +3649,7 @@ void AbstractImageConverterTest::convertLevels2DToFileNotImplemented() { } void AbstractImageConverterTest::convertLevels3DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertLevels3DToFile; } @@ -4147,9 +3993,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileThroughDataNotWr } void AbstractImageConverterTest::convertCompressedLevels1DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels1DToFile; } @@ -4162,9 +4006,7 @@ void AbstractImageConverterTest::convertCompressedLevels1DToFileInvalidImage() { } void AbstractImageConverterTest::convertCompressedLevels2DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToFile; } @@ -4177,9 +4019,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToFileInvalidImage() { } void AbstractImageConverterTest::convertCompressedLevels3DToFileInvalidImage() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels3DToFile; } @@ -4192,9 +4032,7 @@ void AbstractImageConverterTest::convertCompressedLevels3DToFileInvalidImage() { } void AbstractImageConverterTest::convertCompressedLevels1DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels1DToFile; } @@ -4208,9 +4046,7 @@ void AbstractImageConverterTest::convertCompressedLevels1DToFileNotImplemented() } void AbstractImageConverterTest::convertCompressedLevels2DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels2DToFile; } @@ -4224,9 +4060,7 @@ void AbstractImageConverterTest::convertCompressedLevels2DToFileNotImplemented() } void AbstractImageConverterTest::convertCompressedLevels3DToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImageConverter { ImageConverterFeatures doFeatures() const override { return ImageConverterFeature::ConvertCompressedLevels3DToFile; } diff --git a/src/Magnum/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp index 535342d5c..c8464df4f 100644 --- a/src/Magnum/Trade/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImporterTest.cpp @@ -761,9 +761,7 @@ void AbstractImporterTest::setFlags() { } void AbstractImporterTest::setFlagsFileOpened() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1049,9 +1047,7 @@ void AbstractImporterTest::openStateFailed() { } void AbstractImporterTest::openFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Importer: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1067,9 +1063,7 @@ void AbstractImporterTest::openFileNotImplemented() { } void AbstractImporterTest::openDataNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1085,9 +1079,7 @@ void AbstractImporterTest::openDataNotSupported() { } void AbstractImporterTest::openDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return ImporterFeature::OpenData; } @@ -1103,9 +1095,7 @@ void AbstractImporterTest::openDataNotImplemented() { } void AbstractImporterTest::openStateNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1121,9 +1111,7 @@ void AbstractImporterTest::openStateNotSupported() { } void AbstractImporterTest::openStateNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return ImporterFeature::OpenState; } @@ -1231,9 +1219,7 @@ void AbstractImporterTest::setFileCallbackTemplateConst() { } void AbstractImporterTest::setFileCallbackFileOpened() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1267,9 +1253,7 @@ void AbstractImporterTest::setFileCallbackNotImplemented() { } void AbstractImporterTest::setFileCallbackNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1504,9 +1488,7 @@ void AbstractImporterTest::thingCountNotImplemented() { } void AbstractImporterTest::thingCountNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1587,9 +1569,7 @@ void AbstractImporterTest::thingForNameNotImplemented() { } void AbstractImporterTest::thingForNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1705,9 +1685,7 @@ void AbstractImporterTest::thingByNameNotFound() { } void AbstractImporterTest::thingNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1753,9 +1731,7 @@ void AbstractImporterTest::thingNameNoFile() { } void AbstractImporterTest::thingNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1854,9 +1830,7 @@ void AbstractImporterTest::defaultSceneNotImplemented() { } void AbstractImporterTest::defaultSceneOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1954,9 +1928,7 @@ void AbstractImporterTest::object() { } void AbstractImporterTest::sceneForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -1974,9 +1946,7 @@ void AbstractImporterTest::sceneForNameOutOfRange() { } void AbstractImporterTest::objectForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3583,9 +3553,7 @@ void AbstractImporterTest::objectNameNotImplemented() { } void AbstractImporterTest::sceneNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3603,9 +3571,7 @@ void AbstractImporterTest::sceneNameOutOfRange() { } void AbstractImporterTest::objectNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3623,9 +3589,7 @@ void AbstractImporterTest::objectNameOutOfRange() { } void AbstractImporterTest::sceneNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3645,9 +3609,7 @@ void AbstractImporterTest::sceneNameCustomDeleter() { } void AbstractImporterTest::objectNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3667,9 +3629,7 @@ void AbstractImporterTest::objectNameCustomDeleter() { } void AbstractImporterTest::sceneNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3687,9 +3647,7 @@ void AbstractImporterTest::sceneNotImplemented() { } void AbstractImporterTest::sceneOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3732,9 +3690,7 @@ void AbstractImporterTest::sceneNonOwningDeleters() { } void AbstractImporterTest::sceneCustomDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3763,9 +3719,7 @@ void AbstractImporterTest::sceneCustomDataDeleter() { } void AbstractImporterTest::sceneCustomFieldDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3825,9 +3779,7 @@ void AbstractImporterTest::sceneFieldNameNotImplemented() { } void AbstractImporterTest::sceneFieldNameNotCustom() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3849,9 +3801,7 @@ void AbstractImporterTest::sceneFieldNameNotCustom() { } void AbstractImporterTest::sceneFieldNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3930,9 +3880,7 @@ void AbstractImporterTest::animationFailed() { } void AbstractImporterTest::animationForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3962,9 +3910,7 @@ void AbstractImporterTest::animationNameNotImplemented() { } void AbstractImporterTest::animationNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -3982,9 +3928,7 @@ void AbstractImporterTest::animationNameOutOfRange() { } void AbstractImporterTest::animationNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4004,9 +3948,7 @@ void AbstractImporterTest::animationNameCustomDeleter() { } void AbstractImporterTest::animationNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4024,9 +3966,7 @@ void AbstractImporterTest::animationNotImplemented() { } void AbstractImporterTest::animationOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4085,9 +4025,7 @@ void AbstractImporterTest::animationGrowableDeleters() { } void AbstractImporterTest::animationCustomDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4112,9 +4050,7 @@ void AbstractImporterTest::animationCustomDataDeleter() { } void AbstractImporterTest::animationCustomTrackDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4194,9 +4130,7 @@ void AbstractImporterTest::lightFailed() { } void AbstractImporterTest::lightForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4226,9 +4160,7 @@ void AbstractImporterTest::lightNameNotImplemented() { } void AbstractImporterTest::lightNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4246,9 +4178,7 @@ void AbstractImporterTest::lightNameOutOfRange() { } void AbstractImporterTest::lightNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4268,9 +4198,7 @@ void AbstractImporterTest::lightNameCustomDeleter() { } void AbstractImporterTest::lightNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4288,9 +4216,7 @@ void AbstractImporterTest::lightNotImplemented() { } void AbstractImporterTest::lightOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4363,9 +4289,7 @@ void AbstractImporterTest::cameraFailed() { } void AbstractImporterTest::cameraForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4395,9 +4319,7 @@ void AbstractImporterTest::cameraNameNotImplemented() { } void AbstractImporterTest::cameraNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4415,9 +4337,7 @@ void AbstractImporterTest::cameraNameOutOfRange() { } void AbstractImporterTest::cameraNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4437,9 +4357,7 @@ void AbstractImporterTest::cameraNameCustomDeleter() { } void AbstractImporterTest::cameraNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4457,9 +4375,7 @@ void AbstractImporterTest::cameraNotImplemented() { } void AbstractImporterTest::cameraOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4530,9 +4446,7 @@ void AbstractImporterTest::object2DCountNotImplemented() { } void AbstractImporterTest::object2DCountNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4562,9 +4476,7 @@ void AbstractImporterTest::object2DForNameNotImplemented() { } void AbstractImporterTest::object2DForNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4608,9 +4520,7 @@ void AbstractImporterTest::object2DByNameNotFound() { } void AbstractImporterTest::object2DForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4644,9 +4554,7 @@ void AbstractImporterTest::object2DNameNotImplemented() { } void AbstractImporterTest::object2DNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4664,9 +4572,7 @@ void AbstractImporterTest::object2DNameNoFile() { } void AbstractImporterTest::object2DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4686,9 +4592,7 @@ void AbstractImporterTest::object2DNameOutOfRange() { } void AbstractImporterTest::object2DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4713,9 +4617,7 @@ void AbstractImporterTest::object2DNotImplemented() { } void AbstractImporterTest::object2DNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4736,9 +4638,7 @@ void AbstractImporterTest::object2DNoFile() { } void AbstractImporterTest::object2DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4810,9 +4710,7 @@ void AbstractImporterTest::object3DCountNotImplemented() { } void AbstractImporterTest::object3DCountNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4842,9 +4740,7 @@ void AbstractImporterTest::object3DForNameNotImplemented() { } void AbstractImporterTest::object3DForNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4888,9 +4784,7 @@ void AbstractImporterTest::object3DByNameNotFound() { } void AbstractImporterTest::object3DForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4924,9 +4818,7 @@ void AbstractImporterTest::object3DNameNotImplemented() { } void AbstractImporterTest::object3DNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4944,9 +4836,7 @@ void AbstractImporterTest::object3DNameNoFile() { } void AbstractImporterTest::object3DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4966,9 +4856,7 @@ void AbstractImporterTest::object3DNameOutOfRange() { } void AbstractImporterTest::object3DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -4993,9 +4881,7 @@ void AbstractImporterTest::object3DNotImplemented() { } void AbstractImporterTest::object3DNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5016,9 +4902,7 @@ void AbstractImporterTest::object3DNoFile() { } void AbstractImporterTest::object3DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5096,9 +4980,7 @@ void AbstractImporterTest::skin2DFailed() { } void AbstractImporterTest::skin2DForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5128,9 +5010,7 @@ void AbstractImporterTest::skin2DNameNotImplemented() { } void AbstractImporterTest::skin2DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5148,9 +5028,7 @@ void AbstractImporterTest::skin2DNameOutOfRange() { } void AbstractImporterTest::skin2DNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5170,9 +5048,7 @@ void AbstractImporterTest::skin2DNameCustomDeleter() { } void AbstractImporterTest::skin2DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5190,9 +5066,7 @@ void AbstractImporterTest::skin2DNotImplemented() { } void AbstractImporterTest::skin2DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5234,9 +5108,7 @@ void AbstractImporterTest::skin2DNonOwningDeleters() { } void AbstractImporterTest::skin2DCustomJointDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5263,9 +5135,7 @@ void AbstractImporterTest::skin2DCustomJointDataDeleter() { } void AbstractImporterTest::skin2DCustomInverseBindMatrixDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5349,9 +5219,7 @@ void AbstractImporterTest::skin3DFailed() { } void AbstractImporterTest::skin3DForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5382,9 +5250,7 @@ void AbstractImporterTest::skin3DNameNotImplemented() { } void AbstractImporterTest::skin3DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5402,9 +5268,7 @@ void AbstractImporterTest::skin3DNameOutOfRange() { } void AbstractImporterTest::skin3DNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5424,9 +5288,7 @@ void AbstractImporterTest::skin3DNameCustomDeleter() { } void AbstractImporterTest::skin3DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5444,9 +5306,7 @@ void AbstractImporterTest::skin3DNotImplemented() { } void AbstractImporterTest::skin3DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5488,9 +5348,7 @@ void AbstractImporterTest::skin3DNonOwningDeleters() { } void AbstractImporterTest::skin3DCustomJointDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5517,9 +5375,7 @@ void AbstractImporterTest::skin3DCustomJointDataDeleter() { } void AbstractImporterTest::skin3DCustomInverseBindMatrixDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5658,9 +5514,7 @@ void AbstractImporterTest::meshLevelCountNotImplemented() { } void AbstractImporterTest::meshLevelCountOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5677,9 +5531,7 @@ void AbstractImporterTest::meshLevelCountOutOfRange() { } void AbstractImporterTest::meshLevelCountZero() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5705,9 +5557,7 @@ void AbstractImporterTest::meshLevelCountZero() { } void AbstractImporterTest::meshForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5737,9 +5587,7 @@ void AbstractImporterTest::meshNameNotImplemented() { } void AbstractImporterTest::meshNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5757,9 +5605,7 @@ void AbstractImporterTest::meshNameOutOfRange() { } void AbstractImporterTest::meshNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5779,9 +5625,7 @@ void AbstractImporterTest::meshNameCustomDeleter() { } void AbstractImporterTest::meshNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5799,9 +5643,7 @@ void AbstractImporterTest::meshNotImplemented() { } void AbstractImporterTest::meshOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5819,9 +5661,7 @@ void AbstractImporterTest::meshOutOfRange() { } void AbstractImporterTest::meshLevelOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5895,9 +5735,7 @@ void AbstractImporterTest::meshGrowableDeleters() { } void AbstractImporterTest::meshCustomIndexDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5924,9 +5762,7 @@ void AbstractImporterTest::meshCustomIndexDataDeleter() { } void AbstractImporterTest::meshCustomVertexDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -5951,9 +5787,7 @@ void AbstractImporterTest::meshCustomVertexDataDeleter() { } void AbstractImporterTest::meshCustomAttributesDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6013,9 +5847,7 @@ void AbstractImporterTest::meshAttributeNameNotImplemented() { } void AbstractImporterTest::meshAttributeNameNotCustom() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6037,9 +5869,7 @@ void AbstractImporterTest::meshAttributeNameNotCustom() { } void AbstractImporterTest::meshAttributeNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6105,9 +5935,7 @@ void AbstractImporterTest::mesh2DCountNotImplemented() { } void AbstractImporterTest::mesh2DCountNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6137,9 +5965,7 @@ void AbstractImporterTest::mesh2DForNameNotImplemented() { } void AbstractImporterTest::mesh2DForNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6171,9 +5997,7 @@ void AbstractImporterTest::mesh2DNameNotImplemented() { } void AbstractImporterTest::mesh2DNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6191,9 +6015,7 @@ void AbstractImporterTest::mesh2DNameNoFile() { } void AbstractImporterTest::mesh2DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6213,9 +6035,7 @@ void AbstractImporterTest::mesh2DNameOutOfRange() { } void AbstractImporterTest::mesh2DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6235,9 +6055,7 @@ void AbstractImporterTest::mesh2DNotImplemented() { } void AbstractImporterTest::mesh2DNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6255,9 +6073,7 @@ void AbstractImporterTest::mesh2DNoFile() { } void AbstractImporterTest::mesh2DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6323,9 +6139,7 @@ void AbstractImporterTest::mesh3DCountNotImplemented() { } void AbstractImporterTest::mesh3DCountNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6355,9 +6169,7 @@ void AbstractImporterTest::mesh3DForNameNotImplemented() { } void AbstractImporterTest::mesh3DForNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6389,9 +6201,7 @@ void AbstractImporterTest::mesh3DNameNotImplemented() { } void AbstractImporterTest::mesh3DNameNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6409,9 +6219,7 @@ void AbstractImporterTest::mesh3DNameNoFile() { } void AbstractImporterTest::mesh3DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6431,9 +6239,7 @@ void AbstractImporterTest::mesh3DNameOutOfRange() { } void AbstractImporterTest::mesh3DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6455,9 +6261,7 @@ void AbstractImporterTest::mesh3DNotImplemented() { } void AbstractImporterTest::mesh3DNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6475,9 +6279,7 @@ void AbstractImporterTest::mesh3DNoFile() { } void AbstractImporterTest::mesh3DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6595,9 +6397,7 @@ void AbstractImporterTest::materialDeprecatedFallback() { #endif void AbstractImporterTest::materialForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6627,9 +6427,7 @@ void AbstractImporterTest::materialNameNotImplemented() { } void AbstractImporterTest::materialNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6647,9 +6445,7 @@ void AbstractImporterTest::materialNameOutOfRange() { } void AbstractImporterTest::materialNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6669,9 +6465,7 @@ void AbstractImporterTest::materialNameCustomDeleter() { } void AbstractImporterTest::materialNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6689,9 +6483,7 @@ void AbstractImporterTest::materialNotImplemented() { } void AbstractImporterTest::materialOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6732,9 +6524,7 @@ void AbstractImporterTest::materialNonOwningDeleters() { } void AbstractImporterTest::materialCustomAttributeDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6763,9 +6553,7 @@ void AbstractImporterTest::materialCustomAttributeDataDeleter() { } void AbstractImporterTest::materialCustomLayerDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6847,9 +6635,7 @@ void AbstractImporterTest::textureFailed() { } void AbstractImporterTest::textureForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6879,9 +6665,7 @@ void AbstractImporterTest::textureNameNotImplemented() { } void AbstractImporterTest::textureNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6899,9 +6683,7 @@ void AbstractImporterTest::textureNameOutOfRange() { } void AbstractImporterTest::textureNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6921,9 +6703,7 @@ void AbstractImporterTest::textureNameCustomDeleter() { } void AbstractImporterTest::textureNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -6941,9 +6721,7 @@ void AbstractImporterTest::textureNotImplemented() { } void AbstractImporterTest::textureOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7033,9 +6811,7 @@ void AbstractImporterTest::image1DLevelCountNotImplemented() { } void AbstractImporterTest::image1DLevelCountOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7052,9 +6828,7 @@ void AbstractImporterTest::image1DLevelCountOutOfRange() { } void AbstractImporterTest::image1DLevelCountZero() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7080,9 +6854,7 @@ void AbstractImporterTest::image1DLevelCountZero() { } void AbstractImporterTest::image1DForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7112,9 +6884,7 @@ void AbstractImporterTest::image1DNameNotImplemented() { } void AbstractImporterTest::image1DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7132,9 +6902,7 @@ void AbstractImporterTest::image1DNameOutOfRange() { } void AbstractImporterTest::image1DNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7154,9 +6922,7 @@ void AbstractImporterTest::image1DNameCustomDeleter() { } void AbstractImporterTest::image1DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7174,9 +6940,7 @@ void AbstractImporterTest::image1DNotImplemented() { } void AbstractImporterTest::image1DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7194,9 +6958,7 @@ void AbstractImporterTest::image1DOutOfRange() { } void AbstractImporterTest::image1DLevelOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7256,9 +7018,7 @@ void AbstractImporterTest::image1DGrowableDeleter() { } void AbstractImporterTest::image1DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7355,9 +7115,7 @@ void AbstractImporterTest::image2DLevelCountNotImplemented() { } void AbstractImporterTest::image2DLevelCountOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7374,9 +7132,7 @@ void AbstractImporterTest::image2DLevelCountOutOfRange() { } void AbstractImporterTest::image2DLevelCountZero() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7402,9 +7158,7 @@ void AbstractImporterTest::image2DLevelCountZero() { } void AbstractImporterTest::image2DForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7434,9 +7188,7 @@ void AbstractImporterTest::image2DNameNotImplemented() { } void AbstractImporterTest::image2DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7454,9 +7206,7 @@ void AbstractImporterTest::image2DNameOutOfRange() { } void AbstractImporterTest::image2DNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7476,9 +7226,7 @@ void AbstractImporterTest::image2DNameCustomDeleter() { } void AbstractImporterTest::image2DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7496,9 +7244,7 @@ void AbstractImporterTest::image2DNotImplemented() { } void AbstractImporterTest::image2DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7516,9 +7262,7 @@ void AbstractImporterTest::image2DOutOfRange() { } void AbstractImporterTest::image2DLevelOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7578,9 +7322,7 @@ void AbstractImporterTest::image2DGrowableDeleter() { } void AbstractImporterTest::image2DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7665,9 +7407,7 @@ void AbstractImporterTest::image3DFailed() { } void AbstractImporterTest::image3DForNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7697,9 +7437,7 @@ void AbstractImporterTest::image3DLevelCountNotImplemented() { } void AbstractImporterTest::image3DLevelCountOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7716,9 +7454,7 @@ void AbstractImporterTest::image3DLevelCountOutOfRange() { } void AbstractImporterTest::image3DLevelCountZero() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7756,9 +7492,7 @@ void AbstractImporterTest::image3DNameNotImplemented() { } void AbstractImporterTest::image3DNameOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7776,9 +7510,7 @@ void AbstractImporterTest::image3DNameOutOfRange() { } void AbstractImporterTest::image3DNameCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7798,9 +7530,7 @@ void AbstractImporterTest::image3DNameCustomDeleter() { } void AbstractImporterTest::image3DNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7818,9 +7548,7 @@ void AbstractImporterTest::image3DNotImplemented() { } void AbstractImporterTest::image3DOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7838,9 +7566,7 @@ void AbstractImporterTest::image3DOutOfRange() { } void AbstractImporterTest::image3DLevelOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7900,9 +7626,7 @@ void AbstractImporterTest::image3DGrowableDeleter() { } void AbstractImporterTest::image3DCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } @@ -7949,9 +7673,7 @@ void AbstractImporterTest::importerStateNotImplemented() { } void AbstractImporterTest::importerStateNoFile() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractImporter { ImporterFeatures doFeatures() const override { return {}; } diff --git a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp index 06761c6c9..5cee66b72 100644 --- a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp @@ -133,9 +133,7 @@ AbstractSceneConverterTest::AbstractSceneConverterTest() { } void AbstractSceneConverterTest::featuresNone() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return {}; } @@ -191,9 +189,7 @@ void AbstractSceneConverterTest::setFlagsNotImplemented() { } void AbstractSceneConverterTest::thingNotSupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { @@ -254,9 +250,7 @@ void AbstractSceneConverterTest::convertMeshFailed() { } void AbstractSceneConverterTest::convertMeshNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMesh; } @@ -320,9 +314,7 @@ void AbstractSceneConverterTest::convertMeshGrowableDeleters() { } void AbstractSceneConverterTest::convertMeshCustomIndexDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMesh; } @@ -342,9 +334,7 @@ void AbstractSceneConverterTest::convertMeshCustomIndexDataDeleter() { } void AbstractSceneConverterTest::convertMeshCustomVertexDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMesh; } @@ -364,9 +354,7 @@ void AbstractSceneConverterTest::convertMeshCustomVertexDataDeleter() { } void AbstractSceneConverterTest::convertMeshCustomAttributeDataDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMesh; } @@ -427,9 +415,7 @@ void AbstractSceneConverterTest::convertMeshInPlaceFailed() { } void AbstractSceneConverterTest::convertMeshInPlaceNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMeshInPlace; } @@ -476,9 +462,7 @@ void AbstractSceneConverterTest::convertMeshToDataFailed() { } void AbstractSceneConverterTest::convertMeshToDataNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMeshToData; } @@ -529,9 +513,7 @@ void AbstractSceneConverterTest::convertMeshToDataGrowableDeleter() { } void AbstractSceneConverterTest::convertMeshToDataCustomDeleter() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMeshToData; } @@ -648,9 +630,7 @@ void AbstractSceneConverterTest::convertMeshToFileThroughDataNotWritable() { } void AbstractSceneConverterTest::convertMeshToFileNotImplemented() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct: AbstractSceneConverter { SceneConverterFeatures doFeatures() const override { return SceneConverterFeature::ConvertMeshToFile; } diff --git a/src/Magnum/Trade/Test/AnimationDataTest.cpp b/src/Magnum/Trade/Test/AnimationDataTest.cpp index 4e926df2e..a11eaa2e9 100644 --- a/src/Magnum/Trade/Test/AnimationDataTest.cpp +++ b/src/Magnum/Trade/Test/AnimationDataTest.cpp @@ -402,9 +402,7 @@ void AnimationDataTest::constructImplicitDurationNotOwned() { } void AnimationDataTest::constructNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -414,9 +412,7 @@ void AnimationDataTest::constructNotOwnedFlagOwned() { } void AnimationDataTest::constructImplicitDurationNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -528,9 +524,7 @@ void AnimationDataTest::constructMove() { } void AnimationDataTest::mutableAccessNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const std::pair keyframes[] { {1.0f, true}, @@ -580,9 +574,7 @@ void AnimationDataTest::trackCustomResultType() { } void AnimationDataTest::trackWrongIndex() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -603,9 +595,7 @@ void AnimationDataTest::trackWrongIndex() { } void AnimationDataTest::trackWrongType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -622,9 +612,7 @@ void AnimationDataTest::trackWrongType() { } void AnimationDataTest::trackWrongResultType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Trade/Test/CameraDataTest.cpp b/src/Magnum/Trade/Test/CameraDataTest.cpp index a2d1c573f..c314f96b9 100644 --- a/src/Magnum/Trade/Test/CameraDataTest.cpp +++ b/src/Magnum/Trade/Test/CameraDataTest.cpp @@ -107,9 +107,7 @@ void CameraDataTest::construct2D() { } void CameraDataTest::construct2DFoV() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -120,9 +118,7 @@ void CameraDataTest::construct2DFoV() { } void CameraDataTest::construct2DNearFar() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -166,9 +162,7 @@ void CameraDataTest::constructMove() { } void CameraDataTest::fovNonPerspective() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Trade/Test/FlatMaterialDataTest.cpp b/src/Magnum/Trade/Test/FlatMaterialDataTest.cpp index 143be2c71..f89b4785b 100644 --- a/src/Magnum/Trade/Test/FlatMaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/FlatMaterialDataTest.cpp @@ -307,9 +307,7 @@ void FlatMaterialDataTest::texturedImplicitCoordinatesLayer() { } void FlatMaterialDataTest::invalidTextures() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); FlatMaterialData data{{}, {}}; diff --git a/src/Magnum/Trade/Test/ImageDataTest.cpp b/src/Magnum/Trade/Test/ImageDataTest.cpp index e92ecc4bf..587017a95 100644 --- a/src/Magnum/Trade/Test/ImageDataTest.cpp +++ b/src/Magnum/Trade/Test/ImageDataTest.cpp @@ -593,9 +593,7 @@ void ImageDataTest::constructCompressedImplementationSpecificNotOwned() { } void ImageDataTest::constructGenericNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char data[4*4]; @@ -609,9 +607,7 @@ void ImageDataTest::constructGenericNotOwnedFlagOwned() { } void ImageDataTest::constructImplementationSpecificNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char data[3*12]; @@ -625,9 +621,7 @@ void ImageDataTest::constructImplementationSpecificNotOwnedFlagOwned() { } void ImageDataTest::constructCompressedGenericNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char data[8]; @@ -642,9 +636,7 @@ void ImageDataTest::constructCompressedGenericNotOwnedFlagOwned() { } void ImageDataTest::constructCompressedImplementationSpecificNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char data[8]; @@ -657,9 +649,7 @@ void ImageDataTest::constructCompressedImplementationSpecificNotOwnedFlagOwned() } void ImageDataTest::constructInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -670,9 +660,7 @@ void ImageDataTest::constructInvalidSize() { } void ImageDataTest::constructInvalidCubeMap() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -707,9 +695,7 @@ void ImageDataTest::constructCompressedInvalidSize() { } void ImageDataTest::constructCompressedInvalidCubeMap() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1026,9 +1012,7 @@ void ImageDataTest::dataRvalue() { } void ImageDataTest::mutableAccessNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char data[4*4]{}; ImageData2D a{PixelFormat::RGBA8Unorm, {2, 2}, DataFlags{}, data}; @@ -1161,9 +1145,7 @@ void ImageDataTest::pixels3D() { } void ImageDataTest::pixelsCompressed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Trade::ImageData2D a{CompressedPixelFormat::Bc1RGBAUnorm, {4, 4}, Containers::Array{8}}; diff --git a/src/Magnum/Trade/Test/LightDataTest.cpp b/src/Magnum/Trade/Test/LightDataTest.cpp index e9c60105b..c285c59d6 100644 --- a/src/Magnum/Trade/Test/LightDataTest.cpp +++ b/src/Magnum/Trade/Test/LightDataTest.cpp @@ -385,9 +385,7 @@ void LightDataTest::constructNone() { } void LightDataTest::constructInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); auto&& data = ConstructInvalidData[testCaseInstanceId()]; setTestCaseDescription(data.name); diff --git a/src/Magnum/Trade/Test/MaterialDataTest.cpp b/src/Magnum/Trade/Test/MaterialDataTest.cpp index 5e58fa443..1cbd5854c 100644 --- a/src/Magnum/Trade/Test/MaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/MaterialDataTest.cpp @@ -346,9 +346,7 @@ void MaterialDataTest::attributeTypeSize() { } void MaterialDataTest::attributeTypeSizeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -669,9 +667,7 @@ void MaterialDataTest::constructAttributeLayer() { } void MaterialDataTest::constructAttributeInvalidName() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -683,9 +679,7 @@ void MaterialDataTest::constructAttributeInvalidName() { } void MaterialDataTest::constructAttributeInvalidLayerName() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -697,9 +691,7 @@ void MaterialDataTest::constructAttributeInvalidLayerName() { } void MaterialDataTest::constructAttributeWrongTypeForName() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -709,9 +701,7 @@ void MaterialDataTest::constructAttributeWrongTypeForName() { } void MaterialDataTest::constructAttributeInvalidType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -723,9 +713,7 @@ void MaterialDataTest::constructAttributeInvalidType() { } void MaterialDataTest::constructAttributeEmptyName() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -739,9 +727,7 @@ void MaterialDataTest::constructAttributeEmptyName() { } void MaterialDataTest::constructAttributeEmptyNameString() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* This has no reason to not be allowed */ MaterialAttributeData{"hello this string is empty", ""}; @@ -759,9 +745,7 @@ void MaterialDataTest::constructAttributeEmptyNameString() { } void MaterialDataTest::constructAttributeTooLarge() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -782,9 +766,7 @@ void MaterialDataTest::constructAttributeTooLarge() { } void MaterialDataTest::constructAttributeTooLargeString() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -798,9 +780,7 @@ void MaterialDataTest::constructAttributeTooLargeString() { } void MaterialDataTest::constructAttributeTooLargeNameString() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -810,9 +790,7 @@ void MaterialDataTest::constructAttributeTooLargeNameString() { } void MaterialDataTest::constructAttributeWrongAccessType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -821,9 +799,7 @@ void MaterialDataTest::constructAttributeWrongAccessType() { } void MaterialDataTest::constructAttributeWrongAccessPointerType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Int a = 3; const Float b = 57.0f; @@ -847,9 +823,7 @@ void MaterialDataTest::constructAttributeWrongAccessPointerType() { } void MaterialDataTest::constructAttributeWrongAccessTypeString() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -970,9 +944,7 @@ void MaterialDataTest::construct() { } void MaterialDataTest::constructEmptyAttribute() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -984,9 +956,7 @@ void MaterialDataTest::constructEmptyAttribute() { } void MaterialDataTest::constructDuplicateAttribute() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array attributes{InPlaceInit, { /* This attribute is in the first layer, so it should not be reported @@ -1298,9 +1268,7 @@ void MaterialDataTest::constructLayers() { } void MaterialDataTest::constructLayersNotMonotonic() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1315,9 +1283,7 @@ void MaterialDataTest::constructLayersNotMonotonic() { } void MaterialDataTest::constructLayersOffsetOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1429,9 +1395,7 @@ void MaterialDataTest::constructNonOwnedLayers() { } void MaterialDataTest::constructNonOwnedEmptyAttribute() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialAttributeData attributes[]{ {"DiffuseTexture"_s, 12u}, @@ -1446,9 +1410,7 @@ void MaterialDataTest::constructNonOwnedEmptyAttribute() { } void MaterialDataTest::constructNonOwnedNotSorted() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialAttributeData attributes[]{ {"DiffuseTextureCoordinates"_s, 5u}, @@ -1463,9 +1425,7 @@ void MaterialDataTest::constructNonOwnedNotSorted() { } void MaterialDataTest::constructNonOwnedDuplicateAttribute() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialAttributeData attributes[]{ {"DiffuseTexture"_s, 35u}, @@ -1481,9 +1441,7 @@ void MaterialDataTest::constructNonOwnedDuplicateAttribute() { } void MaterialDataTest::constructNonOwnedLayersNotMonotonic() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialAttributeData attributes[]{ {MaterialAttribute::AlphaBlend, true}, @@ -1506,9 +1464,7 @@ void MaterialDataTest::constructNonOwnedLayersNotMonotonic() { } void MaterialDataTest::constructNonOwnedLayersOffsetOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialAttributeData attributes[]{ {MaterialAttribute::AlphaBlend, true}, @@ -1531,9 +1487,7 @@ void MaterialDataTest::constructNonOwnedLayersOffsetOutOfBounds() { } void MaterialDataTest::constructNonOwnedAttributeFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialAttributeData attributes[]{ {MaterialAttribute::DoubleSided, true} @@ -1546,9 +1500,7 @@ void MaterialDataTest::constructNonOwnedAttributeFlagOwned() { } void MaterialDataTest::constructNonOwnedLayerFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialAttributeData attributes[]{ {MaterialAttribute::DoubleSided, true} @@ -1776,9 +1728,7 @@ void MaterialDataTest::accessOptional() { } void MaterialDataTest::accessOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {MaterialAttribute::AlphaMask, 0.5f}, @@ -1807,9 +1757,7 @@ void MaterialDataTest::accessOutOfBounds() { } void MaterialDataTest::accessNotFound() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {"DiffuseColor", 0xff3366aa_rgbaf} @@ -1835,9 +1783,7 @@ void MaterialDataTest::accessNotFound() { } void MaterialDataTest::accessWrongType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {"DiffuseColor", 0xff3366aa_rgbaf} @@ -1871,9 +1817,7 @@ void MaterialDataTest::accessWrongType() { } void MaterialDataTest::accessWrongPointerType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Int a = 3; const Double b = 57.0; @@ -1907,9 +1851,7 @@ void MaterialDataTest::accessWrongPointerType() { } void MaterialDataTest::accessWrongTypeString() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {"Shininess", 0.0f} @@ -2102,9 +2044,7 @@ void MaterialDataTest::accessLayersTexturedBaseMaterialMatrixCoordinatesLayer() } void MaterialDataTest::accessLayersInvalidTextures() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {MaterialAttribute::LayerName, "ClearCoat"}, @@ -2366,9 +2306,7 @@ void MaterialDataTest::accessLayerStringOptional() { } void MaterialDataTest::accessLayerOutOfBounds() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {MaterialAttribute::AlphaMask, 0.5f}, @@ -2453,9 +2391,7 @@ void MaterialDataTest::accessLayerOutOfBounds() { } void MaterialDataTest::accessLayerNotFound() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {MaterialAttribute::LayerName, "clearCoat"}, @@ -2540,9 +2476,7 @@ void MaterialDataTest::accessLayerNotFound() { } void MaterialDataTest::accessInvalidLayerName() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, {}}; @@ -2626,9 +2560,7 @@ void MaterialDataTest::accessInvalidLayerName() { } void MaterialDataTest::accessOutOfBoundsInLayerIndex() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {MaterialAttribute::AlphaMask, 0.5f}, @@ -2657,9 +2589,7 @@ void MaterialDataTest::accessOutOfBoundsInLayerIndex() { } void MaterialDataTest::accessOutOfBoundsInLayerString() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {MaterialAttribute::LayerName, "ClearCoat"}, @@ -2688,9 +2618,7 @@ void MaterialDataTest::accessOutOfBoundsInLayerString() { } void MaterialDataTest::accessNotFoundInLayerIndex() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {"DiffuseColor", 0xff3366aa_rgbaf} @@ -2716,9 +2644,7 @@ void MaterialDataTest::accessNotFoundInLayerIndex() { } void MaterialDataTest::accessNotFoundInLayerString() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, { {MaterialAttribute::LayerName, "ClearCoat"}, @@ -2745,9 +2671,7 @@ void MaterialDataTest::accessNotFoundInLayerString() { } void MaterialDataTest::accessInvalidAttributeName() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MaterialData data{{}, {}}; @@ -2800,9 +2724,7 @@ void MaterialDataTest::accessInvalidAttributeName() { } void MaterialDataTest::accessMutableNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const MaterialAttributeData attributes[]{ {MaterialAttribute::DiffuseColor, 0x335566ff_rgbaf}, diff --git a/src/Magnum/Trade/Test/MeshDataTest.cpp b/src/Magnum/Trade/Test/MeshDataTest.cpp index 890f2401a..0722ec57b 100644 --- a/src/Magnum/Trade/Test/MeshDataTest.cpp +++ b/src/Magnum/Trade/Test/MeshDataTest.cpp @@ -439,9 +439,7 @@ void MeshDataTest::customAttributeName() { } void MeshDataTest::customAttributeNameTooLarge() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -450,9 +448,7 @@ void MeshDataTest::customAttributeNameTooLarge() { } void MeshDataTest::customAttributeNameNotCustom() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -592,9 +588,7 @@ void MeshDataTest::constructIndexStrided() { } void MeshDataTest::constructIndexStridedWrongStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char toomuch[2*(32768 + 1)]; @@ -621,9 +615,7 @@ void MeshDataTest::constructIndexTypeErasedContiguous() { } void MeshDataTest::constructIndexTypeErasedContiguousImplementationSpecificFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char indexData[3*2]{}; @@ -634,9 +626,7 @@ void MeshDataTest::constructIndexTypeErasedContiguousImplementationSpecificForma } void MeshDataTest::constructIndexTypeErasedContiguousWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char indexData[3*2]{}; @@ -676,9 +666,7 @@ void MeshDataTest::constructIndexTypeErasedStridedImplementationSpecificFormat() } void MeshDataTest::constructIndexTypeErasedStridedWrongStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char toomuch[2*(32768 + 1)]{}; @@ -731,9 +719,7 @@ void MeshDataTest::constructIndex2DNotIndexed() { } void MeshDataTest::constructIndex2DWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char data[3*3]{}; @@ -744,9 +730,7 @@ void MeshDataTest::constructIndex2DWrongSize() { } void MeshDataTest::constructIndex2DWrongStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char toomuch[2*(32768 + 1)]; @@ -764,9 +748,7 @@ void MeshDataTest::constructIndex2DWrongStride() { } void MeshDataTest::constructIndex2DNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char data[3*4]{}; @@ -857,9 +839,7 @@ void MeshDataTest::constructAttribute2D() { } void MeshDataTest::constructAttribute2DWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char positionData[4*sizeof(Vector2)]{}; @@ -872,9 +852,7 @@ void MeshDataTest::constructAttribute2DWrongSize() { } void MeshDataTest::constructAttribute2DNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char positionData[4*sizeof(Vector2)]{}; @@ -968,9 +946,7 @@ void MeshDataTest::constructAttributeImplementationSpecificFormat() { } void MeshDataTest::constructAttributeWrongFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2 positionData[3]; @@ -984,9 +960,7 @@ void MeshDataTest::constructAttributeWrongFormat() { } void MeshDataTest::constructAttributeWrongStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char toomuch[2*(32768 + sizeof(Vector2))]; @@ -1016,9 +990,7 @@ void MeshDataTest::constructAttributeWrongStride() { } void MeshDataTest::constructAttributeWrongDataAccess() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2 positionData[3]; MeshAttributeData a{MeshAttribute::Position, Containers::arrayView(positionData)}; @@ -1066,9 +1038,7 @@ void MeshDataTest::constructArrayAttribute() { } void MeshDataTest::constructArrayAttributeNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2 vertexData[4*3]{}; @@ -1093,9 +1063,7 @@ void MeshDataTest::constructArrayAttribute2D() { } void MeshDataTest::constructArrayAttribute2DWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char vertexData[3*4*sizeof(Vector2)]{}; @@ -1108,9 +1076,7 @@ void MeshDataTest::constructArrayAttribute2DWrongSize() { } void MeshDataTest::constructArrayAttribute2DNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char vertexData[4*3*sizeof(Vector2)]{}; @@ -1164,9 +1130,7 @@ void MeshDataTest::constructArrayAttributeOffsetOnly() { } void MeshDataTest::constructArrayAttributeNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2 positionData[3*3]; Containers::ArrayView positions{positionData}; @@ -2210,9 +2174,7 @@ void MeshDataTest::constructSpecialAttributeStridesImplementationSpecificVertexF } void MeshDataTest::constructIndexDataButNotIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array indexData{6}; @@ -2224,9 +2186,7 @@ void MeshDataTest::constructIndexDataButNotIndexed() { } void MeshDataTest::constructAttributelessImplicitVertexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -2235,9 +2195,7 @@ void MeshDataTest::constructAttributelessImplicitVertexCount() { } void MeshDataTest::constructIndicesNotContained() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const Containers::Array indexData{reinterpret_cast(0xbadda9), 3*sizeof(UnsignedShort), [](char*, std::size_t){}}; Containers::Array sameIndexDataButMovable{reinterpret_cast(0xbadda9), 3*sizeof(UnsignedShort), [](char*, std::size_t){}}; @@ -2293,9 +2251,7 @@ void MeshDataTest::constructIndicesNotContained() { } void MeshDataTest::constructAttributeNotContained() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* See implementationSpecificVertexFormatNotContained() below for implementation-specific formats */ @@ -2405,9 +2361,7 @@ void MeshDataTest::constructAttributeNotContained() { } void MeshDataTest::constructInconsitentVertexCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{136}; MeshAttributeData positions{MeshAttribute::Position, Containers::arrayCast(vertexData).prefix(3)}; @@ -2426,9 +2380,7 @@ void MeshDataTest::constructInconsitentVertexCount() { } void MeshDataTest::constructNotOwnedIndexFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort indexData[]{0, 1, 0}; const Vector2 vertexData[]{{0.1f, 0.2f}, {0.4f, 0.5f}}; @@ -2444,9 +2396,7 @@ void MeshDataTest::constructNotOwnedIndexFlagOwned() { } void MeshDataTest::constructNotOwnedVertexFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort indexData[]{0, 1, 0}; const Vector2 vertexData[]{{0.1f, 0.2f}, {0.4f, 0.5f}}; @@ -2462,9 +2412,7 @@ void MeshDataTest::constructNotOwnedVertexFlagOwned() { } void MeshDataTest::constructIndicesNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedShort indexData[]{0, 1, 0}; Containers::Array vertexData{2*sizeof(Vector2)}; @@ -2483,9 +2431,7 @@ void MeshDataTest::constructIndicesNotOwnedFlagOwned() { } void MeshDataTest::constructVerticesNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array indexData{3*sizeof(UnsignedShort)}; auto indexView = Containers::arrayCast(indexData); @@ -2505,9 +2451,7 @@ void MeshDataTest::constructVerticesNotOwnedFlagOwned() { } void MeshDataTest::constructIndexlessNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const Vector2 vertexData[]{{0.1f, 0.2f}, {0.4f, 0.5f}}; MeshAttributeData positions{MeshAttribute::Position, Containers::arrayView(vertexData)}; @@ -2520,9 +2464,7 @@ void MeshDataTest::constructIndexlessNotOwnedFlagOwned() { } void MeshDataTest::constructAttributelessNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort indexData[]{0, 1, 0}; MeshIndexData indices{indexData}; @@ -2535,9 +2477,7 @@ void MeshDataTest::constructAttributelessNotOwnedFlagOwned() { } void MeshDataTest::constructInvalidAttributeData() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshAttributeData a; MeshAttributeData b{3}; @@ -2672,9 +2612,7 @@ template void MeshDataTest::indicesAsArray() { } void MeshDataTest::indicesIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array indexData{3*sizeof(UnsignedInt)}; MeshData data{MeshPrimitive::Points, std::move(indexData), MeshIndexData{Containers::arrayCast(indexData)}, 1}; @@ -2768,9 +2706,7 @@ template void MeshDataTest::positions2DAsArrayPackedSignedNormalized() } void MeshDataTest::positions2DIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector2)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Position, Containers::arrayCast(vertexData)}}}; @@ -2874,9 +2810,7 @@ template void MeshDataTest::positions3DAsArrayPackedSignedNormalized() } void MeshDataTest::positions3DIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector3)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Position, Containers::arrayCast(vertexData)}}}; @@ -2926,9 +2860,7 @@ template void MeshDataTest::tangentsAsArrayPackedSignedNormalized() { } void MeshDataTest::tangentsIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector3)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Tangent, Containers::arrayCast(vertexData)}}}; @@ -2976,9 +2908,7 @@ template void MeshDataTest::bitangentSignsAsArrayPackedSignedNormalized } void MeshDataTest::bitangentSignsAsArrayNotFourComponent() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector3s)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Tangent, VertexFormat::Vector3sNormalized, Containers::arrayCast(vertexData)}}}; @@ -2992,9 +2922,7 @@ void MeshDataTest::bitangentSignsAsArrayNotFourComponent() { } void MeshDataTest::bitangentSignsIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector4)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Tangent, Containers::arrayCast(vertexData)}}}; @@ -3043,9 +2971,7 @@ template void MeshDataTest::bitangentsAsArrayPackedSignedNormalized() { } void MeshDataTest::bitangentsIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector3)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Bitangent, Containers::arrayCast(vertexData)}}}; @@ -3094,9 +3020,7 @@ template void MeshDataTest::normalsAsArrayPackedSignedNormalized() { } void MeshDataTest::normalsIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector3)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Normal, Containers::arrayCast(vertexData)}}}; @@ -3190,9 +3114,7 @@ template void MeshDataTest::textureCoordinates2DAsArrayPackedSignedNorm } void MeshDataTest::textureCoordinates2DIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Vector2)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::TextureCoordinates, Containers::arrayCast(vertexData)}}}; @@ -3239,9 +3161,7 @@ template void MeshDataTest::colorsAsArrayPackedUnsignedNormalized() { } void MeshDataTest::colorsIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(Color4)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::Color, Containers::arrayCast(vertexData)}}}; @@ -3272,9 +3192,7 @@ template void MeshDataTest::objectIdsAsArray() { } void MeshDataTest::objectIdsIntoArrayInvalidSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array vertexData{3*sizeof(UnsignedInt)}; MeshData data{MeshPrimitive::Points, std::move(vertexData), {MeshAttributeData{MeshAttribute::ObjectId, Containers::arrayCast(vertexData)}}}; @@ -3288,9 +3206,7 @@ void MeshDataTest::objectIdsIntoArrayInvalidSize() { } void MeshDataTest::implementationSpecificIndexTypeWrongAccess() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); VertexWithImplementationSpecificData indexData[3]; @@ -3311,9 +3227,7 @@ void MeshDataTest::implementationSpecificIndexTypeWrongAccess() { } void MeshDataTest::implementationSpecificVertexFormatWrongAccess() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); VertexWithImplementationSpecificData vertexData[2]; @@ -3375,9 +3289,7 @@ void MeshDataTest::implementationSpecificVertexFormatWrongAccess() { } void MeshDataTest::mutableAccessNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort indexData[3]{}; const Vector2 vertexData[2]{}; @@ -3414,9 +3326,7 @@ void MeshDataTest::mutableAccessNotAllowed() { } void MeshDataTest::indicesNotIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshData data{MeshPrimitive::Triangles, 37}; @@ -3443,9 +3353,7 @@ void MeshDataTest::indicesNotIndexed() { } void MeshDataTest::indicesWrongType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array indexData{sizeof(UnsignedShort)}; auto indexView = Containers::arrayCast(indexData); @@ -3462,9 +3370,7 @@ void MeshDataTest::indicesWrongType() { } void MeshDataTest::attributeNotFound() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshAttributeData colors1{MeshAttribute::Color, VertexFormat::Vector3, nullptr}; MeshAttributeData colors2{MeshAttribute::Color, VertexFormat::Vector4, nullptr}; @@ -3573,9 +3479,7 @@ void MeshDataTest::attributeNotFound() { } void MeshDataTest::attributeWrongType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshAttributeData positions{MeshAttribute::Position, VertexFormat::Vector3, nullptr}; MeshData data{MeshPrimitive::Points, nullptr, {positions}}; @@ -3594,9 +3498,7 @@ void MeshDataTest::attributeWrongType() { } void MeshDataTest::attributeWrongArrayAccess() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Vector2 vertexData[3*4]{ {1.0f, 2.0f}, {3.0f, 4.0f}, {5.0f, 6.0f}, {7.0f, 8.0f}, diff --git a/src/Magnum/Trade/Test/ObjectData2DTest.cpp b/src/Magnum/Trade/Test/ObjectData2DTest.cpp index bc3718373..42825549e 100644 --- a/src/Magnum/Trade/Test/ObjectData2DTest.cpp +++ b/src/Magnum/Trade/Test/ObjectData2DTest.cpp @@ -232,9 +232,7 @@ void ObjectData2DTest::constructMoveMesh() { } void ObjectData2DTest::accessInvalidTransformations() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectOutput{&out}; diff --git a/src/Magnum/Trade/Test/ObjectData3DTest.cpp b/src/Magnum/Trade/Test/ObjectData3DTest.cpp index 8da45ca40..e093fe645 100644 --- a/src/Magnum/Trade/Test/ObjectData3DTest.cpp +++ b/src/Magnum/Trade/Test/ObjectData3DTest.cpp @@ -246,9 +246,7 @@ void ObjectData3DTest::constructMoveMesh() { } void ObjectData3DTest::accessInvalidTransformations() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectOutput{&out}; diff --git a/src/Magnum/Trade/Test/PbrClearCoatMaterialDataTest.cpp b/src/Magnum/Trade/Test/PbrClearCoatMaterialDataTest.cpp index 4afb90e26..77f318e25 100644 --- a/src/Magnum/Trade/Test/PbrClearCoatMaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/PbrClearCoatMaterialDataTest.cpp @@ -330,9 +330,7 @@ void PbrClearCoatMaterialDataTest::texturedBaseMaterialMatrixCoordinatesLayer() } void PbrClearCoatMaterialDataTest::invalidTextures() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PbrClearCoatMaterialData data{{}, { {MaterialLayer::ClearCoat}, @@ -478,9 +476,7 @@ void PbrClearCoatMaterialDataTest::commonCoordinatesLayerImplicit() { } void PbrClearCoatMaterialDataTest::noCommonTransformationCoordinatesLayer() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PbrClearCoatMaterialData data{{}, { {MaterialLayer::ClearCoat}, diff --git a/src/Magnum/Trade/Test/PbrMetallicRoughnessMaterialDataTest.cpp b/src/Magnum/Trade/Test/PbrMetallicRoughnessMaterialDataTest.cpp index 366cf3b61..ab5b3dbc2 100644 --- a/src/Magnum/Trade/Test/PbrMetallicRoughnessMaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/PbrMetallicRoughnessMaterialDataTest.cpp @@ -796,9 +796,7 @@ void PbrMetallicRoughnessMaterialDataTest::texturedExplicitPackedNormalRoughness } void PbrMetallicRoughnessMaterialDataTest::invalidTextures() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PbrMetallicRoughnessMaterialData data{{}, {}}; @@ -963,9 +961,7 @@ void PbrMetallicRoughnessMaterialDataTest::commonCoordinatesLayerImplicit() { } void PbrMetallicRoughnessMaterialDataTest::noCommonTransformationCoordinatesLayer() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PbrMetallicRoughnessMaterialData data{{}, { {MaterialAttribute::BaseColorTexture, 3u}, diff --git a/src/Magnum/Trade/Test/PbrSpecularGlossinessMaterialDataTest.cpp b/src/Magnum/Trade/Test/PbrSpecularGlossinessMaterialDataTest.cpp index 804210fca..b6773439e 100644 --- a/src/Magnum/Trade/Test/PbrSpecularGlossinessMaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/PbrSpecularGlossinessMaterialDataTest.cpp @@ -476,9 +476,7 @@ void PbrSpecularGlossinessMaterialDataTest::texturedExplicitPackedSpecularGlossi } void PbrSpecularGlossinessMaterialDataTest::invalidTextures() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PbrSpecularGlossinessMaterialData data{{}, {}}; @@ -643,9 +641,7 @@ void PbrSpecularGlossinessMaterialDataTest::commonCoordinatesLayerImplicit() { } void PbrSpecularGlossinessMaterialDataTest::noCommonTransformationCoordinatesLayer() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PbrSpecularGlossinessMaterialData data{{}, { {MaterialAttribute::DiffuseTexture, 3u}, diff --git a/src/Magnum/Trade/Test/PhongMaterialDataTest.cpp b/src/Magnum/Trade/Test/PhongMaterialDataTest.cpp index c9a4cbeb2..12b3536fe 100644 --- a/src/Magnum/Trade/Test/PhongMaterialDataTest.cpp +++ b/src/Magnum/Trade/Test/PhongMaterialDataTest.cpp @@ -242,9 +242,7 @@ void PhongMaterialDataTest::constructDeprecatedTexturedCoordinates() { } void PhongMaterialDataTest::constructDeprecatedTextureTransformNoTextures() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -260,9 +258,7 @@ void PhongMaterialDataTest::constructDeprecatedTextureTransformNoTextures() { } void PhongMaterialDataTest::constructDeprecatedNoTextureTransformationFlag() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -278,9 +274,7 @@ void PhongMaterialDataTest::constructDeprecatedNoTextureTransformationFlag() { } void PhongMaterialDataTest::constructDeprecatedNoTextureCoordinatesFlag() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -478,9 +472,7 @@ void PhongMaterialDataTest::texturedImplicitPackedSpecularGlossiness() { } void PhongMaterialDataTest::invalidTextures() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PhongMaterialData data{{}, {}}; @@ -653,9 +645,7 @@ void PhongMaterialDataTest::commonCoordinatesLayerImplicit() { } void PhongMaterialDataTest::noCommonTransformationCoordinatesLayer() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PhongMaterialData data{{}, { {MaterialAttribute::DiffuseTexture, 3u}, diff --git a/src/Magnum/Trade/Test/SceneDataTest.cpp b/src/Magnum/Trade/Test/SceneDataTest.cpp index c6180a1aa..ecd20e495 100644 --- a/src/Magnum/Trade/Test/SceneDataTest.cpp +++ b/src/Magnum/Trade/Test/SceneDataTest.cpp @@ -590,9 +590,7 @@ void SceneDataTest::mappingTypeSizeAlignment() { } void SceneDataTest::mappingTypeSizeAlignmentInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -645,9 +643,7 @@ void SceneDataTest::customFieldName() { } void SceneDataTest::customFieldNameTooLarge() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -656,9 +652,7 @@ void SceneDataTest::customFieldNameTooLarge() { } void SceneDataTest::customFieldNameNotCustom() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -710,9 +704,7 @@ void SceneDataTest::fieldTypeSizeAlignment() { } void SceneDataTest::fieldTypeSizeAlignmentInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1048,9 +1040,7 @@ void SceneDataTest::constructFieldArrayOffsetOnly() { } void SceneDataTest::constructFieldInconsistentViewSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort rotationMappingData[3]{}; const Complexd rotationFieldData[2]; @@ -1062,9 +1052,7 @@ void SceneDataTest::constructFieldInconsistentViewSize() { } void SceneDataTest::constructFieldWrongType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort rotationMappingData[3]{}; const Quaternion rotationFieldData[3]; @@ -1079,9 +1067,7 @@ void SceneDataTest::constructFieldWrongType() { } void SceneDataTest::constructFieldTooLargeMappingStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt enough[2]; char toomuch[2*(32768 + sizeof(UnsignedInt))]; @@ -1106,9 +1092,7 @@ void SceneDataTest::constructFieldTooLargeMappingStride() { } void SceneDataTest::constructFieldTooLargeFieldStride() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedInt enough[2]; char toomuch[2*(32768 + sizeof(UnsignedInt))]; @@ -1133,9 +1117,7 @@ void SceneDataTest::constructFieldTooLargeFieldStride() { } void SceneDataTest::constructFieldOffsetOnlyNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort rotationMappingData[3]{}; const Quaternion rotationFieldData[3]; @@ -1151,9 +1133,7 @@ void SceneDataTest::constructFieldOffsetOnlyNotAllowed() { } void SceneDataTest::constructFieldWrongDataAccess() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const UnsignedShort rotationMappingData[3]{}; const Quaternion rotationFieldData[3]; @@ -1175,9 +1155,7 @@ void SceneDataTest::constructFieldWrongDataAccess() { } void SceneDataTest::constructField2DWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char rotationMappingData[5*sizeof(UnsignedInt)]; char rotationFieldData[5*sizeof(Complex)]; @@ -1198,9 +1176,7 @@ void SceneDataTest::constructField2DWrongSize() { } void SceneDataTest::constructField2DNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char rotationMappingData[8*sizeof(UnsignedInt)]; char rotationFieldData[8*sizeof(Complex)]; @@ -1221,9 +1197,7 @@ void SceneDataTest::constructField2DNonContiguous() { } void SceneDataTest::constructFieldArrayNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedByte offsetMappingData[3]; Int offsetFieldData[3*4]; @@ -1235,9 +1209,7 @@ void SceneDataTest::constructFieldArrayNonContiguous() { } void SceneDataTest::constructFieldArrayNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); UnsignedShort rotationMappingData[3]{}; Quaternion rotationFieldData[3]; @@ -1287,9 +1259,7 @@ void SceneDataTest::constructFieldArrayNotAllowed() { } void SceneDataTest::constructFieldArray2DWrongSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char rotationMappingData[4*sizeof(UnsignedInt)]; char rotationFieldData[4*sizeof(Complex)]; @@ -1305,9 +1275,7 @@ void SceneDataTest::constructFieldArray2DWrongSize() { } void SceneDataTest::constructFieldArray2DNonContiguous() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); char offsetMappingData[18*sizeof(UnsignedInt)]; char offsetFieldData[18*sizeof(Int)]; @@ -1806,9 +1774,7 @@ void SceneDataTest::constructDeprecated() { } void SceneDataTest::constructDeprecatedBoth2DAnd3D() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1820,9 +1786,7 @@ void SceneDataTest::constructDeprecatedBoth2DAnd3D() { #endif void SceneDataTest::constructDuplicateField() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Builtin fields are checked using a bitfield, as they have monotonic numbering */ @@ -1837,9 +1801,7 @@ void SceneDataTest::constructDuplicateField() { } void SceneDataTest::constructDuplicateCustomField() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* These are checked in an O(n^2) way, separately from builtin fields. Can't use a bitfield since the field index can be anything. */ @@ -1854,9 +1816,7 @@ void SceneDataTest::constructDuplicateCustomField() { } void SceneDataTest::constructInconsistentMappingType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SceneFieldData meshes{SceneField::Mesh, SceneMappingType::UnsignedInt, nullptr, SceneFieldType::UnsignedShort, nullptr}; SceneFieldData materials{SceneField::MeshMaterial, SceneMappingType::UnsignedShort, nullptr, SceneFieldType::Int, nullptr}; @@ -1868,9 +1828,7 @@ void SceneDataTest::constructInconsistentMappingType() { } void SceneDataTest::constructMappingDataNotContained() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const Containers::Array data{reinterpret_cast(0xbadda9), 5*sizeof(UnsignedShort), [](char*, std::size_t){}}; Containers::Array sameDataButMovable{reinterpret_cast(0xbadda9), 5*sizeof(UnsignedShort), [](char*, std::size_t){}}; @@ -1920,9 +1878,7 @@ void SceneDataTest::constructMappingDataNotContained() { } void SceneDataTest::constructFieldDataNotContained() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Mostly the same as constructMappingDataNotContained() with mapping and field views swapped, and added checks for array fields */ @@ -1983,9 +1939,7 @@ void SceneDataTest::constructFieldDataNotContained() { } void SceneDataTest::constructMappingTypeTooSmall() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* This is fine */ SceneData{SceneMappingType::UnsignedByte, 0xff, nullptr, {}}; @@ -2004,9 +1958,7 @@ void SceneDataTest::constructMappingTypeTooSmall() { } void SceneDataTest::constructNotOwnedFlagOwned() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const char data[32]{}; @@ -2018,9 +1970,7 @@ void SceneDataTest::constructNotOwnedFlagOwned() { } void SceneDataTest::constructMismatchedTRSViews() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::ArrayView data{reinterpret_cast(0xcafe0000), /* Three entries, each having a 2D TRS and 3 object IDs */ @@ -2107,9 +2057,7 @@ template struct NameTraits { template void SceneDataTest::constructMismatchedTRSDimensionality() { setTestCaseTemplateName(NameTraits::name()); - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SceneFieldData transformationMatrices2D{SceneField::Transformation, SceneMappingType::UnsignedInt, nullptr, Implementation::SceneFieldTypeFor>::type(), nullptr}; SceneFieldData transformationRectangularMatrices2D{SceneField::Transformation, SceneMappingType::UnsignedInt, nullptr, Implementation::SceneFieldTypeFor>::type(), nullptr}; @@ -2189,9 +2137,7 @@ template void SceneDataTest::constructMismatchedTRSDimensionality() { } void SceneDataTest::constructMismatchedMeshMaterialView() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::ArrayView data{reinterpret_cast(0xcafe0000), /* Three entries, each having mesh/material ID and 2 object IDs */ @@ -2219,9 +2165,7 @@ void SceneDataTest::constructMismatchedMeshMaterialView() { } void SceneDataTest::constructAmbiguousSkinDimensions() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -2349,9 +2293,7 @@ template void SceneDataTest::findFieldObjectOffset() { } void SceneDataTest::findFieldObjectOffsetInvalidOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -2381,9 +2323,7 @@ void SceneDataTest::findFieldObjectOffsetInvalidOffset() { } void SceneDataTest::fieldObjectOffsetNotFound() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -2559,9 +2499,7 @@ void SceneDataTest::mappingIntoArrayByName() { } void SceneDataTest::mappingIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -2677,9 +2615,7 @@ void SceneDataTest::parentsIntoArray() { } void SceneDataTest::parentsIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -2987,9 +2923,7 @@ template void SceneDataTest::transformations2DAsArray } void SceneDataTest::transformations2DAsArrayBut3DType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Because TRSAsArray() allocates an Array and then calls TRSInto(), which skips views that are nullptr, we wouldn't get the @@ -3235,9 +3169,7 @@ void SceneDataTest::transformations2DIntoArrayTRS() { } void SceneDataTest::transformations2DIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -3268,9 +3200,7 @@ void SceneDataTest::transformations2DIntoArrayInvalidSizeOrOffset() { } void SceneDataTest::transformations2DIntoArrayInvalidSizeOrOffsetTRS() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -3589,9 +3519,7 @@ template void SceneDataTest::transformations3DAsArray } void SceneDataTest::transformations3DAsArrayBut2DType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Because TRSAsArray() allocates an Array and then calls TRSInto(), which skips views that are nullptr, we wouldn't get the @@ -3837,9 +3765,7 @@ void SceneDataTest::transformations3DIntoArrayTRS() { } void SceneDataTest::transformations3DIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -3870,9 +3796,7 @@ void SceneDataTest::transformations3DIntoArrayInvalidSizeOrOffset() { } void SceneDataTest::transformations3DIntoArrayInvalidSizeOrOffsetTRS() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4048,9 +3972,7 @@ void SceneDataTest::meshesMaterialsIntoArray() { } void SceneDataTest::meshesMaterialsIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4177,9 +4099,7 @@ void SceneDataTest::lightsIntoArray() { } void SceneDataTest::lightsIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4298,9 +4218,7 @@ void SceneDataTest::camerasIntoArray() { } void SceneDataTest::camerasIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4423,9 +4341,7 @@ void SceneDataTest::skinsIntoArray() { } void SceneDataTest::skinsIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4551,9 +4467,7 @@ void SceneDataTest::importerStateIntoArray() { } void SceneDataTest::importerStateIntoArrayInvalidSizeOrOffset() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4584,9 +4498,7 @@ void SceneDataTest::importerStateIntoArrayInvalidSizeOrOffset() { } void SceneDataTest::mutableAccessNotAllowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); const struct Field { UnsignedInt object; @@ -4633,9 +4545,7 @@ void SceneDataTest::mutableAccessNotAllowed() { } void SceneDataTest::mappingNotFound() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4678,9 +4588,7 @@ void SceneDataTest::mappingNotFound() { } void SceneDataTest::mappingWrongType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedShort object; @@ -4709,9 +4617,7 @@ void SceneDataTest::mappingWrongType() { } void SceneDataTest::fieldNotFound() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4858,9 +4764,7 @@ void SceneDataTest::fieldNotFound() { } void SceneDataTest::fieldWrongType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -4897,9 +4801,7 @@ void SceneDataTest::fieldWrongType() { } void SceneDataTest::fieldWrongPointerType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Thing { UnsignedInt object; @@ -4969,9 +4871,7 @@ void SceneDataTest::fieldWrongPointerType() { } void SceneDataTest::fieldWrongArrayAccess() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); struct Field { UnsignedInt object; @@ -5208,9 +5108,7 @@ void SceneDataTest::transformation2DForTRS() { } void SceneDataTest::transformation2DForBut3DType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SceneData scene{SceneMappingType::UnsignedInt, 1, nullptr, { SceneFieldData{SceneField::Translation, SceneMappingType::UnsignedInt, nullptr, SceneFieldType::Vector3, nullptr} @@ -5300,9 +5198,7 @@ void SceneDataTest::transformation3DForTRS() { } void SceneDataTest::transformation3DForBut2DType() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SceneData scene{SceneMappingType::UnsignedInt, 1, nullptr, { SceneFieldData{SceneField::Translation, SceneMappingType::UnsignedInt, nullptr, SceneFieldType::Vector2, nullptr} @@ -5577,9 +5473,7 @@ void SceneDataTest::fieldForFieldMissing() { } void SceneDataTest::findFieldObjectOffsetInvalidObject() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SceneData scene{SceneMappingType::UnsignedInt, 7, nullptr, { SceneFieldData{SceneField::Parent, SceneMappingType::UnsignedInt, nullptr, SceneFieldType::Int, nullptr}, diff --git a/src/Magnum/Trade/Test/SkinDataTest.cpp b/src/Magnum/Trade/Test/SkinDataTest.cpp index cc60b1515..1e8bcfac5 100644 --- a/src/Magnum/Trade/Test/SkinDataTest.cpp +++ b/src/Magnum/Trade/Test/SkinDataTest.cpp @@ -86,9 +86,7 @@ void SkinDataTest::constructNonOwned() { } void SkinDataTest::constructDifferentSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Vk/Test/BufferTest.cpp b/src/Magnum/Vk/Test/BufferTest.cpp index 7fa31bef7..d164c3c6f 100644 --- a/src/Magnum/Vk/Test/BufferTest.cpp +++ b/src/Magnum/Vk/Test/BufferTest.cpp @@ -150,9 +150,7 @@ void BufferTest::constructCopy() { } void BufferTest::dedicatedMemoryNotDedicated() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Buffer buffer{NoCreate}; CORRADE_VERIFY(!buffer.hasDedicatedMemory()); @@ -207,9 +205,7 @@ template void BufferTest::bufferCopyConvertToVk() { } void BufferTest::bufferCopyConvertDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); BufferCopy copy{0, 0, 0}; copy->pNext = © diff --git a/src/Magnum/Vk/Test/BufferVkTest.cpp b/src/Magnum/Vk/Test/BufferVkTest.cpp index adda5b9ce..074ae1487 100644 --- a/src/Magnum/Vk/Test/BufferVkTest.cpp +++ b/src/Magnum/Vk/Test/BufferVkTest.cpp @@ -246,9 +246,7 @@ void BufferVkTest::cmdCopyBuffer() { } void BufferVkTest::cmdCopyBufferDisallowedConversion() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(device().isExtensionEnabled()) CORRADE_SKIP("KHR_copy_commands2 enabled on the device, can't test"); diff --git a/src/Magnum/Vk/Test/DescriptorPoolTest.cpp b/src/Magnum/Vk/Test/DescriptorPoolTest.cpp index f52be01cd..7bae78820 100644 --- a/src/Magnum/Vk/Test/DescriptorPoolTest.cpp +++ b/src/Magnum/Vk/Test/DescriptorPoolTest.cpp @@ -79,9 +79,7 @@ void DescriptorPoolTest::createInfoConstruct() { } void DescriptorPoolTest::createInfoConstructNoSets() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -90,9 +88,7 @@ void DescriptorPoolTest::createInfoConstructNoSets() { } void DescriptorPoolTest::createInfoConstructNoPools() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -101,9 +97,7 @@ void DescriptorPoolTest::createInfoConstructNoPools() { } void DescriptorPoolTest::createInfoConstructEmptyPool() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp b/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp index 040580ef0..6fdf096b4 100644 --- a/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp +++ b/src/Magnum/Vk/Test/DescriptorPoolVkTest.cpp @@ -187,9 +187,7 @@ void DescriptorPoolVkTest::allocateFail() { CORRADE_VERIFY(!pool.tryAllocate(layout)); CORRADE_COMPARE(out.str(), ""); } { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* allocate() should assert with ErrorOutOfPoolMemory */ std::ostringstream out; @@ -263,9 +261,7 @@ void DescriptorPoolVkTest::allocateVariableCountFail() { CORRADE_VERIFY(!pool.tryAllocate(layout, 8)); CORRADE_COMPARE(out.str(), ""); } { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* allocate() should assert with ErrorOutOfPoolMemory */ std::ostringstream out; diff --git a/src/Magnum/Vk/Test/DevicePropertiesVkTest.cpp b/src/Magnum/Vk/Test/DevicePropertiesVkTest.cpp index 058fa5363..a10de6f2d 100644 --- a/src/Magnum/Vk/Test/DevicePropertiesVkTest.cpp +++ b/src/Magnum/Vk/Test/DevicePropertiesVkTest.cpp @@ -528,9 +528,7 @@ void DevicePropertiesVkTest::memoryHeaps() { } void DevicePropertiesVkTest::memoryHeapOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array devices = enumerateDevices(instance()); CORRADE_VERIFY(!devices.isEmpty()); @@ -572,9 +570,7 @@ void DevicePropertiesVkTest::memoryTypes() { } void DevicePropertiesVkTest::memoryTypeOutOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array devices = enumerateDevices(instance()); CORRADE_VERIFY(!devices.isEmpty()); @@ -630,9 +626,7 @@ void DevicePropertiesVkTest::memoryTypesPickIgnoreSomePreferred() { } void DevicePropertiesVkTest::memoryTypesPickFailed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Containers::Array devices = enumerateDevices(instance()); CORRADE_VERIFY(!devices.isEmpty()); diff --git a/src/Magnum/Vk/Test/DeviceVkTest.cpp b/src/Magnum/Vk/Test/DeviceVkTest.cpp index 8db4031ed..d4cb6cc8f 100644 --- a/src/Magnum/Vk/Test/DeviceVkTest.cpp +++ b/src/Magnum/Vk/Test/DeviceVkTest.cpp @@ -487,9 +487,7 @@ void DeviceVkTest::createInfoFeaturesEnableAllResetAll() { } void DeviceVkTest::createInfoNoQueuePriorities() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -498,9 +496,7 @@ void DeviceVkTest::createInfoNoQueuePriorities() { } void DeviceVkTest::createInfoWrongQueueOutputCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1001,9 +997,7 @@ void DeviceVkTest::constructFeatureWithoutExtension() { } void DeviceVkTest::constructNoQueue() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -1079,9 +1073,7 @@ Implementation::deviceFeaturesPortabilitySubset(), } void DeviceVkTest::tryCreateAlreadyCreated() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Queue queue{NoCreate}; Device device{instance(), DeviceCreateInfo{pickDevice(instance())} @@ -1191,9 +1183,7 @@ void DeviceVkTest::wrap() { } void DeviceVkTest::wrapAlreadyCreated() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Queue queue{NoCreate}; Device device{instance(), DeviceCreateInfo{pickDevice(instance())} diff --git a/src/Magnum/Vk/Test/ExtensionPropertiesVkTest.cpp b/src/Magnum/Vk/Test/ExtensionPropertiesVkTest.cpp index c53a123e5..c4e092f59 100644 --- a/src/Magnum/Vk/Test/ExtensionPropertiesVkTest.cpp +++ b/src/Magnum/Vk/Test/ExtensionPropertiesVkTest.cpp @@ -197,9 +197,7 @@ void ExtensionPropertiesVkTest::instanceExtensionIsSupportedRevision() { } void ExtensionPropertiesVkTest::outOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); InstanceExtensionProperties properties = enumerateInstanceExtensionProperties(); const UnsignedInt count = properties.count(); diff --git a/src/Magnum/Vk/Test/ImageTest.cpp b/src/Magnum/Vk/Test/ImageTest.cpp index 57cde2a46..54d0bf760 100644 --- a/src/Magnum/Vk/Test/ImageTest.cpp +++ b/src/Magnum/Vk/Test/ImageTest.cpp @@ -349,9 +349,7 @@ void ImageTest::aspectsFor() { } void ImageTest::aspectsForInvalidFormat() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -380,9 +378,7 @@ void ImageTest::constructCopy() { } void ImageTest::dedicatedMemoryNotDedicated() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Image image{NoCreate}; CORRADE_VERIFY(!image.hasDedicatedMemory()); @@ -471,9 +467,7 @@ template void ImageTest::imageCopyConvertToVk() { } void ImageTest::imageCopyConvertDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); ImageCopy copy{ImageAspect{}, 0, 0, 0, {}, 0, 0, 0, {}, {}}; copy->pNext = © @@ -708,9 +702,7 @@ template void ImageTest::bufferImageCopyConvertToVk() { } void ImageTest::bufferImageCopyConvertDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); BufferImageCopy copy{0, 0, 0, ImageAspect{}, 0, 0, 0, {}}; copy->pNext = © diff --git a/src/Magnum/Vk/Test/ImageViewTest.cpp b/src/Magnum/Vk/Test/ImageViewTest.cpp index 8563857e8..b738442c2 100644 --- a/src/Magnum/Vk/Test/ImageViewTest.cpp +++ b/src/Magnum/Vk/Test/ImageViewTest.cpp @@ -143,9 +143,7 @@ void ImageViewTest::createInfoConstructFromImage() { } void ImageViewTest::createInfoConstructFromImageFormatUknown() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Device device{NoCreate}; Image image = Image::wrap(device, imageHandle, PixelFormat{}); diff --git a/src/Magnum/Vk/Test/ImageVkTest.cpp b/src/Magnum/Vk/Test/ImageVkTest.cpp index 28c6c6a65..5a79ee16d 100644 --- a/src/Magnum/Vk/Test/ImageVkTest.cpp +++ b/src/Magnum/Vk/Test/ImageVkTest.cpp @@ -764,9 +764,7 @@ void ImageVkTest::cmdCopyImage2DArrayTo3D() { } void ImageVkTest::cmdCopyImageDisallowedConversion() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(device().isExtensionEnabled()) CORRADE_SKIP("KHR_copy_commands2 enabled on the device, can't test"); @@ -1306,9 +1304,7 @@ void ImageVkTest::cmdCopyBufferImageCubeMapArray() { } void ImageVkTest::cmdCopyBufferImageDisallowedConversion() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(device().isExtensionEnabled()) CORRADE_SKIP("KHR_copy_commands2 enabled on the device, can't test"); diff --git a/src/Magnum/Vk/Test/InstanceVkTest.cpp b/src/Magnum/Vk/Test/InstanceVkTest.cpp index 8f6c52aca..c2b138f7a 100644 --- a/src/Magnum/Vk/Test/InstanceVkTest.cpp +++ b/src/Magnum/Vk/Test/InstanceVkTest.cpp @@ -439,9 +439,7 @@ void InstanceVkTest::constructCommandLineEnable() { } void InstanceVkTest::tryCreateAlreadyCreated() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Instance instance; CORRADE_VERIFY(instance.handle()); @@ -528,9 +526,7 @@ void InstanceVkTest::wrap() { } void InstanceVkTest::wrapAlreadyCreated() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Instance instance; CORRADE_VERIFY(instance.handle()); diff --git a/src/Magnum/Vk/Test/LayerPropertiesVkTest.cpp b/src/Magnum/Vk/Test/LayerPropertiesVkTest.cpp index a09dca715..e8d795876 100644 --- a/src/Magnum/Vk/Test/LayerPropertiesVkTest.cpp +++ b/src/Magnum/Vk/Test/LayerPropertiesVkTest.cpp @@ -101,9 +101,7 @@ void LayerPropertiesVkTest::enumerate() { } void LayerPropertiesVkTest::outOfRange() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); LayerProperties properties = enumerateLayerProperties(); const UnsignedInt count = properties.count(); diff --git a/src/Magnum/Vk/Test/MemoryTest.cpp b/src/Magnum/Vk/Test/MemoryTest.cpp index 73b5c6d25..4d64de1dc 100644 --- a/src/Magnum/Vk/Test/MemoryTest.cpp +++ b/src/Magnum/Vk/Test/MemoryTest.cpp @@ -112,9 +112,7 @@ void MemoryTest::requirementsAlignedSize() { } void MemoryTest::requirementsAlignedSizeZeroAlignement() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); VkMemoryRequirements2 vkRequirements{}; vkRequirements.memoryRequirements.size = 16384; @@ -167,9 +165,7 @@ void MemoryTest::constructCopy() { } void MemoryTest::mapWrappedUnknownSize() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Device device{NoCreate}; Memory memory = Memory::wrap(device, {}, 0); diff --git a/src/Magnum/Vk/Test/MeshLayoutTest.cpp b/src/Magnum/Vk/Test/MeshLayoutTest.cpp index c79fc1dd3..109b706af 100644 --- a/src/Magnum/Vk/Test/MeshLayoutTest.cpp +++ b/src/Magnum/Vk/Test/MeshLayoutTest.cpp @@ -152,9 +152,7 @@ void MeshLayoutTest::mapMeshPrimitiveImplementationSpecific() { } void MeshLayoutTest::mapMeshPrimitiveUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_VERIFY(!hasMeshPrimitive(Magnum::MeshPrimitive::LineLoop)); @@ -168,9 +166,7 @@ void MeshLayoutTest::mapMeshPrimitiveUnsupported() { } void MeshLayoutTest::mapMeshPrimitiveInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -337,9 +333,7 @@ void MeshLayoutTest::addInstancedBindingDivisor() { } void MeshLayoutTest::addBindingWrongOrder() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshLayout layout{MeshPrimitive::Triangles}; layout.addBinding(15, 23); @@ -373,9 +367,7 @@ template void MeshLayoutTest::addAttribute() { } void MeshLayoutTest::addAttributeWrongOrder() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshLayout layout{MeshPrimitive::Triangles}; layout.addAttribute(5, 17, VertexFormat{}, 0); @@ -512,9 +504,7 @@ void MeshLayoutTest::compare() { } void MeshLayoutTest::compareExternalPointers() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); /* Disallowed pNext inside one struct */ { diff --git a/src/Magnum/Vk/Test/MeshTest.cpp b/src/Magnum/Vk/Test/MeshTest.cpp index af7421f37..8cc7d0996 100644 --- a/src/Magnum/Vk/Test/MeshTest.cpp +++ b/src/Magnum/Vk/Test/MeshTest.cpp @@ -103,9 +103,7 @@ void MeshTest::mapIndexTypeImplementationSpecific() { } void MeshTest::mapIndexTypeInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -239,9 +237,7 @@ void MeshTest::addVertexBufferOwned() { } void MeshTest::addVertexBufferNoSuchBinding() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh noBindings{MeshLayout{MeshPrimitive::Triangles}}; Mesh differentBindings{MeshLayout{MeshPrimitive::Lines} @@ -290,9 +286,7 @@ template void MeshTest::setIndexBufferOwned() { } void MeshTest::indexPropertiesNotIndexed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh{MeshLayout{MeshPrimitive::Triangles}}; CORRADE_VERIFY(!mesh.isIndexed()); diff --git a/src/Magnum/Vk/Test/MeshVkTest.cpp b/src/Magnum/Vk/Test/MeshVkTest.cpp index 12ad663bc..1d4ce73ad 100644 --- a/src/Magnum/Vk/Test/MeshVkTest.cpp +++ b/src/Magnum/Vk/Test/MeshVkTest.cpp @@ -639,9 +639,7 @@ void MeshVkTest::cmdDrawZeroCount() { } void MeshVkTest::cmdDrawNoCountSet() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh{MeshLayout{MeshPrimitive::Triangles}}; @@ -825,9 +823,7 @@ void MeshVkTest::cmdDrawDynamicStride() { } void MeshVkTest::cmdDrawDynamicStrideInsufficientImplementation() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(device().isExtensionEnabled()) CORRADE_SKIP("VK_EXT_extended_dynamic_state enabled, can't test."); diff --git a/src/Magnum/Vk/Test/PipelineTest.cpp b/src/Magnum/Vk/Test/PipelineTest.cpp index f6f4f24ef..85d614220 100644 --- a/src/Magnum/Vk/Test/PipelineTest.cpp +++ b/src/Magnum/Vk/Test/PipelineTest.cpp @@ -567,9 +567,7 @@ void PipelineTest::computeCreateInfoConstructOwnedEntrypoint() { } void PipelineTest::computeCreateInfoConstructNotSingleShader() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); ShaderSet shaderSet; diff --git a/src/Magnum/Vk/Test/PipelineVkTest.cpp b/src/Magnum/Vk/Test/PipelineVkTest.cpp index 1091780d4..344c5dd14 100644 --- a/src/Magnum/Vk/Test/PipelineVkTest.cpp +++ b/src/Magnum/Vk/Test/PipelineVkTest.cpp @@ -156,9 +156,7 @@ void PipelineVkTest::constructRasterization() { } void PipelineVkTest::constructRasterizationViewportNotSet() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); MeshLayout meshLayout{MeshPrimitive::Triangles}; @@ -427,9 +425,7 @@ void PipelineVkTest::wrapCompute() { } void PipelineVkTest::dynamicRasterizationStatesNotRasterization() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); PipelineLayout pipelineLayout{device(), PipelineLayoutCreateInfo{}}; diff --git a/src/Magnum/Vk/Test/PixelFormatTest.cpp b/src/Magnum/Vk/Test/PixelFormatTest.cpp index 84de93249..9a305f46d 100644 --- a/src/Magnum/Vk/Test/PixelFormatTest.cpp +++ b/src/Magnum/Vk/Test/PixelFormatTest.cpp @@ -136,9 +136,7 @@ void PixelFormatTest::mapImplementationSpecific() { } void PixelFormatTest::mapUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #if 1 CORRADE_SKIP("All pixel formats are supported."); @@ -152,9 +150,7 @@ void PixelFormatTest::mapUnsupported() { } void PixelFormatTest::mapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -244,9 +240,7 @@ void PixelFormatTest::mapCompressedImplementationSpecific() { } void PixelFormatTest::mapCompressedUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_VERIFY(!hasPixelFormat(Magnum::CompressedPixelFormat::Astc3x3x3RGBAUnorm)); @@ -257,9 +251,7 @@ void PixelFormatTest::mapCompressedUnsupported() { } void PixelFormatTest::mapCompressedInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Vk/Test/RenderPassTest.cpp b/src/Magnum/Vk/Test/RenderPassTest.cpp index b9959e557..ce25bd936 100644 --- a/src/Magnum/Vk/Test/RenderPassTest.cpp +++ b/src/Magnum/Vk/Test/RenderPassTest.cpp @@ -350,9 +350,7 @@ template void RenderPassTest::attachmentDescriptionConvertToVk() { } void RenderPassTest::attachmentDescriptionConvertDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); AttachmentDescription description{PixelFormat{}, AttachmentLoadOperation{}, AttachmentStoreOperation{}, ImageLayout{}, ImageLayout{}}; description->pNext = &description; @@ -410,9 +408,7 @@ template void RenderPassTest::attachmentReferenceConvertToVk() { } void RenderPassTest::attachmentReferenceConvertDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); AttachmentReference reference{0, ImageLayout{}}; reference->pNext = &reference; @@ -497,9 +493,7 @@ void RenderPassTest::subpassDescriptionConstructColorResolveAttachments() { } void RenderPassTest::subpassDescriptionConstructColorResolveAttachmentsWrongCount() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SubpassDescription description; @@ -740,9 +734,7 @@ template void RenderPassTest::subpassDescriptionConvertToVkNoResolveAtt } void RenderPassTest::subpassDescriptionConvertDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SubpassDescription description; description->pNext = &description; @@ -845,9 +837,7 @@ template void RenderPassTest::subpassDependencyConvertToVk() { } void RenderPassTest::subpassDependencyConvertDisallowed() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); SubpassDependency dependency{0, 1, PipelineStages{}, PipelineStages{}, Accesses{}, Accesses{}}; dependency->pNext = &dependency; @@ -1159,9 +1149,7 @@ void RenderPassTest::beginInfoConstructImplicitSize() { } void RenderPassTest::beginInfoConstructImplicitSizeUnknown() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); Framebuffer framebuffer{NoCreate}; diff --git a/src/Magnum/Vk/Test/RenderPassVkTest.cpp b/src/Magnum/Vk/Test/RenderPassVkTest.cpp index c8e9de5c0..5c23db4fc 100644 --- a/src/Magnum/Vk/Test/RenderPassVkTest.cpp +++ b/src/Magnum/Vk/Test/RenderPassVkTest.cpp @@ -93,9 +93,7 @@ void RenderPassVkTest::construct() { } void RenderPassVkTest::constructNoSubpasses() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -231,9 +229,7 @@ void RenderPassVkTest::cmdBeginEnd() { } void RenderPassVkTest::cmdBeginEndDisallowedConversion() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); if(device().isVersionSupported(Version::Vk12) ||device().isExtensionEnabled()) CORRADE_SKIP("KHR_create_renderpass2 enabled on the device, can't test"); diff --git a/src/Magnum/Vk/Test/SamplerTest.cpp b/src/Magnum/Vk/Test/SamplerTest.cpp index 854e6d3c0..a9ee5ad7c 100644 --- a/src/Magnum/Vk/Test/SamplerTest.cpp +++ b/src/Magnum/Vk/Test/SamplerTest.cpp @@ -119,9 +119,7 @@ void SamplerTest::mapFilter() { } void SamplerTest::mapFilterInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -138,9 +136,7 @@ void SamplerTest::mapMipmap() { } void SamplerTest::mapMipmapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; @@ -165,9 +161,7 @@ void SamplerTest::mapWrappingVector() { } void SamplerTest::mapWrappingInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out}; diff --git a/src/Magnum/Vk/Test/ShaderSetTest.cpp b/src/Magnum/Vk/Test/ShaderSetTest.cpp index 630cbed12..e5bf83bbb 100644 --- a/src/Magnum/Vk/Test/ShaderSetTest.cpp +++ b/src/Magnum/Vk/Test/ShaderSetTest.cpp @@ -364,9 +364,7 @@ void ShaderSetTest::addShaderOwnershipTransfer() { } void ShaderSetTest::addShaderTooManyStages() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); ShaderSet set; diff --git a/src/Magnum/Vk/Test/VertexFormatTest.cpp b/src/Magnum/Vk/Test/VertexFormatTest.cpp index f6d01a027..8d7ae01da 100644 --- a/src/Magnum/Vk/Test/VertexFormatTest.cpp +++ b/src/Magnum/Vk/Test/VertexFormatTest.cpp @@ -127,9 +127,7 @@ void VertexFormatTest::mapImplementationSpecific() { } void VertexFormatTest::mapUnsupported() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); #if 1 CORRADE_SKIP("All vertex formats are supported."); @@ -143,9 +141,7 @@ void VertexFormatTest::mapUnsupported() { } void VertexFormatTest::mapInvalid() { - #ifdef CORRADE_NO_ASSERT - CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); - #endif + CORRADE_SKIP_IF_NO_ASSERT(); std::ostringstream out; Error redirectError{&out};