Add test data as resources which enables all tests on Android

Also, move the test data to "data" folder as a pass by.

Pick-to: 6.2 6.3
Task-number: QTBUG-88846
Change-Id: I5843afe8ed7b886f32bbe8de843bda04afaf3b6f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

61 files changed, 88 insertions, 11 deletions

diff --git a/tests/auto/bodymovin/shape/ellipse/CMakeLists.txt b/tests/auto/bodymovin/shape/ellipse/CMakeLists.txt
index 85ccec0..d09841d 100644
--- a/tests/auto/bodymovin/shape/ellipse/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/ellipse/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_ellipse
     SOURCES
         tst_bmellipse.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_ellipse
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/ellipse/ellipse_animated_100x80at00to200x40at50100.json b/tests/auto/bodymovin/shape/ellipse/data/ellipse_animated_100x80at00to200x40at50100.json
index 3883853..3883853 100644
--- a/tests/auto/bodymovin/shape/ellipse/ellipse_animated_100x80at00to200x40at50100.json
+++ b/tests/auto/bodymovin/shape/ellipse/data/ellipse_animated_100x80at00to200x40at50100.json
diff --git a/tests/auto/bodymovin/shape/ellipse/ellipse_direction.json b/tests/auto/bodymovin/shape/ellipse/data/ellipse_direction.json
index 48faacc..48faacc 100644
--- a/tests/auto/bodymovin/shape/ellipse/ellipse_direction.json
+++ b/tests/auto/bodymovin/shape/ellipse/data/ellipse_direction.json
diff --git a/tests/auto/bodymovin/shape/ellipse/ellipse_hidden.json b/tests/auto/bodymovin/shape/ellipse/data/ellipse_hidden.json
index 9463cb6..9463cb6 100644
--- a/tests/auto/bodymovin/shape/ellipse/ellipse_hidden.json
+++ b/tests/auto/bodymovin/shape/ellipse/data/ellipse_hidden.json
diff --git a/tests/auto/bodymovin/shape/ellipse/ellipse_static_100x80.json b/tests/auto/bodymovin/shape/ellipse/data/ellipse_static_100x80.json
index 9158d27..9158d27 100644
--- a/tests/auto/bodymovin/shape/ellipse/ellipse_static_100x80.json
+++ b/tests/auto/bodymovin/shape/ellipse/data/ellipse_static_100x80.json
diff --git a/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp b/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp
index c8dd644..021adde 100644
--- a/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp
+++ b/tests/auto/bodymovin/shape/ellipse/tst_bmellipse.cpp
@@ -268,7 +268,7 @@ void tst_BMEllipse::loadTestData(const QByteArray &filename)
         m_ellipse = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/fill/CMakeLists.txt b/tests/auto/bodymovin/shape/fill/CMakeLists.txt
index 4aebb0a..6d7277f 100644
--- a/tests/auto/bodymovin/shape/fill/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/fill/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_fill
     SOURCES
         tst_bmfill.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_fill
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/fill/fill_animated_red100_green0.json b/tests/auto/bodymovin/shape/fill/data/fill_animated_red100_green0.json
index 0175b95..0175b95 100644
--- a/tests/auto/bodymovin/shape/fill/fill_animated_red100_green0.json
+++ b/tests/auto/bodymovin/shape/fill/data/fill_animated_red100_green0.json
diff --git a/tests/auto/bodymovin/shape/fill/fill_hidden.json b/tests/auto/bodymovin/shape/fill/data/fill_hidden.json
index ab7c5da..ab7c5da 100644
--- a/tests/auto/bodymovin/shape/fill/fill_hidden.json
+++ b/tests/auto/bodymovin/shape/fill/data/fill_hidden.json
diff --git a/tests/auto/bodymovin/shape/fill/fill_static_red_100.json b/tests/auto/bodymovin/shape/fill/data/fill_static_red_100.json
index 2583b5e..2583b5e 100644
--- a/tests/auto/bodymovin/shape/fill/fill_static_red_100.json
+++ b/tests/auto/bodymovin/shape/fill/data/fill_static_red_100.json
diff --git a/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp b/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp
index 4ea557e..70a86d7 100644
--- a/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp
+++ b/tests/auto/bodymovin/shape/fill/tst_bmfill.cpp
@@ -189,7 +189,7 @@ void tst_BMFill::loadTestData(const QByteArray &filename)
         m_fill = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/path/CMakeLists.txt b/tests/auto/bodymovin/shape/path/CMakeLists.txt
