diff --git a/src/Magnum/Trade/Test/SceneDataTest.cpp b/src/Magnum/Trade/Test/SceneDataTest.cpp index f3f093b4f..220e42335 100644 --- a/src/Magnum/Trade/Test/SceneDataTest.cpp +++ b/src/Magnum/Trade/Test/SceneDataTest.cpp @@ -2001,23 +2001,23 @@ void SceneDataTest::construct() { CORRADE_COMPARE(scene.field(0).size(), 5); CORRADE_COMPARE(scene.field(1).size(), 5); CORRADE_COMPARE(scene.field(2).size(), 2); - CORRADE_COMPARE(scene.field(3).size()[0], 2); - CORRADE_COMPARE(scene.field(3).size()[1], 2); + CORRADE_COMPARE(scene.field(3).size(), (Containers::Size2D{2, 2})); CORRADE_COMPARE(scene.mutableField(0).size(), 5); CORRADE_COMPARE(scene.mutableField(1).size(), 5); CORRADE_COMPARE(scene.mutableField(2).size(), 2); - CORRADE_COMPARE(scene.mutableField(3).size()[0], 2); - CORRADE_COMPARE(scene.mutableField(3).size()[1], 2); + CORRADE_COMPARE(scene.mutableField(3).size(), (Containers::Size2D{2, 2})); CORRADE_COMPARE(scene.field(0)[2], Matrix4::translation(Vector3::zAxis(5.0f))); CORRADE_COMPARE(scene.field(1)[4], -1); CORRADE_COMPARE(scene.field(2)[1], 7); - CORRADE_COMPARE(scene.field(3)[0][0], 37.5f); - CORRADE_COMPARE(scene.field(3)[0][1], 1.5f); + CORRADE_COMPARE_AS(scene.field(3)[0], + Containers::arrayView({37.5f, 1.5f}), + TestSuite::Compare::Container); CORRADE_COMPARE(scene.mutableField(0)[2], Matrix4::translation(Vector3::zAxis(5.0f))); CORRADE_COMPARE(scene.mutableField(1)[4], -1); CORRADE_COMPARE(scene.mutableField(2)[1], 7); - CORRADE_COMPARE(scene.mutableField(3)[0][0], 37.5f); - CORRADE_COMPARE(scene.mutableField(3)[0][1], 1.5f); + CORRADE_COMPARE_AS(scene.mutableField(3)[0], + Containers::stridedArrayView({37.5f, 1.5f}), + TestSuite::Compare::Container); /* Field property access by name */ CORRADE_COMPARE(scene.fieldFlags(SceneField::Transformation), SceneFieldFlags{}); @@ -2095,23 +2095,23 @@ void SceneDataTest::construct() { CORRADE_COMPARE(scene.field(SceneField::Transformation).size(), 5); CORRADE_COMPARE(scene.field(SceneField::Parent).size(), 5); CORRADE_COMPARE(scene.field(SceneField::Mesh).size(), 2); - CORRADE_COMPARE(scene.field(sceneFieldCustom(37)).size()[0], 2); - CORRADE_COMPARE(scene.field(sceneFieldCustom(37)).size()[1], 2); + CORRADE_COMPARE(scene.field(sceneFieldCustom(37)).size(), (Containers::Size2D{2, 2})); CORRADE_COMPARE(scene.mutableField(SceneField::Transformation).size(), 5); CORRADE_COMPARE(scene.mutableField(SceneField::Parent).size(), 5); CORRADE_COMPARE(scene.mutableField(SceneField::Mesh).size(), 2); - CORRADE_COMPARE(scene.mutableField(sceneFieldCustom(37)).size()[0], 2); - CORRADE_COMPARE(scene.mutableField(sceneFieldCustom(37)).size()[1], 2); + CORRADE_COMPARE(scene.mutableField(sceneFieldCustom(37)).size(), (Containers::Size2D{2, 2})); CORRADE_COMPARE(scene.field(SceneField::Transformation)[2], Matrix4::translation(Vector3::zAxis(5.0f))); CORRADE_COMPARE(scene.field(SceneField::Parent)[4], -1); CORRADE_COMPARE(scene.field(SceneField::Mesh)[1], 7); - CORRADE_COMPARE(scene.field(sceneFieldCustom(37))[0][0], 37.5f); - CORRADE_COMPARE(scene.field(sceneFieldCustom(37))[0][1], 1.5f); + CORRADE_COMPARE_AS(scene.field(sceneFieldCustom(37))[0], + Containers::arrayView({37.5f, 1.5f}), + TestSuite::Compare::Container); CORRADE_COMPARE(scene.mutableField(SceneField::Transformation)[2], Matrix4::translation(Vector3::zAxis(5.0f))); CORRADE_COMPARE(scene.mutableField(SceneField::Parent)[4], -1); CORRADE_COMPARE(scene.mutableField(SceneField::Mesh)[1], 7); - CORRADE_COMPARE(scene.mutableField(sceneFieldCustom(37))[0][0], 37.5f); - CORRADE_COMPARE(scene.mutableField(sceneFieldCustom(37))[0][1], 1.5f); + CORRADE_COMPARE_AS(scene.mutableField(sceneFieldCustom(37))[0], + Containers::stridedArrayView({37.5f, 1.5f}), + TestSuite::Compare::Container); } void SceneDataTest::constructZeroFields() {