From cf6fcdef4f39cc6219d0c6b2aa5cb6acc0d37fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 15 Nov 2022 16:53:18 +0100 Subject: [PATCH] Trade: use unique identifiers in assertion tests. Otherwise it could just pick whatever format from the set, which isn't desired. --- src/Magnum/Trade/Test/MeshDataTest.cpp | 28 +++++++++++++------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Magnum/Trade/Test/MeshDataTest.cpp b/src/Magnum/Trade/Test/MeshDataTest.cpp index 0e98f2cad..ca24ed3cb 100644 --- a/src/Magnum/Trade/Test/MeshDataTest.cpp +++ b/src/Magnum/Trade/Test/MeshDataTest.cpp @@ -3239,15 +3239,15 @@ void MeshDataTest::implementationSpecificVertexFormatWrongAccess() { MeshAttributeData{MeshAttribute::Tangent, vertexFormatWrap(0xdead2), attribute}, MeshAttributeData{MeshAttribute::Bitangent, - vertexFormatWrap(0xdead2), attribute}, + vertexFormatWrap(0xdead3), attribute}, MeshAttributeData{MeshAttribute::Normal, - vertexFormatWrap(0xdead2), attribute}, + vertexFormatWrap(0xdead4), attribute}, MeshAttributeData{MeshAttribute::TextureCoordinates, - vertexFormatWrap(0xdead3), attribute}, + vertexFormatWrap(0xdead5), attribute}, MeshAttributeData{MeshAttribute::Color, - vertexFormatWrap(0xdead4), attribute}, + vertexFormatWrap(0xdead6), attribute}, MeshAttributeData{MeshAttribute::ObjectId, - vertexFormatWrap(0xdead4), attribute}}}; + vertexFormatWrap(0xdead7), attribute}}}; std::ostringstream out; Error redirectError{&out}; @@ -3270,22 +3270,22 @@ void MeshDataTest::implementationSpecificVertexFormatWrongAccess() { data.objectIdsAsArray(); CORRADE_COMPARE(out.str(), "Trade::MeshData::attribute(): can't cast data from an implementation-specific vertex format 0xdead1\n" - "Trade::MeshData::attribute(): can't cast data from an implementation-specific vertex format 0xdead2\n" - "Trade::MeshData::attribute(): can't cast data from an implementation-specific vertex format 0xdead3\n" "Trade::MeshData::attribute(): can't cast data from an implementation-specific vertex format 0xdead4\n" + "Trade::MeshData::attribute(): can't cast data from an implementation-specific vertex format 0xdead5\n" + "Trade::MeshData::attribute(): can't cast data from an implementation-specific vertex format 0xdead6\n" "Trade::MeshData::mutableAttribute(): can't cast data from an implementation-specific vertex format 0xdead1\n" - "Trade::MeshData::mutableAttribute(): can't cast data from an implementation-specific vertex format 0xdead2\n" - "Trade::MeshData::mutableAttribute(): can't cast data from an implementation-specific vertex format 0xdead3\n" "Trade::MeshData::mutableAttribute(): can't cast data from an implementation-specific vertex format 0xdead4\n" + "Trade::MeshData::mutableAttribute(): can't cast data from an implementation-specific vertex format 0xdead5\n" + "Trade::MeshData::mutableAttribute(): can't cast data from an implementation-specific vertex format 0xdead6\n" "Trade::MeshData::positions2DInto(): can't extract data out of an implementation-specific vertex format 0xdead1\n" "Trade::MeshData::positions3DInto(): can't extract data out of an implementation-specific vertex format 0xdead1\n" "Trade::MeshData::tangentsInto(): can't extract data out of an implementation-specific vertex format 0xdead2\n" "Trade::MeshData::bitangentSignsInto(): can't extract data out of an implementation-specific vertex format 0xdead2\n" - "Trade::MeshData::bitangentsInto(): can't extract data out of an implementation-specific vertex format 0xdead2\n" - "Trade::MeshData::normalsInto(): can't extract data out of an implementation-specific vertex format 0xdead2\n" - "Trade::MeshData::textureCoordinatesInto(): can't extract data out of an implementation-specific vertex format 0xdead3\n" - "Trade::MeshData::colorsInto(): can't extract data out of an implementation-specific vertex format 0xdead4\n" - "Trade::MeshData::objectIdsInto(): can't extract data out of an implementation-specific vertex format 0xdead4\n"); + "Trade::MeshData::bitangentsInto(): can't extract data out of an implementation-specific vertex format 0xdead3\n" + "Trade::MeshData::normalsInto(): can't extract data out of an implementation-specific vertex format 0xdead4\n" + "Trade::MeshData::textureCoordinatesInto(): can't extract data out of an implementation-specific vertex format 0xdead5\n" + "Trade::MeshData::colorsInto(): can't extract data out of an implementation-specific vertex format 0xdead6\n" + "Trade::MeshData::objectIdsInto(): can't extract data out of an implementation-specific vertex format 0xdead7\n"); } void MeshDataTest::mutableAccessNotAllowed() {