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

Test: improve tests for Image* data size assertions. 

For compressed images the expected message was completely wrong, meaning
it'd fail in any case, and they were missing a SKIP on no-assert builds.
Then, for GL::[Compressed]BufferImage the assertions in setData() were
never tested at all.
pull/651/merge
Vladimír Vondruš 1 year ago
parent
345012a7be
commit
a184db4cb6
4 changed files with 109 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      src/Magnum/GL/Test/BufferImageGLTest.cpp
  2. 10
      src/Magnum/Test/ImageTest.cpp
  3. 41
      src/Magnum/Test/ImageViewTest.cpp
  4. 10
      src/Magnum/Trade/Test/ImageDataTest.cpp

82
src/Magnum/GL/Test/BufferImageGLTest.cpp
Unescape View File

@ -27,6 +27,7 @@
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Containers/String.h> #include <Corrade/Containers/String.h>
#include <Corrade/TestSuite/Compare/Container.h> #include <Corrade/TestSuite/Compare/Container.h>
#include <Corrade/TestSuite/Compare/String.h>
#include <Corrade/Utility/DebugStl.h> /** @todo remove once dataProperties() std::pair is gone */ #include <Corrade/Utility/DebugStl.h> /** @todo remove once dataProperties() std::pair is gone */
#include "Magnum/PixelFormat.h" #include "Magnum/PixelFormat.h"
@ -63,6 +64,8 @@ struct BufferImageGLTest: OpenGLTester {
void setDataGeneric(); void setDataGeneric();
void setDataCompressed(); void setDataCompressed();
void setDataCompressedGeneric(); void setDataCompressedGeneric();
void setDataInvalidSize();
void setDataCompressedInvalidSize();
void release(); void release();
void releaseCompressed(); void releaseCompressed();
@ -93,6 +96,8 @@ BufferImageGLTest::BufferImageGLTest() {
&BufferImageGLTest::setDataGeneric, &BufferImageGLTest::setDataGeneric,
&BufferImageGLTest::setDataCompressed, &BufferImageGLTest::setDataCompressed,
&BufferImageGLTest::setDataCompressedGeneric, &BufferImageGLTest::setDataCompressedGeneric,
&BufferImageGLTest::setDataInvalidSize,
&BufferImageGLTest::setDataCompressedInvalidSize,
&BufferImageGLTest::release, &BufferImageGLTest::release,
&BufferImageGLTest::releaseCompressed}); &BufferImageGLTest::releaseCompressed});
@ -399,28 +404,38 @@ void BufferImageGLTest::constructInvalidSize() {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
BufferImage2D{Magnum::PixelFormat::RGB8Unorm, {1, 3}, Containers::Array<char>{11}, BufferUsage::StaticDraw};
/* Doesn't consider alignment */ CORRADE_COMPARE(out, "GL::BufferImage: data too small, got 11 but expected at least 12 bytes\n");
BufferImage2D{Magnum::PixelFormat::RGB8Unorm, {1, 3}, Containers::Array<char>{3*3}, BufferUsage::StaticDraw};
CORRADE_COMPARE(out, "GL::BufferImage: data too small, got 9 but expected at least 12 bytes\n");
} }
void BufferImageGLTest::constructCompressedInvalidSize() { void BufferImageGLTest::constructCompressedInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT();
CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet."); CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet.");
/* Too small for given format */ /* Too small for given format */
{ {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedBufferImage2D{Magnum::CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{2}, BufferUsage::StaticDraw}; CompressedBufferImage2D{Magnum::CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{15}, BufferUsage::StaticDraw};
CORRADE_COMPARE(out, "GL::CompressedBufferImage::CompressedBufferImage(): data too small, got 2 but expected at least 4 bytes\n"); /* Here it's assuming the buffer is already filled, of given size */
CompressedBufferImage2D{Magnum::CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, GL::Buffer{}, 15};
CORRADE_COMPARE_AS(out,
"GL::CompressedBufferImage: data too small, got 15 but expected at least 16 bytes\n"
"GL::CompressedBufferImage: data too small, got 15 but expected at least 16 bytes\n",
TestSuite::Compare::String);
/* Size should be rounded up even if the image size is not full block */ /* Size should be rounded up even if the image size is not full block */
} { } {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedBufferImage2D{Magnum::CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, Containers::Array<char>{2}, BufferUsage::StaticDraw}; CompressedBufferImage2D{Magnum::CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, Containers::Array<char>{15}, BufferUsage::StaticDraw};
CORRADE_COMPARE(out, "GL::CompressedBufferImage::CompressedBufferImage(): data too small, got 2 but expected at least 4 bytes\n"); /* Here it's assuming the buffer is already filled, of given size */
CompressedBufferImage2D{Magnum::CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, GL::Buffer{}, 15};
CORRADE_COMPARE_AS(out,
"GL::CompressedBufferImage: data too small, got 15 but expected at least 16 bytes\n"
"GL::CompressedBufferImage: data too small, got 15 but expected at least 16 bytes\n",
TestSuite::Compare::String);
} }
} }
@ -663,6 +678,57 @@ void BufferImageGLTest::setDataCompressedGeneric() {
#endif #endif
} }
void BufferImageGLTest::setDataInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT();
BufferImage2D image{PixelFormat::Red, PixelType::UnsignedByte, {}, {nullptr, 7}, BufferUsage::StaticDraw};
Containers::String out;
Error redirectError{&out};
image.setData(PixelFormat::RGB, PixelType::UnsignedByte, {1, 3}, Containers::Array<char>{11}, BufferUsage::StaticDraw);
/* Keeping current storage */
image.setData(PixelFormat::RGBA, PixelType::UnsignedByte, {2, 1}, nullptr, BufferUsage::StaticDraw);
CORRADE_COMPARE_AS(out,
"GL::BufferImage::setData(): data too small, got 11 but expected at least 12 bytes\n"
"GL::BufferImage::setData(): current storage too small, got 7 but expected at least 8 bytes\n",
TestSuite::Compare::String);
}
void BufferImageGLTest::setDataCompressedInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT();
/* Fits almost two blocks, but only almost */
CompressedBufferImage2D a{CompressedPixelFormat::RGBAS3tcDxt1, {4, 4}, "helloheyhellhe", BufferUsage::StaticDraw};
CORRADE_COMPARE(a.dataSize(), 15);
CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet.");
/* Too small for given format */
{
Containers::String out;
Error redirectError{&out};
a.setData(CompressedPixelFormat::RGBAS3tcDxt3, {8, 4}, "helloheyhelloheyhelloheyhellhe", BufferUsage::StaticDraw);
/* Keeping current storage */
a.setData(CompressedPixelFormat::RGBAS3tcDxt1, {8, 4}, nullptr, BufferUsage::StaticDraw);
CORRADE_COMPARE_AS(out,
"GL::CompressedBufferImage::setData(): data too small, got 31 but expected at least 32 bytes\n"
"GL::CompressedBufferImage::setData(): current storage too small, got 15 but expected at least 16 bytes\n",
TestSuite::Compare::String);
/* Size should be rounded up even if the image size is not that big */
} {
Containers::String out;
Error redirectError{&out};
a.setData(CompressedPixelFormat::RGBAS3tcDxt3, {5, 2}, "helloheyhelloheyhelloheyhellhe", BufferUsage::StaticDraw);
/* Keeping current storage */
a.setData(CompressedPixelFormat::RGBAS3tcDxt1, {5, 2}, nullptr, BufferUsage::StaticDraw);
CORRADE_COMPARE_AS(out,
"GL::CompressedBufferImage::setData(): data too small, got 31 but expected at least 32 bytes\n"
"GL::CompressedBufferImage::setData(): current storage too small, got 15 but expected at least 16 bytes\n",
TestSuite::Compare::String);
}
}
void BufferImageGLTest::release() { void BufferImageGLTest::release() {
BufferImage2D a{PixelFormat::RGBA, PixelType::UnsignedByte}; BufferImage2D a{PixelFormat::RGBA, PixelType::UnsignedByte};
const UnsignedInt id = a.buffer().id(); const UnsignedInt id = a.buffer().id();

10
src/Magnum/Test/ImageTest.cpp
Unescape View File

@ -540,21 +540,23 @@ void ImageTest::constructInvalidCubeMap() {
} }
void ImageTest::constructCompressedInvalidSize() { void ImageTest::constructCompressedInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT();
CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet."); CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet.");
/* Too small for given format */ /* Too small for given format */
{ {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedImage2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{2}}; CompressedImage2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{15}};
CORRADE_COMPARE(out, "CompressedImage: data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "CompressedImage: data too small, got 15 but expected at least 16 bytes\n");
/* Size should be rounded up even if the image size is not full block */ /* Size should be rounded up even if the image size is not full block */
} { } {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedImage2D{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, Containers::Array<char>{2}}; CompressedImage2D{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, Containers::Array<char>{15}};
CORRADE_COMPARE(out, "CompressedImage: data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "CompressedImage: data too small, got 15 but expected at least 16 bytes\n");
} }
} }

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

