CgltfImporter: test missing buffers for all code paths

Author: pezcode

src/MagnumPlugins/CgltfImporter/Test/CMakeLists.txt

@@ -59,6 +59,7 @@ corrade_add_test(CgltfImporterTest
     ${CgltfImporterTest_RESOURCES}
     LIBRARIES Magnum::Trade
     FILES
+        animation-buffer-notfound.gltf
         # modified version of animation-patching.* from TinyGltfImporter
         # without size mismatch between input and output samplers
         animation-patching-fixed.bin
@@ -74,12 +75,14 @@ corrade_add_test(CgltfImporterTest
         external-data-order.gltf
         image-buffer-notfound.gltf
         image-no-data.gltf
+        mesh-indices-buffer-notfound.gltf
         mesh-invalid-accessor-types.gltf
         mesh-invalid-skin-attributes.gltf
         mesh-skin-attributes.bin
         mesh-skin-attributes.gltf
         scene-invalid-child-not-root.gltf
         scene-invalid-multiple-parents.gltf
+        skin-buffer-notfound.gltf
         texture-extensions-invalid-basisu-oob.gltf
         texture-extensions-invalid.gltf
         texture-extensions.gltf

src/MagnumPlugins/CgltfImporter/Test/CgltfImporterTest.cpp

@@ -84,6 +84,7 @@ struct CgltfImporterTest: TestSuite::Tester {
     void animation();
     void animationOutOfBounds();
     void animationInvalid();
+    void animationInvalidBufferNotFound();
     void animationInvalidInterpolation();
     void animationMismatchingCount();
     void animationMissingTargetNode();
@@ -122,6 +123,7 @@ struct CgltfImporterTest: TestSuite::Tester {
     void skin();
     void skinOutOfBounds();
     void skinInvalid();
+    void skinInvalidBufferNotFound();
     void skinNoJointsProperty();
 
     void mesh();
@@ -138,6 +140,7 @@ struct CgltfImporterTest: TestSuite::Tester {
     void meshPrimitivesTypes();
     void meshOutOfBounds();
     void meshInvalid();
+    void meshInvalidIndicesBufferNotFound();
     void meshInvalidSkinAttributes();
     void meshInvalidTypes();
 
@@ -258,6 +261,14 @@ constexpr struct {
     {"unsupported path", "unsupported track target 0"}
 };
 
+constexpr struct {
+    const char* name;
+    const char* message;
+} AnimationInvalidBufferNotFoundData[]{
+    {"input buffer not found", "error opening file: /nonexistent1.bin : file not found"},
+    {"output buffer not found", "error opening file: /nonexistent2.bin : file not found"}
+};
+
 constexpr struct {
     const char* name;
     const char* message;
@@ -603,6 +614,9 @@ CgltfImporterTest::CgltfImporterTest() {
     addInstancedTests({&CgltfImporterTest::animationInvalid},
         Containers::arraySize(AnimationInvalidData));
 
+    addInstancedTests({&CgltfImporterTest::animationInvalidBufferNotFound},
+        Containers::arraySize(AnimationInvalidBufferNotFoundData));
+
     addTests({&CgltfImporterTest::animationInvalidInterpolation,
               &CgltfImporterTest::animationMismatchingCount,
               &CgltfImporterTest::animationMissingTargetNode});
@@ -661,6 +675,8 @@ CgltfImporterTest::CgltfImporterTest() {
     addInstancedTests({&CgltfImporterTest::skinInvalid},
         Containers::arraySize(SkinInvalidData));
 
+    addTests({&CgltfImporterTest::skinInvalidBufferNotFound});
+
     addInstancedTests({&CgltfImporterTest::skinOutOfBounds},
         Containers::arraySize(SkinOutOfBoundsData));
 
@@ -689,6 +705,8 @@ CgltfImporterTest::CgltfImporterTest() {
     addInstancedTests({&CgltfImporterTest::meshInvalid},
         Containers::arraySize(MeshInvalidData));
 
+    addTests({&CgltfImporterTest::meshInvalidIndicesBufferNotFound});
+
     addInstancedTests({&CgltfImporterTest::meshInvalidSkinAttributes},
         Containers::arraySize(MeshInvalidSkinAttributesData));
 
@@ -1200,6 +1218,27 @@ void CgltfImporterTest::animationInvalid() {
     CORRADE_COMPARE(out.str(), Utility::formatString("Trade::CgltfImporter::animation(): {}\n", data.message));
 }
 
+void CgltfImporterTest::animationInvalidBufferNotFound() {
+    auto&& data = AnimationInvalidBufferNotFoundData[testCaseInstanceId()];
+    setTestCaseDescription(data.name);
+
+    /* These tests have to be separate from TinyGltfImporter because it errors
+       out during import trying to load the buffer */
+
+    Containers::Pointer<AbstractImporter> importer = _manager.instantiate("CgltfImporter");
+
+    CORRADE_VERIFY(importer->openFile(Utility::Directory::join(CGLTFIMPORTER_TEST_DIR,
+        "animation-buffer-notfound.gltf")));
+
+    /* Check we didn't forget to test anything */
+    CORRADE_COMPARE(importer->animationCount(), Containers::arraySize(AnimationInvalidBufferNotFoundData));
+
+    std::ostringstream out;
+    Error redirectError{&out};
+    CORRADE_VERIFY(!importer->animation(data.name));
+    CORRADE_COMPARE(out.str(), Utility::formatString("Trade::CgltfImporter::animation(): {}\n", data.message));
+}
+
 void CgltfImporterTest::animationInvalidInterpolation() {
     Containers::Pointer<AbstractImporter> importer = _manager.instantiate("CgltfImporter");
 
@@ -2285,6 +2324,23 @@ void CgltfImporterTest::skinInvalid() {
     CORRADE_COMPARE(out.str(), Utility::formatString("Trade::CgltfImporter::skin3D(): {}\n", data.message));
 }
 
+void CgltfImporterTest::skinInvalidBufferNotFound() {
+    /* This test has to be separate from TinyGltfImporter because it errors
+       out during import trying to load the buffer */
+
+    Containers::Pointer<AbstractImporter> importer = _manager.instantiate("CgltfImporter");
+
+    CORRADE_VERIFY(importer->openFile(Utility::Directory::join(CGLTFIMPORTER_TEST_DIR,
+        "skin-buffer-notfound.gltf")));
+
+    CORRADE_COMPARE(importer->skin3DCount(), 1);
+
+    std::ostringstream out;
+    Error redirectError{&out};
+    CORRADE_VERIFY(!importer->skin3D("buffer not found"));
+    CORRADE_COMPARE(out.str(), "Trade::CgltfImporter::skin3D(): error opening file: /nonexistent.bin : file not found\n");
+}
+
 void CgltfImporterTest::skinNoJointsProperty() {
     Containers::Pointer<AbstractImporter> importer = _manager.instantiate("CgltfImporter");
 
@@ -3117,6 +3173,26 @@ void CgltfImporterTest::meshInvalid() {
     CORRADE_COMPARE(out.str(), Utility::formatString("Trade::CgltfImporter::mesh(): {}\n", data.message));
 }
 
+void CgltfImporterTest::meshInvalidIndicesBufferNotFound() {
+    /* This test has to be separate from TinyGltfImporter because it errors
+       out during import trying to load the buffer.
+
+       Not testing this for the attribute buffer since that's already done by
+       openExternalDataNotFound(). */
+
+    Containers::Pointer<AbstractImporter> importer = _manager.instantiate("CgltfImporter");
+
+    CORRADE_VERIFY(importer->openFile(Utility::Directory::join(CGLTFIMPORTER_TEST_DIR,
+        "mesh-indices-buffer-notfound.gltf")));
+
+    CORRADE_COMPARE(importer->meshCount(), 1);
+
+    std::ostringstream out;
+    Error redirectError{&out};
+    CORRADE_VERIFY(!importer->mesh("indices buffer not found"));
+    CORRADE_COMPARE(out.str(), "Trade::CgltfImporter::mesh(): error opening file: /nonexistent.bin : file not found\n");
+}
+
 void CgltfImporterTest::meshInvalidSkinAttributes() {
     auto&& data = MeshInvalidSkinAttributesData[testCaseInstanceId()];
     setTestCaseDescription(data.name);

src/MagnumPlugins/CgltfImporter/Test/animation-buffer-notfound.gltf

@@ -0,0 +1,114 @@
+{
+    "asset": {
+        "version": "2.0"
+    },
+    "animations": [
+        {
+            "name": "input buffer not found",
+            "channels": [
+                {
+                    "sampler": 0,
+                    "target": {
+                        "node": 0,
+                        "path": "rotation"
+                    }
+                }
+            ],
+            "samplers": [
+                {
+                    "input": 2,
+                    "interpolation": "LINEAR",
+                    "output": 1
+                }
+            ]
+        },
+        {
+            "name": "output buffer not found",
+            "channels": [
+                {
+                    "sampler": 0,
+                    "target": {
+                        "node": 0,
+                        "path": "rotation"
+                    }
+                }
+            ],
+            "samplers": [
+                {
+                    "input": 0,
+                    "interpolation": "LINEAR",
+                    "output": 3
+                }
+            ]
+        }
+    ],
+    "accessors": [
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 9,
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 1,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 9,
+            "type": "VEC4"
+        },
+        {
+            "bufferView": 2,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 9,
+            "type": "SCALAR"
+        },
+        {
+            "bufferView": 3,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 9,
+            "type": "VEC4"
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 36
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 36,
+            "byteLength": 192
+        },
+        {
+            "buffer": 1,
+            "byteOffset": 0,
+            "byteLength": 36
+        },
+        {
+            "buffer": 2,
+            "byteOffset": 36,
+            "byteLength": 192
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 228,
+            "uri": "animation-patching-fixed.bin"
+        },
+        {
+            "byteLength": 228,
+            "uri": "/nonexistent1.bin"
+        },
+        {
+            "byteLength": 228,
+            "uri": "/nonexistent2.bin"
+        }
+    ],
+    "nodes": [
+        {}
+    ]
+}

src/MagnumPlugins/CgltfImporter/Test/mesh-indices-buffer-notfound.gltf

@@ -0,0 +1,37 @@
+{
+    "asset": {
+        "version": "2.0"
+    },
+    "meshes": [
+        {
+            "name": "indices buffer not found",
+            "primitives": [
+                {
+                    "attributes": {},
+                    "indices": 0
+                }
+            ]
+        }
+    ],
+    "accessors": [
+        {
+            "bufferView": 0,
+            "componentType": 5121,
+            "count": 3,
+            "type": "SCALAR"
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 3
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 160,
+            "uri": "/nonexistent.bin"
+        }
+    ]
+}

src/MagnumPlugins/CgltfImporter/Test/skin-buffer-notfound.gltf

@@ -0,0 +1,38 @@
+{
+    "asset": {
+        "version": "2.0"
+    },
+    "nodes": [
+        {},
+        {}
+    ],
+    "skins": [
+        {
+            "name": "buffer not found",
+            "inverseBindMatrices": 0,
+            "joints": [0, 1]
+        }
+    ],
+    "accessors": [
+        {
+            "bufferView": 0,
+            "byteOffset": 0,
+            "componentType": 5126,
+            "count": 2,
+            "type": "MAT4"
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 192
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 192,
+            "uri": "/nonexistent.bin"
+        }
+    ]
+}