From ecee152c03047b307160e241539dd8fcf95c021d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 20 Sep 2022 03:16:53 +0200
Subject: [PATCH] Trade: unify AbstractSceneConverter::end*() error messages.

Not sure why 4ce7d8e9f49e3fb4c6840defa60627b8178fb950 did the change
just for the file variant and not all 3.
---
 src/Magnum/Trade/AbstractSceneConverter.cpp          | 4 ++--
 src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Magnum/Trade/AbstractSceneConverter.cpp b/src/Magnum/Trade/AbstractSceneConverter.cpp
index 9660de2e5..7da1515d4 100644
--- a/src/Magnum/Trade/AbstractSceneConverter.cpp
+++ b/src/Magnum/Trade/AbstractSceneConverter.cpp
@@ -422,7 +422,7 @@ Containers::Pointer<AbstractImporter> AbstractSceneConverter::end() {
 
     if(features() & SceneConverterFeature::ConvertMesh) {
         if(_state->meshCount != 1) {
-            Error{} << "Trade::AbstractSceneConverter::end(): the converter requires exactly one mesh";
+            Error{} << "Trade::AbstractSceneConverter::end(): the converter requires exactly one mesh, got" << _state->meshCount;
             return {};
         }
 
@@ -512,7 +512,7 @@ Containers::Optional<Containers::Array<char>> AbstractSceneConverter::endData()
 
     } else if(features() >= SceneConverterFeature::ConvertMeshToData) {
         if(_state->meshCount != 1) {
-            Error{} << "Trade::AbstractSceneConverter::endData(): the converter requires exactly one mesh";
+            Error{} << "Trade::AbstractSceneConverter::endData(): the converter requires exactly one mesh, got" << _state->meshCount;
             return {};
         }
 
diff --git a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
index 92e66753a..f523d46ae 100644
--- a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
+++ b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
@@ -3455,7 +3455,7 @@ void AbstractSceneConverterTest::addMeshThroughConvertMeshFailed() {
     Error redirectError{&out};
     CORRADE_VERIFY(!converter.end());
     CORRADE_VERIFY(!converter.isConverting());
-    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::end(): the converter requires exactly one mesh\n");
+    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::end(): the converter requires exactly one mesh, got 0\n");
 }
 
 void AbstractSceneConverterTest::addMeshThroughConvertMeshZeroMeshes() {
@@ -3471,7 +3471,7 @@ void AbstractSceneConverterTest::addMeshThroughConvertMeshZeroMeshes() {
     Error redirectError{&out};
     CORRADE_VERIFY(!converter.end());
     CORRADE_VERIFY(!converter.isConverting());
-    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::end(): the converter requires exactly one mesh\n");
+    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::end(): the converter requires exactly one mesh, got 0\n");
 }
 
 void AbstractSceneConverterTest::addMeshThroughConvertMeshTwoMeshes() {
@@ -3574,7 +3574,7 @@ void AbstractSceneConverterTest::addMeshThroughConvertMeshToDataFailed() {
     Error redirectError{&out};
     CORRADE_VERIFY(!converter.endData());
     CORRADE_VERIFY(!converter.isConverting());
-    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::endData(): the converter requires exactly one mesh\n");
+    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::endData(): the converter requires exactly one mesh, got 0\n");
 }
 
 void AbstractSceneConverterTest::addMeshThroughConvertMeshToDataZeroMeshes() {
@@ -3590,7 +3590,7 @@ void AbstractSceneConverterTest::addMeshThroughConvertMeshToDataZeroMeshes() {
     Error redirectError{&out};
     CORRADE_VERIFY(!converter.endData());
     CORRADE_VERIFY(!converter.isConverting());
-    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::endData(): the converter requires exactly one mesh\n");
+    CORRADE_COMPARE(out.str(), "Trade::AbstractSceneConverter::endData(): the converter requires exactly one mesh, got 0\n");
 }
 
 void AbstractSceneConverterTest::addMeshThroughConvertMeshToDataTwoMeshes() {