@ -700,13 +700,12 @@ void ImageViewTest::constructInvalidPixelSize() {
void ImageViewTest::constructInvalidSize() { void ImageViewTest::constructInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_SKIP_IF_NO_ASSERT();
const char data[11]{};
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
/* Doesn't consider alignment */
const char data[3*3]{};
ImageView2D{PixelFormat::RGB8Unorm, {1, 3}, data}; ImageView2D{PixelFormat::RGB8Unorm, {1, 3}, data};
CORRADE_COMPARE(out, "ImageView: data too small, got 9 but expected at least 12 bytes\n"); CORRADE_COMPARE(out, "ImageView: data too small, got 11 but expected at least 12 bytes\n");
} }
void ImageViewTest::constructInvalidCubeMap() { void ImageViewTest::constructInvalidCubeMap() {
@ -731,23 +730,25 @@ void ImageViewTest::constructInvalidCubeMap() {
} }
void ImageViewTest::constructCompressedInvalidSize() { void ImageViewTest::constructCompressedInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT();
CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet."); CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet.");
const char data[2]{}; const char data[15]{};
/* Too small for given format */ /* Too small for given format */
{ {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedImageView2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, data}; CompressedImageView2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, data};
CORRADE_COMPARE(out, "CompressedImageView: data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "CompressedImageView: data too small, got 15 but expected at least 16 bytes\n");
/* Size should be rounded up even if the image size is not full block */ /* Size should be rounded up even if the image size is not full block */
} { } {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedImageView2D{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, data}; CompressedImageView2D{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, data};
CORRADE_COMPARE(out, "CompressedImageView: data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "CompressedImageView: data too small, got 15 but expected at least 16 bytes\n");
} }
} }
@ -832,35 +833,39 @@ template<class T> void ImageViewTest::setDataCompressed() {
void ImageViewTest::setDataInvalidSize() { void ImageViewTest::setDataInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT(); CORRADE_SKIP_IF_NO_ASSERT();
Containers::String out;
Error redirectError{&out};
ImageView2D image{PixelFormat::RGB8Unorm, {1, 3}}; ImageView2D image{PixelFormat::RGB8Unorm, {1, 3}};
const char data[3*3]{}; const char data[11]{};
/* Doesn't consider alignment */ Containers::String out;
Error redirectError{&out};
image.setData(data); image.setData(data);
CORRADE_COMPARE(out, "ImageView::setData(): data too small, got 9 but expected at least 12 bytes\n"); CORRADE_COMPARE(out, "ImageView::setData(): data too small, got 11 but expected at least 12 bytes\n");
} }
void ImageViewTest::setDataCompressedInvalidSize() { void ImageViewTest::setDataCompressedInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT();
CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet."); CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet.");
const char data[2]{}; const char data[11]{};
/* Too small for given format */ /* Too small for given format */
{ {
CompressedImageView2D image{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}};
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedImageView2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, data}; image.setData(data);
CORRADE_COMPARE(out, "CompressedImageView::setData(): data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "CompressedImageView::setData(): data too small, got 11 but expected at least 16 bytes\n");
/* Size should be rounded up even if the image size is not that big */ /* Size should be rounded up even if the image size is not that big */
} { } {
CompressedImageView2D image{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}};
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
CompressedImageView2D{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, data}; image.setData(data);
CORRADE_COMPARE(out, "CompressedImageView::setData(): data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "CompressedImageView::setData(): data too small, got 11 but expected at least 16 bytes\n");
} }
} }

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

