tests: Cleanup test files handling

diff --git a/tests/check/assets/audio_only.ogg b/tests/check/assets/audio_only.ogg
new file mode 100644 (file)
index 0000000..6baf007
Binary files /dev/null and b/tests/check/assets/audio_only.ogg differ

diff --git a/tests/check/assets/audio_video.ogg b/tests/check/assets/audio_video.ogg
new file mode 100644 (file)
index 0000000..8d7b538
Binary files /dev/null and b/tests/check/assets/audio_video.ogg differ

diff --git a/tests/check/assets/image.png b/tests/check/assets/image.png
new file mode 100644 (file)
index 0000000..9dfd5b2
Binary files /dev/null and b/tests/check/assets/image.png differ

diff --git a/tests/check/assets/test-auto-transition.xges b/tests/check/assets/test-auto-transition.xges
new file mode 100644 (file)
index 0000000..5f7734e
--- /dev/null
+++ b/tests/check/assets/test-auto-transition.xges
@@ -0,0 +1,28 @@
+<ges version="0.1">
+  <project metadatas='metadatas, name=(string)&quot;Example\ project&quot;;'>
+    <encoding-profiles>
+      <encoding-profile name='first_profile' description='(null)' type='container' format='application/ogg'>
+        <stream-profile parent='first_profile' id='0' type='video' presence='0' format='video/x-h264' pass='0' variableframerate='0' />
+        <stream-profile parent='first_profile' id='1' type='audio' presence='0' format='audio/x-aac' />
+      </encoding-profile>
+    </encoding-profiles>
+    <resources>
+      <asset id="file:///test/not/exisiting"
+         extractable-type-name="GESUriClip"/>
+    </resources>
+    <timeline properties='properties, auto-transition=(boolean)false'>
+      <track track-type="2" caps="audio/x-raw" track-id="0"/>
+      <track track-type="4" caps="video/x-raw" track-id="1"/>
+      <layer priority="0" properties='properties, auto-transition=(boolean)false;' metadatas='metadatas, a=(guint)3'>
+        <clip id="0" layer-priority='0' asset-id="file:///test/not/exisiting" type-name="GESUriClip" track-types="6" start="0" duration="1000000000">
+        <effect asset-id='agingtv' clip-id='0' type-name='GESEffect' track-type='4' track-id='1' metadatas='metadatas;' children-properties='properties, scratch-lines=(uint)12;'/>
+        </clip>
+      </layer>
+      <layer priority="1" properties='properties, auto-transition=(boolean)false;'>
+        <clip id="1" asset-id="file:///test/not/exisiting" layer-priority="1"
+        type-name="GESUriClip" track-types="2" start="1000000000" duration="1000000000">
+        </clip>
+      </layer>
+    </timeline>
+  </project>
+</ges>

diff --git a/tests/check/assets/test-project.xges b/tests/check/assets/test-project.xges
new file mode 100644 (file)
index 0000000..acc71ed
--- /dev/null
+++ b/tests/check/assets/test-project.xges
@@ -0,0 +1,28 @@
+<ges version="0.1">
+  <project metadatas='metadatas, name=(string)&quot;Example\ project&quot;;'>
+    <encoding-profiles>
+      <encoding-profile name='first_profile' description='(null)' type='container' format='application/ogg'>
+        <stream-profile parent='first_profile' enabled='0' id='0' type='video' presence='0' format='video/x-h264' pass='0' variableframerate='0' />
+        <stream-profile parent='first_profile' id='1' type='audio' presence='0' format='audio/x-aac' />
+      </encoding-profile>
+    </encoding-profiles>
+    <resources>
+      <asset id="file:///test/not/exisiting"
+         extractable-type-name="GESUriClip"/>
+    </resources>
+    <timeline>
+      <track track-type="2" caps="audio/x-raw" track-id="0"/>
+      <track track-type="4" caps="video/x-raw" track-id="1"/>
+      <layer priority="0" properties='properties, auto-transition=(boolean)true;' metadatas='metadatas, a=(guint)3'>
+        <clip id="0" layer-priority='0' asset-id="file:///test/not/exisiting" type-name="GESUriClip" track-types="6" start="0" duration="1000000000">
+        <effect asset-id='agingtv' clip-id='0' type-name='GESEffect' track-type='4' track-id='1' metadatas='metadatas;' children-properties='properties, scratch-lines=(uint)12;'/>
+        </clip>
+      </layer>
+      <layer priority="1" properties='properties, auto-transition=(boolean)true;'>
+        <clip id="1" asset-id="file:///test/not/exisiting" layer-priority="1"
+        type-name="GESUriClip" track-types="2" start="1000000000" duration="1000000000">
+        </clip>
+      </layer>
+    </timeline>
+  </project>
+</ges>