index fa926e9..956c590 100644
--- a/tests/auto/bodymovin/shape/path/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/path/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_path
     SOURCES
         tst_bmpath.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_path
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/path/freeform_curve_animated.json b/tests/auto/bodymovin/shape/path/data/freeform_curve_animated.json
index 619ef39..619ef39 100644
--- a/tests/auto/bodymovin/shape/path/freeform_curve_animated.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_curve_animated.json
diff --git a/tests/auto/bodymovin/shape/path/freeform_curve_static.json b/tests/auto/bodymovin/shape/path/data/freeform_curve_static.json
index d313686..d313686 100644
--- a/tests/auto/bodymovin/shape/path/freeform_curve_static.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_curve_static.json
diff --git a/tests/auto/bodymovin/shape/path/freeform_direction.json b/tests/auto/bodymovin/shape/path/data/freeform_direction.json
index f0503c2..f0503c2 100644
--- a/tests/auto/bodymovin/shape/path/freeform_direction.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_direction.json
diff --git a/tests/auto/bodymovin/shape/path/freeform_hidden.json b/tests/auto/bodymovin/shape/path/data/freeform_hidden.json
index f11376a..f11376a 100644
--- a/tests/auto/bodymovin/shape/path/freeform_hidden.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_hidden.json
diff --git a/tests/auto/bodymovin/shape/path/freeform_roto_animated.json b/tests/auto/bodymovin/shape/path/data/freeform_roto_animated.json
index 0aa14ea..0aa14ea 100644
--- a/tests/auto/bodymovin/shape/path/freeform_roto_animated.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_roto_animated.json
diff --git a/tests/auto/bodymovin/shape/path/freeform_roto_static.json b/tests/auto/bodymovin/shape/path/data/freeform_roto_static.json
index 94d394a..94d394a 100644
--- a/tests/auto/bodymovin/shape/path/freeform_roto_static.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_roto_static.json
diff --git a/tests/auto/bodymovin/shape/path/freeform_triangle_animated.json b/tests/auto/bodymovin/shape/path/data/freeform_triangle_animated.json
index 595eaf6..595eaf6 100644
--- a/tests/auto/bodymovin/shape/path/freeform_triangle_animated.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_triangle_animated.json
diff --git a/tests/auto/bodymovin/shape/path/freeform_triangle_static.json b/tests/auto/bodymovin/shape/path/data/freeform_triangle_static.json
index c35c27c..c35c27c 100644
--- a/tests/auto/bodymovin/shape/path/freeform_triangle_static.json
+++ b/tests/auto/bodymovin/shape/path/data/freeform_triangle_static.json
diff --git a/tests/auto/bodymovin/shape/path/tst_bmpath.cpp b/tests/auto/bodymovin/shape/path/tst_bmpath.cpp
index 47f6e7c..b029e24 100644
--- a/tests/auto/bodymovin/shape/path/tst_bmpath.cpp
+++ b/tests/auto/bodymovin/shape/path/tst_bmpath.cpp
@@ -1117,7 +1117,7 @@ void tst_BMPath::loadTestData(const QByteArray &filename)
         m_path = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/rect/CMakeLists.txt b/tests/auto/bodymovin/shape/rect/CMakeLists.txt
index ba5cadb..aa85034 100644
--- a/tests/auto/bodymovin/shape/rect/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/rect/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_rect
     SOURCES
         tst_bmrect.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_rect
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/rect/rect_animated_30x30_1515_rad0_to_50x50_7575_rad25.json b/tests/auto/bodymovin/shape/rect/data/rect_animated_30x30_1515_rad0_to_50x50_7575_rad25.json
index c2fc75e..c2fc75e 100644
--- a/tests/auto/bodymovin/shape/rect/rect_animated_30x30_1515_rad0_to_50x50_7575_rad25.json
+++ b/tests/auto/bodymovin/shape/rect/data/rect_animated_30x30_1515_rad0_to_50x50_7575_rad25.json
diff --git a/tests/auto/bodymovin/shape/rect/rect_direction.json b/tests/auto/bodymovin/shape/rect/data/rect_direction.json
index 102834a..102834a 100644
--- a/tests/auto/bodymovin/shape/rect/rect_direction.json
+++ b/tests/auto/bodymovin/shape/rect/data/rect_direction.json
diff --git a/tests/auto/bodymovin/shape/rect/rect_hidden.json b/tests/auto/bodymovin/shape/rect/data/rect_hidden.json
index 902190d..902190d 100644
--- a/tests/auto/bodymovin/shape/rect/rect_hidden.json
+++ b/tests/auto/bodymovin/shape/rect/data/rect_hidden.json
diff --git a/tests/auto/bodymovin/shape/rect/rect_static_30x30_5050_rad0.json b/tests/auto/bodymovin/shape/rect/data/rect_static_30x30_5050_rad0.json
index 58d82cf..58d82cf 100644
--- a/tests/auto/bodymovin/shape/rect/rect_static_30x30_5050_rad0.json
+++ b/tests/auto/bodymovin/shape/rect/data/rect_static_30x30_5050_rad0.json
diff --git a/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp b/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp
index abec892..6efccda 100644
--- a/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp
+++ b/tests/auto/bodymovin/shape/rect/tst_bmrect.cpp
@@ -302,7 +302,7 @@ void tst_BMRect::loadTestData(const QByteArray &filename)
         m_rect = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/repeater/CMakeLists.txt b/tests/auto/bodymovin/shape/repeater/CMakeLists.txt