@ -724,21 +724,23 @@ void ImageDataTest::constructInvalidCubeMap() {
} }
void ImageDataTest::constructCompressedInvalidSize() { void ImageDataTest::constructCompressedInvalidSize() {
CORRADE_SKIP_IF_NO_ASSERT();
CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet."); CORRADE_EXPECT_FAIL("Size checking for compressed image data is not implemented yet.");
/* Too small for given format */ /* Too small for given format */
{ {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
ImageData2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{2}}; ImageData2D{CompressedPixelFormat::Bc2RGBAUnorm, {4, 4}, Containers::Array<char>{15}};
CORRADE_COMPARE(out, "Trade::ImageData::ImageData(): data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "Trade::ImageData: data too small, got 15 but expected at least 16 bytes\n");
/* Size should be rounded up even if the image size is not full block */ /* Size should be rounded up even if the image size is not full block */
} { } {
Containers::String out; Containers::String out;
Error redirectError{&out}; Error redirectError{&out};
ImageData2D{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, Containers::Array<char>{2}}; ImageData2D{CompressedPixelFormat::Bc2RGBAUnorm, {2, 2}, Containers::Array<char>{15}};
CORRADE_COMPARE(out, "Trade::ImageData::ImageData(): data too small, got 2 but expected at least 4 bytes\n"); CORRADE_COMPARE(out, "Trade::ImageData: data too small, got 15 but expected at least 16 bytes\n");
} }
} }

Write Preview
Loading…
Cancel
Save