move two testsuite apps over to the check dir

Original commit message from CVS:

* testsuite/caps/Makefile.am:
* testsuite/caps/value_compare.c:
* testsuite/caps/value_intersect.c:
* check/gst/gstvalue.c: (GST_START_TEST), (gst_value_suite):
move two testsuite apps over to the check dir

diff --git a/ChangeLog b/ChangeLog
index e1eed0c..154f987 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * testsuite/caps/Makefile.am:
+       * testsuite/caps/value_compare.c:
+       * testsuite/caps/value_intersect.c:
+       * check/gst/gstvalue.c: (GST_START_TEST), (gst_value_suite):
+         move two testsuite apps over to the check dir
+
 2005-07-12  Wim Taymans  <wim@fluendo.com>
 
        * gst/base/gstbasetransform.c: (gst_base_transform_setcaps):

diff --git a/check/gst/gstvalue.c b/check/gst/gstvalue.c
index 057fafe..7a6fcdb 100644 (file)
--- a/check/gst/gstvalue.c
+++ b/check/gst/gstvalue.c
@@ -311,6 +311,131 @@ GST_START_TEST (test_deserialize_string)
 
 GST_END_TEST;
 
+GST_START_TEST (test_value_compare)
+{
+  GValue value1 = { 0 };
+  GValue value2 = { 0 };
+
+  g_value_init (&value1, G_TYPE_INT);
+  g_value_set_int (&value1, 10);
+  g_value_init (&value2, G_TYPE_INT);
+  g_value_set_int (&value2, 20);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  g_value_init (&value1, G_TYPE_DOUBLE);
+  g_value_set_double (&value1, 10);
+  g_value_init (&value2, G_TYPE_DOUBLE);
+  g_value_set_double (&value2, 20);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  g_value_init (&value1, G_TYPE_STRING);
+  g_value_set_string (&value1, "a");
+  g_value_init (&value2, G_TYPE_STRING);
+  g_value_set_string (&value2, "b");
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  g_value_init (&value1, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&value1, GST_MAKE_FOURCC ('a', 'b', 'c', 'd'));
+  g_value_init (&value2, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&value2, GST_MAKE_FOURCC ('1', '2', '3', '4'));
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_UNORDERED);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing 2/3 with 3/4 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, 2, 3);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 3, 4);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing -4/5 with 2/-3 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, -4, 5);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 2, -3);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing 10/100 with 200/2000 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, 10, 100);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 200, 2000);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing -4/5 with 2/-3 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, -4, 5);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 2, -3);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_value_intersect)
+{
+  GValue dest = { 0 };
+  GValue src1 = { 0 };
+  GValue src2 = { 0 };
+  GValue item = { 0 };
+  gboolean ret;
+
+  g_value_init (&src1, G_TYPE_INT);
+  g_value_set_int (&src1, 10);
+  g_value_init (&src2, G_TYPE_INT);
+  g_value_set_int (&src1, 20);
+  ret = gst_value_intersect (&dest, &src1, &src2);
+  fail_unless (ret == 0);
+  g_value_unset (&src1);
+  g_value_unset (&src2);
+
+  g_value_init (&src1, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&src1, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
+  g_value_init (&src2, GST_TYPE_LIST);
+  g_value_init (&item, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
+  gst_value_list_append_value (&src2, &item);
+  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('I', '4', '2', '0'));
+  gst_value_list_append_value (&src2, &item);
+  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('A', 'B', 'C', 'D'));
+  gst_value_list_append_value (&src2, &item);
+
+  fail_unless (gst_value_intersect (&dest, &src1, &src2));
+  fail_unless (GST_VALUE_HOLDS_FOURCC (&dest));
+  fail_unless (gst_value_get_fourcc (&dest) ==
+      GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
+}
+
+GST_END_TEST;
+
 Suite *
 gst_value_suite (void)
 {
@@ -326,6 +451,8 @@ gst_value_suite (void)
   tcase_add_test (tc_chain, test_deserialize_gint64);
   tcase_add_test (tc_chain, test_string);
   tcase_add_test (tc_chain, test_deserialize_string);
+  tcase_add_test (tc_chain, test_value_compare);
+  tcase_add_test (tc_chain, test_value_intersect);
   return s;
 }
 

diff --git a/tests/check/gst/gstvalue.c b/tests/check/gst/gstvalue.c
index 057fafe..7a6fcdb 100644 (file)
--- a/tests/check/gst/gstvalue.c
+++ b/tests/check/gst/gstvalue.c
@@ -311,6 +311,131 @@ GST_START_TEST (test_deserialize_string)
 
 GST_END_TEST;
 
+GST_START_TEST (test_value_compare)
+{
+  GValue value1 = { 0 };
+  GValue value2 = { 0 };
+
+  g_value_init (&value1, G_TYPE_INT);
+  g_value_set_int (&value1, 10);
+  g_value_init (&value2, G_TYPE_INT);
+  g_value_set_int (&value2, 20);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  g_value_init (&value1, G_TYPE_DOUBLE);
+  g_value_set_double (&value1, 10);
+  g_value_init (&value2, G_TYPE_DOUBLE);
+  g_value_set_double (&value2, 20);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  g_value_init (&value1, G_TYPE_STRING);
+  g_value_set_string (&value1, "a");
+  g_value_init (&value2, G_TYPE_STRING);
+  g_value_set_string (&value2, "b");
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  g_value_init (&value1, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&value1, GST_MAKE_FOURCC ('a', 'b', 'c', 'd'));
+  g_value_init (&value2, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&value2, GST_MAKE_FOURCC ('1', '2', '3', '4'));
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_UNORDERED);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing 2/3 with 3/4 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, 2, 3);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 3, 4);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing -4/5 with 2/-3 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, -4, 5);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 2, -3);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing 10/100 with 200/2000 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, 10, 100);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 200, 2000);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+
+  /* comparing -4/5 with 2/-3 */
+  g_value_init (&value1, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value1, -4, 5);
+  g_value_init (&value2, GST_TYPE_FRACTION);
+  gst_value_set_fraction (&value2, 2, -3);
+  fail_unless (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
+  fail_unless (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
+  fail_unless (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
+  g_value_unset (&value1);
+  g_value_unset (&value2);
+}
+
+GST_END_TEST;
+
+GST_START_TEST (test_value_intersect)
+{
+  GValue dest = { 0 };
+  GValue src1 = { 0 };
+  GValue src2 = { 0 };
+  GValue item = { 0 };
+  gboolean ret;
+
+  g_value_init (&src1, G_TYPE_INT);
+  g_value_set_int (&src1, 10);
+  g_value_init (&src2, G_TYPE_INT);
+  g_value_set_int (&src1, 20);
+  ret = gst_value_intersect (&dest, &src1, &src2);
+  fail_unless (ret == 0);
+  g_value_unset (&src1);
+  g_value_unset (&src2);
+
+  g_value_init (&src1, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&src1, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
+  g_value_init (&src2, GST_TYPE_LIST);
+  g_value_init (&item, GST_TYPE_FOURCC);
+  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
+  gst_value_list_append_value (&src2, &item);
+  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('I', '4', '2', '0'));
+  gst_value_list_append_value (&src2, &item);
+  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('A', 'B', 'C', 'D'));
+  gst_value_list_append_value (&src2, &item);
+
+  fail_unless (gst_value_intersect (&dest, &src1, &src2));
+  fail_unless (GST_VALUE_HOLDS_FOURCC (&dest));
+  fail_unless (gst_value_get_fourcc (&dest) ==
+      GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
+}
+
+GST_END_TEST;
+
 Suite *
 gst_value_suite (void)
 {
@@ -326,6 +451,8 @@ gst_value_suite (void)
   tcase_add_test (tc_chain, test_deserialize_gint64);
   tcase_add_test (tc_chain, test_string);
   tcase_add_test (tc_chain, test_deserialize_string);
+  tcase_add_test (tc_chain, test_value_compare);
+  tcase_add_test (tc_chain, test_value_intersect);
   return s;
 }
 

diff --git a/tests/old/testsuite/caps/Makefile.am b/tests/old/testsuite/caps/Makefile.am
index 1616323..c5752bf 100644 (file)
--- a/tests/old/testsuite/caps/Makefile.am
+++ b/tests/old/testsuite/caps/Makefile.am
@@ -14,8 +14,6 @@ tests_pass = \
        fraction-multiply-and-zero \
        intersect2 \
        caps \
-       value_compare \
-       value_intersect \
        audioscale \
        filtercaps \
        eratosthenes \

diff --git a/tests/old/testsuite/caps/value_compare.c b/tests/old/testsuite/caps/value_compare.c
deleted file mode 100644 (file)
index e6c5412..0000000
--- a/tests/old/testsuite/caps/value_compare.c
+++ /dev/null
@@ -1,106 +0,0 @@
-
-#include <gst/gst.h>
-#include <glib.h>
-
-void
-test1 (void)
-{
-  GValue value1 = { 0 };
-  GValue value2 = { 0 };
-
-  //GValue value3 = { 0 };
-  //gboolean ret;
-
-  g_value_init (&value1, G_TYPE_INT);
-  g_value_set_int (&value1, 10);
-  g_value_init (&value2, G_TYPE_INT);
-  g_value_set_int (&value2, 20);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  g_value_init (&value1, G_TYPE_DOUBLE);
-  g_value_set_double (&value1, 10);
-  g_value_init (&value2, G_TYPE_DOUBLE);
-  g_value_set_double (&value2, 20);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  g_value_init (&value1, G_TYPE_STRING);
-  g_value_set_string (&value1, "a");
-  g_value_init (&value2, G_TYPE_STRING);
-  g_value_set_string (&value2, "b");
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  g_value_init (&value1, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&value1, GST_MAKE_FOURCC ('a', 'b', 'c', 'd'));
-  g_value_init (&value2, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&value2, GST_MAKE_FOURCC ('1', '2', '3', '4'));
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_UNORDERED);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing 2/3 with 3/4 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, 2, 3);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 3, 4);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing -4/5 with 2/-3 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, -4, 5);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 2, -3);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing 10/100 with 200/2000 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, 10, 100);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 200, 2000);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing -4/5 with 2/-3 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, -4, 5);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 2, -3);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-}
-
-int
-main (int argc, char *argv[])
-{
-
-  gst_init (&argc, &argv);
-
-  test1 ();
-
-  return 0;
-}

