ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Test: don't compare char* pointers. 

It's dangerous, as in case of failure it will attempt to print them as
strings. Plus now with latest de-std-string-ification of TestSuite it
causes the compilation to fail due to an ambigupus overload.

This should eventually be catched and disallowed directly by the Tester
class.
pull/556/head
Vladimír Vondruš 4 years ago
parent
97e45ea14d
commit
db6fbda1de
4 changed files with 32 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/Magnum/Test/ImageViewTest.cpp
  2. 2
      src/Magnum/Trade/Test/AnimationDataTest.cpp
  3. 16
      src/Magnum/Trade/Test/ImageDataTest.cpp
  4. 22
      src/Magnum/Trade/Test/MeshDataTest.cpp

24
src/Magnum/Test/ImageViewTest.cpp
Unescape View File

@ -210,7 +210,7 @@ template<class T> void ImageViewTest::constructGenericEmpty() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 8);
CORRADE_COMPARE(a.size(), (Vector2i{2, 6}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} {
ImageView<2, T> a{PixelStorage{}.setAlignment(1),
PixelFormat::RGB16F, {8, 3}};
@ -220,7 +220,7 @@ template<class T> void ImageViewTest::constructGenericEmpty() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{8, 3}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
}
}
@ -305,7 +305,7 @@ template<class T> void ImageViewTest::constructImplementationSpecificEmpty() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), (Vector2i{2, 16}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} {
ImageView<2, T> a{PixelStorage{}.setAlignment(1),
Vk::PixelFormat::R32G32B32F, {1, 2}};
@ -315,7 +315,7 @@ template<class T> void ImageViewTest::constructImplementationSpecificEmpty() {
CORRADE_COMPARE(a.formatExtra(), 0);
CORRADE_COMPARE(a.pixelSize(), 12);
CORRADE_COMPARE(a.size(), (Vector2i{1, 2}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
}
/* Format + extra */
@ -327,7 +327,7 @@ template<class T> void ImageViewTest::constructImplementationSpecificEmpty() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{1, 3}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} {
ImageView<2, T> a{PixelStorage{}.setAlignment(1),
GL::PixelFormat::RGB, GL::PixelType::UnsignedShort, {8, 2}};
@ -336,7 +336,7 @@ template<class T> void ImageViewTest::constructImplementationSpecificEmpty() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{8, 2}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
}
/* Manual pixel size */
@ -348,7 +348,7 @@ template<class T> void ImageViewTest::constructImplementationSpecificEmpty() {
CORRADE_COMPARE(a.formatExtra(), UnsignedInt(GL::PixelType::UnsignedShort));
CORRADE_COMPARE(a.pixelSize(), 6);
CORRADE_COMPARE(a.size(), (Vector2i{3, 3}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
}
}
@ -387,7 +387,7 @@ template<class T> void ImageViewTest::constructCompressedGenericEmpty() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0});
CORRADE_COMPARE(a.format(), CompressedPixelFormat::Bc1RGBAUnorm);
CORRADE_COMPARE(a.size(), (Vector2i{8, 16}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} {
CompressedImageView<2, T> a{CompressedPixelStorage{}.setCompressedBlockSize(Vector3i{4}),
CompressedPixelFormat::Bc1RGBAUnorm, {8, 16}};
@ -395,7 +395,7 @@ template<class T> void ImageViewTest::constructCompressedGenericEmpty() {
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), CompressedPixelFormat::Bc1RGBAUnorm);
CORRADE_COMPARE(a.size(), (Vector2i{8, 16}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
}
}
@ -438,7 +438,7 @@ template<class T> void ImageViewTest::constructCompressedImplementationSpecificE
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{0});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{8, 16}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
} {
CompressedImageView<2, T> a{CompressedPixelStorage{}.setCompressedBlockSize(Vector3i{4}),
GL::CompressedPixelFormat::RGBS3tcDxt1, {4, 8}};
@ -446,7 +446,7 @@ template<class T> void ImageViewTest::constructCompressedImplementationSpecificE
CORRADE_COMPARE(a.storage().compressedBlockSize(), Vector3i{4});
CORRADE_COMPARE(a.format(), compressedPixelFormatWrap(GL::CompressedPixelFormat::RGBS3tcDxt1));
CORRADE_COMPARE(a.size(), (Vector2i{4, 8}));
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
}
/* Manual properties not implemented yet */
@ -817,7 +817,7 @@ template<class T> void ImageViewTest::pixels3D() {
void ImageViewTest::pixelsNullptr() {
ImageView3D image{PixelFormat::RGB8Unorm, {2, 4, 3}};
CORRADE_COMPARE(image.data(), nullptr);
CORRADE_COMPARE(image.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(image.data().size(), 0);
CORRADE_COMPARE(image.pixels().data(), nullptr);

2
src/Magnum/Trade/Test/AnimationDataTest.cpp
Unescape View File

@ -649,7 +649,7 @@ void AnimationDataTest::release() {
CORRADE_COMPARE(data.trackCount(), 1);
Containers::Array<char> released = data.release();
CORRADE_COMPARE(data.data(), nullptr);
CORRADE_COMPARE(data.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.trackCount(), 0);
CORRADE_COMPARE(static_cast<const void*>(released.data()), keyframes);
}

16
src/Magnum/Trade/Test/ImageDataTest.cpp
Unescape View File

@ -680,7 +680,7 @@ void ImageDataTest::constructMoveGeneric() {
PixelFormat::RGBA32F, {1, 3}, Containers::Array<char>{data, 3*16}, &state};
ImageData2D 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(b.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -723,7 +723,7 @@ void ImageDataTest::constructMoveImplementationSpecific() {
GL::PixelFormat::RGB, GL::PixelType::UnsignedShort, {1, 3}, Containers::Array<char>{data, 3*6}, &state};
ImageData2D 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(b.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -765,7 +765,7 @@ void ImageDataTest::constructMoveCompressedGeneric() {
CompressedPixelFormat::Bc3RGBAUnorm, {4, 4}, Containers::Array<char>{data, 8}, &state};
ImageData2D 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(b.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -802,7 +802,7 @@ void ImageDataTest::constructMoveCompressedImplementationSpecific() {
GL::CompressedPixelFormat::RGBS3tcDxt1, {4, 4}, Containers::Array<char>{data, 8}, &state};
ImageData2D 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(b.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -839,7 +839,7 @@ void ImageDataTest::constructMoveAttachState() {
GL::PixelFormat::RGB, GL::PixelType::UnsignedShort, {1, 3}, Containers::Array<char>{data, 3*6}, &stateOld};
ImageData2D b{std::move(a), &stateNew};
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(b.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -863,7 +863,7 @@ void ImageDataTest::constructMoveCompressedAttachState() {
GL::CompressedPixelFormat::RGBS3tcDxt1, {4, 4}, Containers::Array<char>{data, 8}, &stateOld};
ImageData2D b{std::move(a), &stateNew};
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i{});
CORRADE_COMPARE(b.dataFlags(), DataFlag::Owned|DataFlag::Mutable);
@ -1001,7 +1001,7 @@ void ImageDataTest::release() {
const char* const pointer = a.release().release();
CORRADE_COMPARE(pointer, data);
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i());
}
@ -1011,7 +1011,7 @@ void ImageDataTest::releaseCompressed() {
const char* const pointer = a.release().release();
CORRADE_COMPARE(pointer, data);
CORRADE_COMPARE(a.data(), nullptr);
CORRADE_COMPARE(a.data(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(a.size(), Vector2i());
}

22
src/Magnum/Trade/Test/MeshDataTest.cpp
Unescape View File

@ -1568,7 +1568,7 @@ void MeshDataTest::constructIndexless() {
allowed, to allow creation of MeshData instances referencing other
MeshData without having to branch on isIndexed(). */
CORRADE_VERIFY(!data.isIndexed());
CORRADE_COMPARE(data.indexData(), nullptr);
CORRADE_COMPARE(data.indexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.indices().data(), nullptr);
CORRADE_COMPARE(data.indices().size(), (Containers::StridedArrayView2D<std::size_t>::Size{0, 0}));
CORRADE_COMPARE(data.mutableIndices().data(), nullptr);
@ -1584,8 +1584,8 @@ void MeshDataTest::constructIndexlessZeroVertices() {
MeshAttributeData positions{MeshAttribute::Position, VertexFormat::Vector2, nullptr};
MeshData data{MeshPrimitive::LineLoop, nullptr, {positions}};
CORRADE_COMPARE(data.primitive(), MeshPrimitive::LineLoop);
CORRADE_COMPARE(data.indexData(), nullptr);
CORRADE_COMPARE(data.vertexData(), nullptr);
CORRADE_COMPARE(data.indexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.vertexData(), static_cast<const void*>(nullptr));
CORRADE_VERIFY(!data.isIndexed());
CORRADE_COMPARE(data.vertexCount(), 0);
@ -1612,7 +1612,7 @@ void MeshDataTest::constructAttributeless() {
CORRADE_COMPARE(data.vertexDataFlags(), DataFlag::Owned|DataFlag::Mutable);
CORRADE_COMPARE(data.primitive(), MeshPrimitive::TriangleStrip);
CORRADE_VERIFY(!data.attributeData());
CORRADE_COMPARE(data.vertexData(), nullptr);
CORRADE_COMPARE(data.vertexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.importerState(), &importerState);
CORRADE_VERIFY(data.isIndexed());
@ -1781,9 +1781,9 @@ void MeshDataTest::constructIndexlessNotOwned() {
CORRADE_COMPARE(data.indexDataFlags(), DataFlag::Owned|DataFlag::Mutable);
CORRADE_COMPARE(data.vertexDataFlags(), instanceData.dataFlags);
CORRADE_COMPARE(data.primitive(), MeshPrimitive::LineLoop);
CORRADE_COMPARE(data.indexData(), nullptr);
CORRADE_COMPARE(data.indexData(), static_cast<const void*>(nullptr));
if(instanceData.dataFlags & DataFlag::Mutable)
CORRADE_COMPARE(data.mutableIndexData(), nullptr);
CORRADE_COMPARE(data.mutableIndexData(), static_cast<void*>(nullptr));
CORRADE_COMPARE(data.importerState(), &importerState);
CORRADE_VERIFY(!data.isIndexed());
@ -1808,7 +1808,7 @@ void MeshDataTest::constructAttributelessNotOwned() {
CORRADE_COMPARE(data.vertexDataFlags(), DataFlag::Owned|DataFlag::Mutable);
CORRADE_COMPARE(data.primitive(), MeshPrimitive::TriangleStrip);
CORRADE_VERIFY(!data.attributeData());
CORRADE_COMPARE(data.vertexData(), nullptr);
CORRADE_COMPARE(data.vertexData(), static_cast<const void*>(nullptr));
if(instanceData.dataFlags & DataFlag::Mutable)
CORRADE_COMPARE(data.mutableVertexData(), nullptr);
CORRADE_COMPARE(data.importerState(), &importerState);
@ -1838,8 +1838,8 @@ void MeshDataTest::constructIndexlessAttributeless() {
CORRADE_COMPARE(data.vertexDataFlags(), DataFlag::Owned|DataFlag::Mutable);
CORRADE_COMPARE(data.primitive(), MeshPrimitive::TriangleStrip);
CORRADE_VERIFY(!data.attributeData());
CORRADE_COMPARE(data.indexData(), nullptr);
CORRADE_COMPARE(data.vertexData(), nullptr);
CORRADE_COMPARE(data.indexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.vertexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.importerState(), &state);
CORRADE_VERIFY(!data.isIndexed());
@ -1852,8 +1852,8 @@ void MeshDataTest::constructIndexlessAttributelessZeroVertices() {
MeshData data{MeshPrimitive::TriangleStrip, 0, &state};
CORRADE_COMPARE(data.primitive(), MeshPrimitive::TriangleStrip);
CORRADE_VERIFY(!data.attributeData());
CORRADE_COMPARE(data.indexData(), nullptr);
CORRADE_COMPARE(data.vertexData(), nullptr);
CORRADE_COMPARE(data.indexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.vertexData(), static_cast<const void*>(nullptr));
CORRADE_COMPARE(data.importerState(), &state);
CORRADE_VERIFY(!data.isIndexed());

Write Preview
Loading…
Cancel
Save