diff --git a/tests/check/assets/test-properties.xges b/tests/check/assets/test-properties.xges
new file mode 100644 (file)
index 0000000..ff74b63
--- /dev/null
+++ b/tests/check/assets/test-properties.xges
@@ -0,0 +1,23 @@
+<ges version="0.1">
+  <project metadatas='metadatas, name=(string)&quot;Example\ project&quot;;'>
+    <encoding-profiles>
+      <encoding-profile name='first_profile' description='(null)' type='container' format='application/ogg'>
+        <stream-profile parent='first_profile' id='0' type='video' presence='0' format='video/x-h264' pass='0' variableframerate='0' />
+        <stream-profile parent='first_profile' id='1' type='audio' presence='0' format='audio/x-aac' />
+      </encoding-profile>
+    </encoding-profiles>
+    <resources>
+      <asset id="file:///test/not/exisiting"
+         extractable-type-name="GESUriClip"/>
+    </resources>
+    <timeline>
+      <track track-type="2" caps="audio/x-raw" track-id="0"/>
+      <track track-type="4" caps="video/x-raw" track-id="1"/>
+      <layer priority="0" properties='properties, auto-transition=(boolean)true;' metadatas='metadatas, a=(guint)3'>
+        <clip id="0" layer-priority='0' asset-id="file:///test/not/exisiting" type-name="GESUriClip" track-types="6" start="0" duration="1000000000">
+        <effect asset-id='agingtv' clip-id='0' type-name='GESEffect' track-type='4' track-id='1' metadatas='metadatas;' children-properties='properties, scratch-lines=(uint)12;'/>
+        </clip>
+      </layer>
+    </timeline>
+  </project>
+</ges>

diff --git a/tests/check/ges/audio_only.ogg b/tests/check/ges/audio_only.ogg
deleted file mode 100644 (file)
index 6baf007..0000000
Binary files a/tests/check/ges/audio_only.ogg and /dev/null differ

diff --git a/tests/check/ges/audio_video.ogg b/tests/check/ges/audio_video.ogg
deleted file mode 100644 (file)
index 8d7b538..0000000
Binary files a/tests/check/ges/audio_video.ogg and /dev/null differ

diff --git a/tests/check/ges/image.png b/tests/check/ges/image.png
deleted file mode 100644 (file)
index 9dfd5b2..0000000
Binary files a/tests/check/ges/image.png and /dev/null differ