diff --git a/tests/old/testsuite/caps/value_intersect.c b/tests/old/testsuite/caps/value_intersect.c
deleted file mode 100644 (file)
index aebd448..0000000
--- a/tests/old/testsuite/caps/value_intersect.c
+++ /dev/null
@@ -1,58 +0,0 @@
-
-#include <gst/gst.h>
-
-void
-test1 (void)
-{
-  GValue dest = { 0 };
-  GValue src1 = { 0 };
-  GValue src2 = { 0 };
-  gboolean ret;
-
-  g_value_init (&src1, G_TYPE_INT);
-  g_value_set_int (&src1, 10);
-  g_value_init (&src2, G_TYPE_INT);
-  g_value_set_int (&src1, 20);
-  ret = gst_value_intersect (&dest, &src1, &src2);
-  g_assert (ret == 0);
-  g_print ("ret = %d\n", ret);
-}
-
-void
-test2 (void)
-{
-  GValue dest = { 0 };
-  GValue src1 = { 0 };
-  GValue src2 = { 0 };
-  GValue item = { 0 };
-  gboolean ret;
-
-  g_value_init (&src1, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&src1, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
-  g_value_init (&src2, GST_TYPE_LIST);
-  g_value_init (&item, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
-  gst_value_list_append_value (&src2, &item);
-  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('I', '4', '2', '0'));
-  gst_value_list_append_value (&src2, &item);
-  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('A', 'B', 'C', 'D'));
-  gst_value_list_append_value (&src2, &item);
-  ret = gst_value_intersect (&dest, &src1, &src2);
-  g_print ("ret = %d\n", ret);
-
-  g_print ("type = %s\n", g_type_name (G_VALUE_TYPE (&dest)));
-  g_print ("value = %s\n", g_strdup_value_contents (&dest));
-}
-
-int
-main (int argc, char *argv[])
-{
-
-  gst_init (&argc, &argv);
-
-  test1 ();
-  test2 ();
-
-  return 0;
-
-}

