Port remove-testsuites to reset-testsuite

Remove 'list-channels' test, this test is broken



(Old svn revision: 28194)

9 files changed, 23 insertions, 23 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 538cd18..4d031ba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS = \
 	has-properties \
 	get-properties \
 	reset-properties \
-	property-changed-signal \
-	list-channels
+	property-changed-signal
+#	list-channels
 
 clean-local:
 	-rm -rf test-xdg_config_home
diff --git a/tests/reset-properties/Makefile.am b/tests/reset-properties/Makefile.am
index 2f7d9a5..bd19964 100644
--- a/tests/reset-properties/Makefile.am
+++ b/tests/reset-properties/Makefile.am
@@ -1,18 +1,18 @@
 check_PROGRAMS = \
-	t-remove-string \
-	t-remove-int \
-	t-remove-uint64 \
-	t-remove-double \
-	t-remove-arrayv \
-	t-remove-boolean \
-	t-remove-stringlist
+	t-reset-string \
+	t-reset-int \
+	t-reset-uint64 \
+	t-reset-double \
+	t-reset-arrayv \
+	t-reset-boolean \
+	t-reset-stringlist
 
-t_remove_string_SOURCES = t-remove-string.c
-t_remove_int_SOURCES = t-remove-int.c
-t_remove_uint64_SOURCES = t-remove-uint64.c
-t_remove_double_SOURCES = t-remove-double.c
-t_remove_arrayv_SOURCES = t-remove-arrayv.c
-t_remove_boolean_SOURCES = t-remove-boolean.c
-t_remove_stringlist_SOURCES = t-remove-stringlist.c
+t_reset_string_SOURCES = t-reset-string.c
+t_reset_int_SOURCES = t-reset-int.c
+t_reset_uint64_SOURCES = t-reset-uint64.c
+t_reset_double_SOURCES = t-reset-double.c
+t_reset_arrayv_SOURCES = t-reset-arrayv.c
+t_reset_boolean_SOURCES = t-reset-boolean.c
+t_reset_stringlist_SOURCES = t-reset-stringlist.c
 
 include $(top_srcdir)/tests/Makefile.inc
diff --git a/tests/reset-properties/t-remove-arrayv.c b/tests/reset-properties/t-reset-arrayv.c
index a28d440..bc1e8d6 100644
--- a/tests/reset-properties/t-remove-arrayv.c
+++ b/tests/reset-properties/t-reset-arrayv.c
@@ -31,7 +31,7 @@ main(int argc,
     channel = xfconf_channel_new(TEST_CHANNEL_NAME);
     
     TEST_OPERATION(xfconf_channel_has_property(channel, test_array_property));
-    xfconf_channel_remove_property(channel, test_array_property);
+    xfconf_channel_reset_property(channel, test_array_property, FALSE);
     TEST_OPERATION(!xfconf_channel_has_property(channel, test_array_property));
     
     g_object_unref(G_OBJECT(channel));
diff --git a/tests/reset-properties/t-remove-boolean.c b/tests/reset-properties/t-reset-boolean.c
index c9804e4..58fb488 100644
--- a/tests/reset-properties/t-remove-boolean.c
+++ b/tests/reset-properties/t-reset-boolean.c
@@ -31,7 +31,7 @@ main(int argc,
     channel = xfconf_channel_new(TEST_CHANNEL_NAME);
     
     TEST_OPERATION(xfconf_channel_has_property(channel, test_bool_property));
-    xfconf_channel_remove_property(channel, test_bool_property);
+    xfconf_channel_reset_property(channel, test_bool_property, FALSE);
     TEST_OPERATION(!xfconf_channel_has_property(channel, test_bool_property));
     
     g_object_unref(G_OBJECT(channel));
diff --git a/tests/reset-properties/t-remove-double.c b/tests/reset-properties/t-reset-double.c
index 91c514b..41b6112 100644
--- a/tests/reset-properties/t-remove-double.c
+++ b/tests/reset-properties/t-reset-double.c
@@ -31,7 +31,7 @@ main(int argc,
     channel = xfconf_channel_new(TEST_CHANNEL_NAME);
     
     TEST_OPERATION(xfconf_channel_has_property(channel, test_double_property));
-    xfconf_channel_remove_property(channel, test_double_property);
+    xfconf_channel_reset_property(channel, test_double_property, FALSE);
     TEST_OPERATION(!xfconf_channel_has_property(channel, test_double_property));
     
     g_object_unref(G_OBJECT(channel));
diff --git a/tests/reset-properties/t-remove-int.c b/tests/reset-properties/t-reset-int.c
index 7c0e480..7a1c1a0 100644
--- a/tests/reset-properties/t-remove-int.c
+++ b/tests/reset-properties/t-reset-int.c
@@ -31,7 +31,7 @@ main(int argc,
     channel = xfconf_channel_new(TEST_CHANNEL_NAME);
     
     TEST_OPERATION(xfconf_channel_has_property(channel, test_int_property));
-    xfconf_channel_remove_property(channel, test_int_property);
+    xfconf_channel_reset_property(channel, test_int_property, FALSE);
     TEST_OPERATION(!xfconf_channel_has_property(channel, test_int_property));
     
     g_object_unref(G_OBJECT(channel));
diff --git a/tests/reset-properties/t-remove-string.c b/tests/reset-properties/t-reset-string.c
index d9229dc..535190c 100644
--- a/tests/reset-properties/t-remove-string.c
+++ b/tests/reset-properties/t-reset-string.c
@@ -31,7 +31,7 @@ main(int argc,
     channel = xfconf_channel_new(TEST_CHANNEL_NAME);
     
     TEST_OPERATION(xfconf_channel_has_property(channel, test_string_property));
-    xfconf_channel_remove_property(channel, test_string_property);
+    xfconf_channel_reset_property(channel, test_string_property, FALSE);
     TEST_OPERATION(!xfconf_channel_has_property(channel, test_string_property));
     
     g_object_unref(G_OBJECT(channel));
diff --git a/tests/reset-properties/t-remove-stringlist.c b/tests/reset-properties/t-reset-stringlist.c
index dc402a3..c40e788 100644
--- a/tests/reset-properties/t-remove-stringlist.c
+++ b/tests/reset-properties/t-reset-stringlist.c
@@ -31,7 +31,7 @@ main(int argc,
     channel = xfconf_channel_new(TEST_CHANNEL_NAME);
     
     TEST_OPERATION(xfconf_channel_has_property(channel, test_strlist_property));
-    xfconf_channel_remove_property(channel, test_strlist_property);
+    xfconf_channel_reset_property(channel, test_strlist_property, FALSE);
     TEST_OPERATION(!xfconf_channel_has_property(channel, test_strlist_property));
     
     g_object_unref(G_OBJECT(channel));
diff --git a/tests/reset-properties/t-remove-uint64.c b/tests/reset-properties/t-reset-uint64.c
index 555a0d1..692ae64 100644
--- a/tests/reset-properties/t-remove-uint64.c
+++ b/tests/reset-properties/t-reset-uint64.c
@@ -31,7 +31,7 @@ main(int argc,
     channel = xfconf_channel_new(TEST_CHANNEL_NAME);
     
     TEST_OPERATION(xfconf_channel_has_property(channel, test_uint64_property));
-    xfconf_channel_remove_property(channel, test_uint64_property);
+    xfconf_channel_reset_property(channel, test_uint64_property, FALSE);
     TEST_OPERATION(!xfconf_channel_has_property(channel, test_uint64_property));
     
     g_object_unref(G_OBJECT(channel));