diff --git a/tests/check/ges/test-auto-transition.xges b/tests/check/ges/test-auto-transition.xges
deleted file mode 100644 (file)
index 5f7734e..0000000
--- a/tests/check/ges/test-auto-transition.xges
+++ /dev/null
@@ -1,28 +0,0 @@
-<ges version="0.1">
-  <project metadatas='metadatas, name=(string)&quot;Example\ project&quot;;'>
-    <encoding-profiles>
-      <encoding-profile name='first_profile' description='(null)' type='container' format='application/ogg'>
-        <stream-profile parent='first_profile' id='0' type='video' presence='0' format='video/x-h264' pass='0' variableframerate='0' />
-        <stream-profile parent='first_profile' id='1' type='audio' presence='0' format='audio/x-aac' />
-      </encoding-profile>
-    </encoding-profiles>
-    <resources>
-      <asset id="file:///test/not/exisiting"
-         extractable-type-name="GESUriClip"/>
-    </resources>
-    <timeline properties='properties, auto-transition=(boolean)false'>
-      <track track-type="2" caps="audio/x-raw" track-id="0"/>
-      <track track-type="4" caps="video/x-raw" track-id="1"/>
-      <layer priority="0" properties='properties, auto-transition=(boolean)false;' metadatas='metadatas, a=(guint)3'>
-        <clip id="0" layer-priority='0' asset-id="file:///test/not/exisiting" type-name="GESUriClip" track-types="6" start="0" duration="1000000000">
-        <effect asset-id='agingtv' clip-id='0' type-name='GESEffect' track-type='4' track-id='1' metadatas='metadatas;' children-properties='properties, scratch-lines=(uint)12;'/>
-        </clip>
-      </layer>
-      <layer priority="1" properties='properties, auto-transition=(boolean)false;'>
-        <clip id="1" asset-id="file:///test/not/exisiting" layer-priority="1"
-        type-name="GESUriClip" track-types="2" start="1000000000" duration="1000000000">
-        </clip>
-      </layer>
-    </timeline>
-  </project>
-</ges>

diff --git a/tests/check/ges/test-project.xges b/tests/check/ges/test-project.xges
deleted file mode 100644 (file)
index acc71ed..0000000
--- a/tests/check/ges/test-project.xges
+++ /dev/null
@@ -1,28 +0,0 @@
-<ges version="0.1">
-  <project metadatas='metadatas, name=(string)&quot;Example\ project&quot;;'>
-    <encoding-profiles>
-      <encoding-profile name='first_profile' description='(null)' type='container' format='application/ogg'>
-        <stream-profile parent='first_profile' enabled='0' id='0' type='video' presence='0' format='video/x-h264' pass='0' variableframerate='0' />
-        <stream-profile parent='first_profile' id='1' type='audio' presence='0' format='audio/x-aac' />
-      </encoding-profile>
-    </encoding-profiles>
-    <resources>
-      <asset id="file:///test/not/exisiting"
-         extractable-type-name="GESUriClip"/>
-    </resources>
-    <timeline>
-      <track track-type="2" caps="audio/x-raw" track-id="0"/>
-      <track track-type="4" caps="video/x-raw" track-id="1"/>
-      <layer priority="0" properties='properties, auto-transition=(boolean)true;' metadatas='metadatas, a=(guint)3'>
-        <clip id="0" layer-priority='0' asset-id="file:///test/not/exisiting" type-name="GESUriClip" track-types="6" start="0" duration="1000000000">
-        <effect asset-id='agingtv' clip-id='0' type-name='GESEffect' track-type='4' track-id='1' metadatas='metadatas;' children-properties='properties, scratch-lines=(uint)12;'/>
-        </clip>
-      </layer>
-      <layer priority="1" properties='properties, auto-transition=(boolean)true;'>
-        <clip id="1" asset-id="file:///test/not/exisiting" layer-priority="1"
-        type-name="GESUriClip" track-types="2" start="1000000000" duration="1000000000">
-        </clip>
-      </layer>
-    </timeline>
-  </project>
-</ges>