diff --git a/testsuite/caps/Makefile.am b/testsuite/caps/Makefile.am
index 1616323..c5752bf 100644 (file)
--- a/testsuite/caps/Makefile.am
+++ b/testsuite/caps/Makefile.am
@@ -14,8 +14,6 @@ tests_pass = \
        fraction-multiply-and-zero \
        intersect2 \
        caps \
-       value_compare \
-       value_intersect \
        audioscale \
        filtercaps \
        eratosthenes \

diff --git a/testsuite/caps/value_compare.c b/testsuite/caps/value_compare.c
deleted file mode 100644 (file)
index e6c5412..0000000
--- a/testsuite/caps/value_compare.c
+++ /dev/null
@@ -1,106 +0,0 @@
-
-#include <gst/gst.h>
-#include <glib.h>
-
-void
-test1 (void)
-{
-  GValue value1 = { 0 };
-  GValue value2 = { 0 };
-
-  //GValue value3 = { 0 };
-  //gboolean ret;
-
-  g_value_init (&value1, G_TYPE_INT);
-  g_value_set_int (&value1, 10);
-  g_value_init (&value2, G_TYPE_INT);
-  g_value_set_int (&value2, 20);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  g_value_init (&value1, G_TYPE_DOUBLE);
-  g_value_set_double (&value1, 10);
-  g_value_init (&value2, G_TYPE_DOUBLE);
-  g_value_set_double (&value2, 20);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  g_value_init (&value1, G_TYPE_STRING);
-  g_value_set_string (&value1, "a");
-  g_value_init (&value2, G_TYPE_STRING);
-  g_value_set_string (&value2, "b");
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  g_value_init (&value1, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&value1, GST_MAKE_FOURCC ('a', 'b', 'c', 'd'));
-  g_value_init (&value2, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&value2, GST_MAKE_FOURCC ('1', '2', '3', '4'));
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_UNORDERED);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing 2/3 with 3/4 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, 2, 3);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 3, 4);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing -4/5 with 2/-3 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, -4, 5);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 2, -3);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing 10/100 with 200/2000 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, 10, 100);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 200, 2000);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-  /* comparing -4/5 with 2/-3 */
-  g_value_init (&value1, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value1, -4, 5);
-  g_value_init (&value2, GST_TYPE_FRACTION);
-  gst_value_set_fraction (&value2, 2, -3);
-  g_assert (gst_value_compare (&value1, &value2) == GST_VALUE_LESS_THAN);
-  g_assert (gst_value_compare (&value2, &value1) == GST_VALUE_GREATER_THAN);
-  g_assert (gst_value_compare (&value1, &value1) == GST_VALUE_EQUAL);
-  g_value_unset (&value1);
-  g_value_unset (&value2);
-
-}
-
-int
-main (int argc, char *argv[])
-{
-
-  gst_init (&argc, &argv);
-
-  test1 ();
-
-  return 0;
-}