index 3185737..4d387f4 100644
--- a/tests/auto/bodymovin/shape/repeater/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/repeater/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_repeater
     SOURCES
         tst_bmrepeater.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_repeater
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/repeater/repeater_animated.json b/tests/auto/bodymovin/shape/repeater/data/repeater_animated.json
index 70a6378..70a6378 100644
--- a/tests/auto/bodymovin/shape/repeater/repeater_animated.json
+++ b/tests/auto/bodymovin/shape/repeater/data/repeater_animated.json
diff --git a/tests/auto/bodymovin/shape/repeater/repeater_hidden.json b/tests/auto/bodymovin/shape/repeater/data/repeater_hidden.json
index c5ee464..c5ee464 100644
--- a/tests/auto/bodymovin/shape/repeater/repeater_hidden.json
+++ b/tests/auto/bodymovin/shape/repeater/data/repeater_hidden.json
diff --git a/tests/auto/bodymovin/shape/repeater/repeater_static.json b/tests/auto/bodymovin/shape/repeater/data/repeater_static.json
index a7f5067..a7f5067 100644
--- a/tests/auto/bodymovin/shape/repeater/repeater_static.json
+++ b/tests/auto/bodymovin/shape/repeater/data/repeater_static.json
diff --git a/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp b/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp
index bbb49cb..98d8228 100644
--- a/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp
+++ b/tests/auto/bodymovin/shape/repeater/tst_bmrepeater.cpp
@@ -184,7 +184,7 @@ void tst_BMRepeater::loadTestData(const QByteArray &filename)
         m_repeater = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/repeatertransform/CMakeLists.txt b/tests/auto/bodymovin/shape/repeatertransform/CMakeLists.txt
index a50f3c8..85f7856 100644
--- a/tests/auto/bodymovin/shape/repeatertransform/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/repeatertransform/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_repeatertransform
     SOURCES
         tst_bmrepeatertransform.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_repeatertransform
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/repeatertransform/repeater_transform_animated.json b/tests/auto/bodymovin/shape/repeatertransform/data/repeater_transform_animated.json
index ddaf233..ddaf233 100644
--- a/tests/auto/bodymovin/shape/repeatertransform/repeater_transform_animated.json
+++ b/tests/auto/bodymovin/shape/repeatertransform/data/repeater_transform_animated.json
diff --git a/tests/auto/bodymovin/shape/repeatertransform/repeater_transform_static.json b/tests/auto/bodymovin/shape/repeatertransform/data/repeater_transform_static.json
index 87d9206..87d9206 100644
--- a/tests/auto/bodymovin/shape/repeatertransform/repeater_transform_static.json
+++ b/tests/auto/bodymovin/shape/repeatertransform/data/repeater_transform_static.json
diff --git a/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp b/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp
index fb0ef52..e6f2e41 100644
--- a/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp
+++ b/tests/auto/bodymovin/shape/repeatertransform/tst_bmrepeatertransform.cpp
@@ -413,7 +413,7 @@ void tst_BMRepeaterTransform::loadTestData(const QByteArray &filename)
         m_transform = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/shapelayer/CMakeLists.txt b/tests/auto/bodymovin/shape/shapelayer/CMakeLists.txt
index 34543ce..7474c08 100644
--- a/tests/auto/bodymovin/shape/shapelayer/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/shapelayer/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_shapelayer
     SOURCES
         tst_bmshapelayer.cpp
