From 5e23f09ffb36898092d9e6d6dd9cf901faa5e874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 30 Aug 2023 18:22:12 +0200 Subject: [PATCH] GL: test Mesh::indexType() assertion as well. Ugh the code coverage is abysmal here. --- src/Magnum/GL/Mesh.cpp | 4 ++-- src/Magnum/GL/Test/MeshGLTest.cpp | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Magnum/GL/Mesh.cpp b/src/Magnum/GL/Mesh.cpp index 24179c83c..406e9c88e 100644 --- a/src/Magnum/GL/Mesh.cpp +++ b/src/Magnum/GL/Mesh.cpp @@ -360,13 +360,13 @@ Mesh& Mesh::setLabel(const Containers::StringView label) { #endif MeshIndexType Mesh::indexType() const { - CORRADE_ASSERT(_indexBuffer.id(), "Mesh::indexType(): mesh is not indexed", {}); + CORRADE_ASSERT(_indexBuffer.id(), "GL::Mesh::indexType(): mesh is not indexed", {}); return _indexType; } #ifdef MAGNUM_BUILD_DEPRECATED UnsignedInt Mesh::indexTypeSize() const { - CORRADE_ASSERT(_indexBuffer.id(), "Mesh::indexTypeSize(): mesh is not indexed", {}); + CORRADE_ASSERT(_indexBuffer.id(), "GL::Mesh::indexTypeSize(): mesh is not indexed", {}); return meshIndexTypeSize(_indexType); } diff --git a/src/Magnum/GL/Test/MeshGLTest.cpp b/src/Magnum/GL/Test/MeshGLTest.cpp index 4103387b3..6a327f3ec 100644 --- a/src/Magnum/GL/Test/MeshGLTest.cpp +++ b/src/Magnum/GL/Test/MeshGLTest.cpp @@ -141,7 +141,7 @@ struct MeshGLTest: OpenGLTester { template void setIndexBufferTransferOwnership(); template void setIndexBufferRangeTransferOwnership(); - void setIndexOffsetNotIndexed(); + void indexTypeSetIndexOffsetNotIndexed(); void unbindVAOWhenSettingIndexBufferData(); void unbindIndexBufferWhenBindingVao(); @@ -633,7 +633,7 @@ MeshGLTest::MeshGLTest() { &MeshGLTest::setIndexBufferRangeTransferOwnership, &MeshGLTest::setIndexBufferRangeTransferOwnership, - &MeshGLTest::setIndexOffsetNotIndexed, + &MeshGLTest::indexTypeSetIndexOffsetNotIndexed, &MeshGLTest::unbindVAOWhenSettingIndexBufferData, &MeshGLTest::unbindIndexBufferWhenBindingVao, @@ -2677,7 +2677,7 @@ template void MeshGLTest::setIndexBufferRangeTransferOwnership() { CORRADE_VERIFY(!glIsBuffer(id)); } -void MeshGLTest::setIndexOffsetNotIndexed() { +void MeshGLTest::indexTypeSetIndexOffsetNotIndexed() { CORRADE_SKIP_IF_NO_ASSERT(); Mesh mesh; @@ -2685,8 +2685,11 @@ void MeshGLTest::setIndexOffsetNotIndexed() { std::ostringstream out; Error redirectError{&out}; + mesh.indexType(); view.setIndexOffset(3); - CORRADE_COMPARE(out.str(), "GL::MeshView::setIndexOffset(): mesh is not indexed\n"); + CORRADE_COMPARE(out.str(), + "GL::Mesh::indexType(): mesh is not indexed\n" + "GL::MeshView::setIndexOffset(): mesh is not indexed\n"); } void MeshGLTest::unbindVAOWhenSettingIndexBufferData() {