Browse Source

Trade: unify AbstractSceneConverter::end*() error messages.

Not sure why 4ce7d8e9f4 did the change
just for the file variant and not all 3.
pull/594/head
Vladimír Vondruš 4 years ago
parent
commit
ecee152c03
  1. 4
      src/Magnum/Trade/AbstractSceneConverter.cpp
  2. 8
      src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp

4
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 {};
}

8
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() {

Loading…
Cancel
Save