@@ -5,4 +11,5 @@ qt_internal_add_test(tst_shapelayer
         Qt::Gui
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/shapelayer/shape_active_60to120.json b/tests/auto/bodymovin/shape/shapelayer/data/shape_active_60to120.json
index 8d1da56..8d1da56 100644
--- a/tests/auto/bodymovin/shape/shapelayer/shape_active_60to120.json
+++ b/tests/auto/bodymovin/shape/shapelayer/data/shape_active_60to120.json
diff --git a/tests/auto/bodymovin/shape/shapelayer/shape_mask_alphaclip.json b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_alphaclip.json
index bd913ae..bd913ae 100644
--- a/tests/auto/bodymovin/shape/shapelayer/shape_mask_alphaclip.json
+++ b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_alphaclip.json
diff --git a/tests/auto/bodymovin/shape/shapelayer/shape_mask_alphainvclip.json b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_alphainvclip.json
index d5854e9..d5854e9 100644
--- a/tests/auto/bodymovin/shape/shapelayer/shape_mask_alphainvclip.json
+++ b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_alphainvclip.json
diff --git a/tests/auto/bodymovin/shape/shapelayer/shape_mask_lumaclip.json b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_lumaclip.json
index 706fbea..706fbea 100644
--- a/tests/auto/bodymovin/shape/shapelayer/shape_mask_lumaclip.json
+++ b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_lumaclip.json
diff --git a/tests/auto/bodymovin/shape/shapelayer/shape_mask_lumainvclip.json b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_lumainvclip.json
index a4faa7d..a4faa7d 100644
--- a/tests/auto/bodymovin/shape/shapelayer/shape_mask_lumainvclip.json
+++ b/tests/auto/bodymovin/shape/shapelayer/data/shape_mask_lumainvclip.json
diff --git a/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp b/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp
index 0099b41..6454ab7 100644
--- a/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp
+++ b/tests/auto/bodymovin/shape/shapelayer/tst_bmshapelayer.cpp
@@ -157,7 +157,7 @@ void tst_BMShapeLayer::loadTestData(const QByteArray &filename)
         m_layer = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/shapetransform/CMakeLists.txt b/tests/auto/bodymovin/shape/shapetransform/CMakeLists.txt
index f0676ea..5346afd 100644
--- a/tests/auto/bodymovin/shape/shapetransform/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/shapetransform/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_shapetransform
     SOURCES
         tst_bmshapetransform.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_shapetransform
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/shapetransform/shapetransform_animated.json b/tests/auto/bodymovin/shape/shapetransform/data/shapetransform_animated.json
index ed650bf..ed650bf 100644
--- a/tests/auto/bodymovin/shape/shapetransform/shapetransform_animated.json
+++ b/tests/auto/bodymovin/shape/shapetransform/data/shapetransform_animated.json
diff --git a/tests/auto/bodymovin/shape/shapetransform/shapetransform_static.json b/tests/auto/bodymovin/shape/shapetransform/data/shapetransform_static.json
index 5d60293..5d60293 100644
--- a/tests/auto/bodymovin/shape/shapetransform/shapetransform_static.json
+++ b/tests/auto/bodymovin/shape/shapetransform/data/shapetransform_static.json
diff --git a/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp b/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp
index bd4ebb5..3fbe5f8 100644
--- a/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp
+++ b/tests/auto/bodymovin/shape/shapetransform/tst_bmshapetransform.cpp
@@ -463,7 +463,7 @@ void tst_BMShapeTransform::loadTestData(const QByteArray &filename)
         m_transform = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/stroke/CMakeLists.txt b/tests/auto/bodymovin/shape/stroke/CMakeLists.txt
index ecf5cc2..2119488 100644
--- a/tests/auto/bodymovin/shape/stroke/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/stroke/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_stroke
     SOURCES
         tst_bmstroke.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_stroke
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/stroke/stroke_animated_blue5_white1.json b/tests/auto/bodymovin/shape/stroke/data/stroke_animated_blue5_white1.json
index b9f3445..b9f3445 100644
--- a/tests/auto/bodymovin/shape/stroke/stroke_animated_blue5_white1.json
+++ b/tests/auto/bodymovin/shape/stroke/data/stroke_animated_blue5_white1.json
diff --git a/tests/auto/bodymovin/shape/stroke/stroke_hidden.json b/tests/auto/bodymovin/shape/stroke/data/stroke_hidden.json
index d49699d..d49699d 100644
--- a/tests/auto/bodymovin/shape/stroke/stroke_hidden.json
+++ b/tests/auto/bodymovin/shape/stroke/data/stroke_hidden.json
diff --git a/tests/auto/bodymovin/shape/stroke/stroke_static_blue_2.json b/tests/auto/bodymovin/shape/stroke/data/stroke_static_blue_2.json
index f8ff748..f8ff748 100644
--- a/tests/auto/bodymovin/shape/stroke/stroke_static_blue_2.json
+++ b/tests/auto/bodymovin/shape/stroke/data/stroke_static_blue_2.json
diff --git a/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp b/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp
index c32284a..faa036f 100644
--- a/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp
+++ b/tests/auto/bodymovin/shape/stroke/tst_bmstroke.cpp
@@ -302,7 +302,7 @@ void tst_BMStroke::loadTestData(const QByteArray &filename)
         m_stroke = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/transform/CMakeLists.txt b/tests/auto/bodymovin/shape/transform/CMakeLists.txt
index 9285982..461a0ef 100644
--- a/tests/auto/bodymovin/shape/transform/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/transform/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_bodymovin_transform
     SOURCES
         tst_bmbasictransform.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_bodymovin_transform
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/transform/transform_animated.json b/tests/auto/bodymovin/shape/transform/data/transform_animated.json
index c06f5e3..c06f5e3 100644
--- a/tests/auto/bodymovin/shape/transform/transform_animated.json
+++ b/tests/auto/bodymovin/shape/transform/data/transform_animated.json
diff --git a/tests/auto/bodymovin/shape/transform/transform_static.json b/tests/auto/bodymovin/shape/transform/data/transform_static.json
index d1d7edf..d1d7edf 100644
--- a/tests/auto/bodymovin/shape/transform/transform_static.json
+++ b/tests/auto/bodymovin/shape/transform/data/transform_static.json
diff --git a/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp b/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp
index d29501c..912dbe1 100644
--- a/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp
+++ b/tests/auto/bodymovin/shape/transform/tst_bmbasictransform.cpp
@@ -377,7 +377,7 @@ void tst_BMBasicTransform::loadTestData(const QByteArray &filename)
         m_transform = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))
