tests: improve more tests

diff --git a/tests/check/elements/autodetect.c b/tests/check/elements/autodetect.c
index 95f02c1..03a7ee9 100644 (file)
--- a/tests/check/elements/autodetect.c
+++ b/tests/check/elements/autodetect.c
@@ -84,7 +84,7 @@ GST_START_TEST (test_autoaudiosink_ghostpad_error_case)
   filter = gst_element_factory_make ("capsfilter", NULL);
   sink = gst_element_factory_make ("autoaudiosink", NULL);
 
-  caps = gst_caps_new_simple ("audio/x-raw-int", "width", G_TYPE_INT, 42, NULL);
+  caps = gst_caps_new_simple ("audio/x-raw", "width", G_TYPE_INT, 42, NULL);
 
   g_object_set (filter, "caps", caps, NULL);
   gst_caps_unref (caps);

diff --git a/tests/check/elements/videocrop.c b/tests/check/elements/videocrop.c
index 101835e..8e60adc 100644 (file)
--- a/tests/check/elements/videocrop.c
+++ b/tests/check/elements/videocrop.c
@@ -395,43 +395,40 @@ GST_START_TEST (test_cropping)
     s = gst_caps_get_structure (caps, 0);
     fail_unless (s != NULL);
 
-    /* videotestsrc does not support this format, so ignore it */
-    if (!g_str_equal (gst_structure_get_name (s), "video/x-raw-gray")) {
-      GST_INFO ("testing format: %" GST_PTR_FORMAT, caps);
-
-      for (i = 0; i < G_N_ELEMENTS (sizes_to_try); ++i) {
-        GstCaps *in_caps;
-
-        GST_INFO (" - %d x %d", sizes_to_try[i].width, sizes_to_try[i].height);
-
-        gst_structure_set (s, "width", G_TYPE_INT, sizes_to_try[i].width,
-            "height", G_TYPE_INT, sizes_to_try[i].height, NULL);
-        in_caps = gst_caps_copy (caps);
-
-        videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 1, 0, 0, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 1, 0, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 0, 1, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 1, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 63, 0, 0, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 63, 0, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 0, 63, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 63, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 63, 0, 0, 1, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 63, 1, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 1, 63, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 1, 0, 0, 63, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 32, 0, 0, 128, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 32, 128, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 0, 128, 32, 0, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 128, 0, 0, 32, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 1, 1, 1, 1, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 63, 63, 63, 63, NULL);
-        videocrop_test_cropping (&ctx, in_caps, 64, 64, 64, 64, NULL);
-
-        gst_caps_unref (in_caps);
-      }
+    GST_INFO ("testing format: %" GST_PTR_FORMAT, caps);
+
+    for (i = 0; i < G_N_ELEMENTS (sizes_to_try); ++i) {
+      GstCaps *in_caps;
+
+      GST_INFO (" - %d x %d", sizes_to_try[i].width, sizes_to_try[i].height);
+
+      gst_structure_set (s, "width", G_TYPE_INT, sizes_to_try[i].width,
+          "height", G_TYPE_INT, sizes_to_try[i].height, NULL);
+      in_caps = gst_caps_copy (caps);
+
+      videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 1, 0, 0, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 1, 0, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 0, 1, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 1, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 63, 0, 0, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 63, 0, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 0, 63, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 63, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 63, 0, 0, 1, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 63, 1, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 1, 63, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 1, 0, 0, 63, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 0, 0, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 32, 0, 0, 128, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 32, 128, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 0, 128, 32, 0, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 128, 0, 0, 32, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 1, 1, 1, 1, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 63, 63, 63, 63, NULL);
+      videocrop_test_cropping (&ctx, in_caps, 64, 64, 64, 64, NULL);
+
+      gst_caps_unref (in_caps);
     }
 
     gst_caps_unref (caps);