diff --git a/tests/check/ges/test-properties.xges b/tests/check/ges/test-properties.xges
deleted file mode 100644 (file)
index ff74b63..0000000
--- a/tests/check/ges/test-properties.xges
+++ /dev/null
@@ -1,23 +0,0 @@
-<ges version="0.1">
-  <project metadatas='metadatas, name=(string)&quot;Example\ project&quot;;'>
-    <encoding-profiles>
-      <encoding-profile name='first_profile' description='(null)' type='container' format='application/ogg'>
-        <stream-profile parent='first_profile' id='0' type='video' presence='0' format='video/x-h264' pass='0' variableframerate='0' />
-        <stream-profile parent='first_profile' id='1' type='audio' presence='0' format='audio/x-aac' />
-      </encoding-profile>
-    </encoding-profiles>
-    <resources>
-      <asset id="file:///test/not/exisiting"
-         extractable-type-name="GESUriClip"/>
-    </resources>
-    <timeline>
-      <track track-type="2" caps="audio/x-raw" track-id="0"/>
-      <track track-type="4" caps="video/x-raw" track-id="1"/>
-      <layer priority="0" properties='properties, auto-transition=(boolean)true;' metadatas='metadatas, a=(guint)3'>
-        <clip id="0" layer-priority='0' asset-id="file:///test/not/exisiting" type-name="GESUriClip" track-types="6" start="0" duration="1000000000">
-        <effect asset-id='agingtv' clip-id='0' type-name='GESEffect' track-type='4' track-id='1' metadatas='metadatas;' children-properties='properties, scratch-lines=(uint)12;'/>
-        </clip>
-      </layer>
-    </timeline>
-  </project>
-</ges>

diff --git a/tests/check/ges/test-utils.c b/tests/check/ges/test-utils.c
index 862d4874621d4c05adc73a9a569035b23ae50cf7..fb0589794b92ffd37c9b6d931e1c09c47a68bdde 100644 (file)
--- a/tests/check/ges/test-utils.c
+++ b/tests/check/ges/test-utils.c
@@ -31,20 +31,7 @@ typedef struct _DestroyedObjectStruct
 gchar *
 ges_test_get_audio_only_uri (void)
 {
-  gchar *uri;
-  GFile *cfile, *fdir, *f_audio_only;
-
-  cfile = g_file_new_for_path (__FILE__);
-  fdir = g_file_get_parent (cfile);
-
-  f_audio_only = g_file_get_child (fdir, "audio_only.ogg");
-  uri = g_file_get_uri (f_audio_only);
-
-  gst_object_unref (cfile);
-  gst_object_unref (fdir);
-  gst_object_unref (f_audio_only);
-
-  return uri;
+  return ges_test_file_uri ("audio_only.ogg");
 }
 
 gchar *

diff --git a/tests/check/meson.build b/tests/check/meson.build
index 98d9bc6d70d871212c4d9dd6233ac2f501f347dd..08196ed65fb8066e7ebc0b1a831d2d4f52dcb9f4 100644 (file)
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -28,7 +28,7 @@ ges_tests = [
 test_defines = [
   '-UG_DISABLE_ASSERT',
   '-UG_DISABLE_CAST_CHECKS',
-  '-DGES_TEST_FILES_PATH="' + meson.current_source_dir() + '/ges/"',
+  '-DGES_TEST_FILES_PATH="@0@"'.format(join_paths(meson.current_source_dir(), 'assets')),
   '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
   '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
   '-DGST_USE_UNSTABLE_API',

diff --git a/tests/check/python/test_clip.py b/tests/check/python/test_clip.py
index 31076fc281cc6095f7360ac6f4d7b4ea90c7e37e..058a4a6168cef367bfd6f72df2444e56432c25b9 100644 (file)
--- a/tests/check/python/test_clip.py
+++ b/tests/check/python/test_clip.py
@@ -146,8 +146,7 @@ class TestTitleClip(unittest.TestCase):
 
 class TestUriClip(common.GESSimpleTimelineTest):
     def test_max_duration_on_extract(self):
-        uri = Gst.filename_to_uri(os.path.join(__file__, "../../ges/audio_video.ogg"))
-        asset = GES.UriClipAsset.request_sync(uri)
+        asset = GES.UriClipAsset.request_sync(common.get_asset_uri("audio_video.ogg"))
         clip = asset.extract()
 
         self.assertEqual(clip.props.max_duration, Gst.SECOND)