diff --git a/tests/auto/bodymovin/shape/trimpath/CMakeLists.txt b/tests/auto/bodymovin/shape/trimpath/CMakeLists.txt
index 825dd55..7a50bf0 100644
--- a/tests/auto/bodymovin/shape/trimpath/CMakeLists.txt
+++ b/tests/auto/bodymovin/shape/trimpath/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    data/*)
+list(APPEND test_data ${test_data_glob})
+
 qt_internal_add_test(tst_trimpath
     SOURCES
         tst_bmtrimpath.cpp
@@ -6,4 +12,5 @@ qt_internal_add_test(tst_trimpath
         Qt::GuiPrivate
         Qt::Test
         Qt::BodymovinPrivate
+    TESTDATA ${test_data}
 )
diff --git a/tests/auto/bodymovin/shape/trimpath/trimpath_animated_2080_0_to_0060_3x30.json b/tests/auto/bodymovin/shape/trimpath/data/trimpath_animated_2080_0_to_0060_3x30.json
index 2532123..2532123 100644
--- a/tests/auto/bodymovin/shape/trimpath/trimpath_animated_2080_0_to_0060_3x30.json
+++ b/tests/auto/bodymovin/shape/trimpath/data/trimpath_animated_2080_0_to_0060_3x30.json
diff --git a/tests/auto/bodymovin/shape/trimpath/trimpath_hidden.json b/tests/auto/bodymovin/shape/trimpath/data/trimpath_hidden.json
index 7689dcc..7689dcc 100644
--- a/tests/auto/bodymovin/shape/trimpath/trimpath_hidden.json
+++ b/tests/auto/bodymovin/shape/trimpath/data/trimpath_hidden.json
diff --git a/tests/auto/bodymovin/shape/trimpath/trimpath_static_20to80.json b/tests/auto/bodymovin/shape/trimpath/data/trimpath_static_20to80.json
index bb7ac08..bb7ac08 100644
--- a/tests/auto/bodymovin/shape/trimpath/trimpath_static_20to80.json
+++ b/tests/auto/bodymovin/shape/trimpath/data/trimpath_static_20to80.json
diff --git a/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp b/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp
index 6210c09..dcab10e 100644
--- a/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp
+++ b/tests/auto/bodymovin/shape/trimpath/tst_bmtrimpath.cpp
@@ -264,7 +264,7 @@ void tst_BMTrimPath::loadTestData(const QByteArray &filename)
         m_trimpath = nullptr;
     }
 
-    QFile sourceFile(QFINDTESTDATA(filename.constData()));
+    QFile sourceFile(QFINDTESTDATA(QLatin1String("data/") + filename));
     if (!sourceFile.exists())
         QFAIL("File does not exist");
     if (!sourceFile.open(QIODevice::ReadOnly))