Browse Source

Test: don't compare char ArrayViews to nullptr.

Because, when it fails, it'd attempt to print them as strings,
inevitably leading to a crash or garbage in the terminal. Moreover, with
the upcoming fix that makes StringView *actually* convertible from an
ArrayView, it would become ambiguous.
pull/499/head
Vladimír Vondruš 3 years ago
parent
commit
4a67bba2d2
  1. 30
      src/Magnum/Test/ImageTest.cpp
  2. 2
      src/Magnum/Trade/Test/MeshDataTest.cpp

30
src/Magnum/Test/ImageTest.cpp

@ -219,7 +219,7 @@ void ImageTest::constructGenericPlaceholder() {
CORRADE_COMPARE(a.formatExtra(), 0); CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 8); CORRADE_COMPARE(a.pixelSize(), 8);
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} { } {
Image2D a{PixelStorage{}.setAlignment(1), Image2D a{PixelStorage{}.setAlignment(1),
PixelFormat::RGB16F}; PixelFormat::RGB16F};
@ -230,7 +230,7 @@ void ImageTest::constructGenericPlaceholder() {
CORRADE_COMPARE(a.formatExtra(), 0); CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 6); CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} }
} }
@ -317,7 +317,7 @@ void ImageTest::constructImplementationSpecificPlaceholder() {
CORRADE_COMPARE(a.formatExtra(), 0); CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12); CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} { } {
Image2D a{PixelStorage{}.setAlignment(1), Image2D a{PixelStorage{}.setAlignment(1),
Vk::PixelFormat::R32G32B32F}; Vk::PixelFormat::R32G32B32F};
@ -328,7 +328,7 @@ void ImageTest::constructImplementationSpecificPlaceholder() {
CORRADE_COMPARE(a.formatExtra(), 0); CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12); CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} }
/* Format + extra */ /* Format + extra */
@ -341,7 +341,7 @@ void ImageTest::constructImplementationSpecificPlaceholder() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort)); CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6); CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} { } {
Image2D a{PixelStorage{}.setAlignment(1), Image2D a{PixelStorage{}.setAlignment(1),
GL::PixelFormat::RGB, GL::PixelType::UnsignedShort}; GL::PixelFormat::RGB, GL::PixelType::UnsignedShort};
@ -351,7 +351,7 @@ void ImageTest::constructImplementationSpecificPlaceholder() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort)); CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6); CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} }
/* Manual pixel size */ /* Manual pixel size */
@ -364,7 +364,7 @@ void ImageTest::constructImplementationSpecificPlaceholder() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort)); CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6); CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} }
} }
@ -403,7 +403,7 @@ void ImageTest::constructCompressedGenericPlaceholder() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0}); CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0});
CORRADE_COMPARE(a.format(), CompressedPixelFormat{}); CORRADE_COMPARE(a.format(), CompressedPixelFormat{});
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} { } {
CompressedImage2D a{CompressedPixelStorage{}.setCompressedBlockSize(Vector3i{4})}; CompressedImage2D a{CompressedPixelStorage{}.setCompressedBlockSize(Vector3i{4})};
@ -411,7 +411,7 @@ void ImageTest::constructCompressedGenericPlaceholder() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4}); CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), CompressedPixelFormat{}); CORRADE_COMPARE(a.format(), CompressedPixelFormat{});
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} }
} }
@ -523,7 +523,7 @@ void ImageTest::constructMoveGeneric() {
PixelFormat::RGBA32F, {1, 3}, Containers::Array<char>{data, 3*16}, ImageFlag2D::Array}; PixelFormat::RGBA32F, {1, 3}, Containers::Array<char>{data, 3*16}, ImageFlag2D::Array};
Image2D b(std::move(a)); Image2D b(std::move(a));
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(b.flags(), ImageFlag2D::Array); CORRADE_COMPARE(b.flags(), ImageFlag2D::Array);
@ -561,7 +561,7 @@ void ImageTest::constructMoveImplementationSpecific() {
GL::PixelFormat::RGB, GL::PixelType::UnsignedShort, {1, 3}, Containers::Array<char>{data, 3*6}, ImageFlag2D::Array}; GL::PixelFormat::RGB, GL::PixelType::UnsignedShort, {1, 3}, Containers::Array<char>{data, 3*6}, ImageFlag2D::Array};
Image2D b(std::move(a)); Image2D b(std::move(a));
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(b.flags(), ImageFlag2D::Array); CORRADE_COMPARE(b.flags(), ImageFlag2D::Array);
@ -598,7 +598,7 @@ void ImageTest::constructMoveCompressedGeneric() {
CompressedPixelFormat::Bc3RGBAUnorm, {4, 4}, Containers::Array<char>{data, 8}, ImageFlag2D::Array}; CompressedPixelFormat::Bc3RGBAUnorm, {4, 4}, Containers::Array<char>{data, 8}, ImageFlag2D::Array};
CompressedImage2D b{std::move(a)}; CompressedImage2D b{std::move(a)};
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(b.flags(), ImageFlag2D::Array); CORRADE_COMPARE(b.flags(), ImageFlag2D::Array);
@ -633,7 +633,7 @@ void ImageTest::constructMoveCompressedImplementationSpecific() {
GL::CompressedPixelFormat::RGBS3tcDxt1, {4, 4}, Containers::Array<char>{data, 8}, ImageFlag2D::Array}; GL::CompressedPixelFormat::RGBS3tcDxt1, {4, 4}, Containers::Array<char>{data, 8}, ImageFlag2D::Array};
CompressedImage2D b{std::move(a)}; CompressedImage2D b{std::move(a)};
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i{}); CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(b.flags(), ImageFlag2D::Array); CORRADE_COMPARE(b.flags(), ImageFlag2D::Array);
@ -789,7 +789,7 @@ void ImageTest::release() {
const char* const pointer = a.release().release(); const char* const pointer = a.release().release();
CORRADE_COMPARE(pointer, data); CORRADE_COMPARE(pointer, data);
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i()); CORRADE_COMPARE(a.size(), Vector2i());
} }
@ -799,7 +799,7 @@ void ImageTest::releaseCompressed() {
const char* const pointer = a.release().release(); const char* const pointer = a.release().release();
CORRADE_COMPARE(pointer, data); CORRADE_COMPARE(pointer, data);
CORRADE_COMPARE(a.data(), nullptr); CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i()); CORRADE_COMPARE(a.size(), Vector2i());
} }

2
src/Magnum/Trade/Test/MeshDataTest.cpp

@ -1839,7 +1839,7 @@ void MeshDataTest::constructAttributelessNotOwned() {
CORRADE_VERIFY(!data.attributeData()); CORRADE_VERIFY(!data.attributeData());
CORRADE_COMPARE(data.vertexData(), static_cast<const void*>(nullptr)); CORRADE_COMPARE(data.vertexData(), static_cast<const void*>(nullptr));
if(instanceData.dataFlags & DataFlag::Mutable) if(instanceData.dataFlags & DataFlag::Mutable)
CORRADE_COMPARE(data.mutableVertexData(), nullptr); CORRADE_COMPARE(data.mutableVertexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.importerState(), &importerState); CORRADE_COMPARE(data.importerState(), &importerState);
CORRADE_VERIFY(data.isIndexed()); CORRADE_VERIFY(data.isIndexed());

Loading…
Cancel
Save