diff --git a/testsuite/caps/value_intersect.c b/testsuite/caps/value_intersect.c
deleted file mode 100644 (file)
index aebd448..0000000
--- a/testsuite/caps/value_intersect.c
+++ /dev/null
@@ -1,58 +0,0 @@
-
-#include <gst/gst.h>
-
-void
-test1 (void)
-{
-  GValue dest = { 0 };
-  GValue src1 = { 0 };
-  GValue src2 = { 0 };
-  gboolean ret;
-
-  g_value_init (&src1, G_TYPE_INT);
-  g_value_set_int (&src1, 10);
-  g_value_init (&src2, G_TYPE_INT);
-  g_value_set_int (&src1, 20);
-  ret = gst_value_intersect (&dest, &src1, &src2);
-  g_assert (ret == 0);
-  g_print ("ret = %d\n", ret);
-}
-
-void
-test2 (void)
-{
-  GValue dest = { 0 };
-  GValue src1 = { 0 };
-  GValue src2 = { 0 };
-  GValue item = { 0 };
-  gboolean ret;
-
-  g_value_init (&src1, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&src1, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
-  g_value_init (&src2, GST_TYPE_LIST);
-  g_value_init (&item, GST_TYPE_FOURCC);
-  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'));
-  gst_value_list_append_value (&src2, &item);
-  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('I', '4', '2', '0'));
-  gst_value_list_append_value (&src2, &item);
-  gst_value_set_fourcc (&item, GST_MAKE_FOURCC ('A', 'B', 'C', 'D'));
-  gst_value_list_append_value (&src2, &item);
-  ret = gst_value_intersect (&dest, &src1, &src2);
-  g_print ("ret = %d\n", ret);
-
-  g_print ("type = %s\n", g_type_name (G_VALUE_TYPE (&dest)));
-  g_print ("value = %s\n", g_strdup_value_contents (&dest));
-}
-
-int
-main (int argc, char *argv[])
-{
-
-  gst_init (&argc, &argv);
-
-  test1 ();
-  test2 ();
-
-  return 0;
-
-}