tests: Enable object creator test

Signed-off-by: Jens Georg <mail@jensge.org>

45 files changed, 28 insertions, 67 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3bd1167a..7393c90f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,13 +9,13 @@ AUTOMAKE_OPTIONS = subdir-objects
 #		 rygel-http-get-test \
 #		 rygel-http-post-test \
 #		 rygel-searchable-container-test \
-#		 rygel-object-creator-test \
 #		 rygel-user-config-test \
 #		 rygel-regression \
 #		 rygel-media-engine-test
 
 check_PROGRAMS = rygel-regression \
-				 rygel-user-config-test
+				 rygel-user-config-test \
+				 rygel-object-creator-test
 
 TESTS = $(check_PROGRAMS)
 
@@ -128,26 +128,23 @@ test_server_libs = \
 #rygel_searchable_container_test_LDADD = \
 #	$(test_libs)
 #
-#rygel_object_creator_test_SOURCES = rygel-object-creator-test.vala \
-#				  rygel-object-creator.vala \
-#				  rygel-data-source.vala \
-#				  rygel-dlna-profile.vala \
-#				  rygel-http-seek_object-creator.vala \
-#				  rygel-state-machine_object-creator.vala \
-#				  rygel-relational-expression.vala \
-#				  rygel-logical-expression.vala \
-#				  rygel-search-expression.vala \
-#				  rygel-search-criteria-parser.vala \
-#				  rygel-serializer_object-creator.vala \
-#				  rygel-m3u-playlist_object-creator.vala
-#rygel_object_creator_test_VALAFLAGS = \
-#	$(test_valaflags) \
-#	--pkg uuid
-#rygel_object_creator_test_CFLAGS =  \
-#	$(test_cflags)
-#rygel_object_creator_test_LDADD = \
-#	$(test_libs)
-#
+rygel_object_creator_test_SOURCES = object-creator/test.vala \
+				  object-creator/rygel-object-creator.vala \
+				  object-creator/rygel-dlna-profile.vala \
+				  object-creator/rygel-serializer.vala \
+				  object-creator/rygel-m3u-playlist.vala \
+				  object-creator/rygel-state-machine.vala \
+				  object-creator/rygel-search-expression.vala \
+				  object-creator/rygel-relational-expression.vala \
+				  object-creator/rygel-logical-expression.vala \
+				  object-creator/rygel-search-criteria-parser.vala
+rygel_object_creator_test_VALAFLAGS = \
+	$(test_valaflags)
+rygel_object_creator_test_CFLAGS =  \
+	$(test_cflags)
+rygel_object_creator_test_LDADD = \
+	$(test_libs)
+
 rygel_user_config_test_SOURCES = rygel-configuration.vala \
 				 rygel-user-config.vala \
 				 rygel-user-config-test.vala
diff --git a/tests/object-creator/rygel-dlna-profile.vala b/tests/object-creator/rygel-dlna-profile.vala
new file mode 120000
index 00000000..59afe74f
--- /dev/null
+++ b/tests/object-creator/rygel-dlna-profile.vala
@@ -0,0 +1 @@
+../../src/librygel-core/rygel-dlna-profile.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-logical-expression.vala b/tests/object-creator/rygel-logical-expression.vala
new file mode 120000
index 00000000..a8442a8a
--- /dev/null
+++ b/tests/object-creator/rygel-logical-expression.vala
@@ -0,0 +1 @@
+../../src/librygel-server/rygel-logical-expression.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-m3u-playlist.vala b/tests/object-creator/rygel-m3u-playlist.vala
new file mode 120000
index 00000000..ff1932a2
--- /dev/null
+++ b/tests/object-creator/rygel-m3u-playlist.vala
@@ -0,0 +1 @@
+../../src/librygel-server/rygel-m3u-playlist.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-object-creator.vala b/tests/object-creator/rygel-object-creator.vala
new file mode 120000
index 00000000..0d8e028f
--- /dev/null
+++ b/tests/object-creator/rygel-object-creator.vala
@@ -0,0 +1 @@
+../../src/librygel-server/rygel-object-creator.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-relational-expression.vala b/tests/object-creator/rygel-relational-expression.vala
new file mode 120000
index 00000000..542d7165
--- /dev/null
+++ b/tests/object-creator/rygel-relational-expression.vala
@@ -0,0 +1 @@
+../../src/librygel-server/rygel-relational-expression.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-search-criteria-parser.vala b/tests/object-creator/rygel-search-criteria-parser.vala
new file mode 120000
index 00000000..f94f2126
--- /dev/null
+++ b/tests/object-creator/rygel-search-criteria-parser.vala
@@ -0,0 +1 @@
+../../src/librygel-server/rygel-search-criteria-parser.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-search-expression.vala b/tests/object-creator/rygel-search-expression.vala
new file mode 120000
index 00000000..5d005ff7
--- /dev/null
+++ b/tests/object-creator/rygel-search-expression.vala
@@ -0,0 +1 @@
+../../src/librygel-server/rygel-search-expression.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-serializer.vala b/tests/object-creator/rygel-serializer.vala
new file mode 120000
index 00000000..272b6813
--- /dev/null
+++ b/tests/object-creator/rygel-serializer.vala
@@ -0,0 +1 @@
+../../src/librygel-server/rygel-serializer.vala
\ No newline at end of file
diff --git a/tests/object-creator/rygel-state-machine.vala b/tests/object-creator/rygel-state-machine.vala
new file mode 120000
index 00000000..e881e9f6
--- /dev/null
+++ b/tests/object-creator/rygel-state-machine.vala
@@ -0,0 +1 @@
+../../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-object-creator-test.vala b/tests/object-creator/test.vala
index 69aad3f6..a0198d84 100644
--- a/tests/rygel-object-creator-test.vala
+++ b/tests/object-creator/test.vala
@@ -21,17 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/* This is not used.
-[CCode (cname = "uuid_generate", cheader_filename = "uuid/uuid.h")]
-internal extern static void uuid_generate ([CCode (array_length = false)]
-                                           uchar[] uuid);
-[CCode (cname = "uuid_unparse", cheader_filename = "uuid/uuid.h")]
-internal extern static void uuid_unparse ([CCode (array_length = false)]
-                                          uchar[] uuid,
-                                          [CCode (array_length = false)]
-                                          uchar[] output);
-*/
-
 public const string DIDL_ITEM = """<?xml version="1.0" encoding="UTF-8"?>
 <DIDL-Lite
     xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/tests/rygel-data-sink_http-response.vala b/tests/rygel-data-sink_http-response.vala
deleted file mode 120000
index 1fcf09b6..00000000
--- a/tests/rygel-data-sink_http-response.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-data-sink.vala
\ No newline at end of file
diff --git a/tests/rygel-data-source.vala b/tests/rygel-data-source.vala
deleted file mode 120000
index e1065ed1..00000000
--- a/tests/rygel-data-source.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-data-source.vala
\ No newline at end of file
diff --git a/tests/rygel-data-source_http-response.vala b/tests/rygel-data-source_http-response.vala
deleted file mode 120000
index e1065ed1..00000000
--- a/tests/rygel-data-source_http-response.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-data-source.vala
\ No newline at end of file
diff --git a/tests/rygel-dlna-profile.vala b/tests/rygel-dlna-profile.vala
deleted file mode 120000
index 8fa6cea2..00000000
--- a/tests/rygel-dlna-profile.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-core/rygel-dlna-profile.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek.vala b/tests/rygel-http-byte-seek.vala
deleted file mode 120000
index 84e6fe96..00000000
--- a/tests/rygel-http-byte-seek.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-byte-seek_http-get.vala b/tests/rygel-http-byte-seek_http-get.vala
deleted file mode 120000
index 84e6fe96..00000000
--- a/tests/rygel-http-byte-seek_http-get.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-byte-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-get.vala b/tests/rygel-http-get.vala
deleted file mode 120000
index e4bac4e8..00000000
--- a/tests/rygel-http-get.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-get.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri.vala b/tests/rygel-http-item-uri.vala
deleted file mode 120000
index b82155c2..00000000
--- a/tests/rygel-http-item-uri.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-get.vala b/tests/rygel-http-item-uri_http-get.vala
deleted file mode 120000
index b82155c2..00000000
--- a/tests/rygel-http-item-uri_http-get.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-item-uri_http-post.vala b/tests/rygel-http-item-uri_http-post.vala
deleted file mode 120000
index b82155c2..00000000
--- a/tests/rygel-http-item-uri_http-post.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-item-uri.vala
\ No newline at end of file
diff --git a/tests/rygel-http-post.vala b/tests/rygel-http-post.vala
deleted file mode 120000
index 80bea5f1..00000000
--- a/tests/rygel-http-post.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-post.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-get.vala b/tests/rygel-http-request_http-get.vala
deleted file mode 120000
index 60d2e75e..00000000
--- a/tests/rygel-http-request_http-get.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-request_http-post.vala b/tests/rygel-http-request_http-post.vala
deleted file mode 120000
index 60d2e75e..00000000
--- a/tests/rygel-http-request_http-post.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-request.vala
\ No newline at end of file
diff --git a/tests/rygel-http-response.vala b/tests/rygel-http-response.vala
deleted file mode 120000
index 7e6c2d5a..00000000
--- a/tests/rygel-http-response.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-response.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek.vala b/tests/rygel-http-seek.vala
deleted file mode 120000
index 33966006..00000000
--- a/tests/rygel-http-seek.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_http-get.vala b/tests/rygel-http-seek_http-get.vala
deleted file mode 120000
index 33966006..00000000
--- a/tests/rygel-http-seek_http-get.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_object-creator.vala b/tests/rygel-http-seek_object-creator.vala
deleted file mode 120000
index 33966006..00000000
--- a/tests/rygel-http-seek_object-creator.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-seek_time-seek.vala b/tests/rygel-http-seek_time-seek.vala
deleted file mode 120000
index 33966006..00000000
--- a/tests/rygel-http-seek_time-seek.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek.vala b/tests/rygel-http-time-seek.vala
deleted file mode 120000
index 7ea8eb48..00000000
--- a/tests/rygel-http-time-seek.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-http-time-seek_http-get.vala b/tests/rygel-http-time-seek_http-get.vala
deleted file mode 120000
index 7ea8eb48..00000000
--- a/tests/rygel-http-time-seek_http-get.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-http-time-seek.vala
\ No newline at end of file
diff --git a/tests/rygel-icon-info.vala b/tests/rygel-icon-info.vala
deleted file mode 120000
index 84f4417d..00000000
--- a/tests/rygel-icon-info.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-core/rygel-icon-info.vala
\ No newline at end of file
diff --git a/tests/rygel-logical-expression.vala b/tests/rygel-logical-expression.vala
deleted file mode 120000
index 0a0e8547..00000000
--- a/tests/rygel-logical-expression.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-logical-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-m3u-playlist_object-creator.vala b/tests/rygel-m3u-playlist_object-creator.vala
deleted file mode 120000
index 7b257a37..00000000
--- a/tests/rygel-m3u-playlist_object-creator.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-m3u-playlist.vala
\ No newline at end of file
diff --git a/tests/rygel-object-creator.vala b/tests/rygel-object-creator.vala
deleted file mode 120000
index d790f613..00000000
--- a/tests/rygel-object-creator.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-object-creator.vala
\ No newline at end of file
diff --git a/tests/rygel-relational-expression.vala b/tests/rygel-relational-expression.vala
deleted file mode 120000
index 40edca9e..00000000
--- a/tests/rygel-relational-expression.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-relational-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-search-criteria-parser.vala b/tests/rygel-search-criteria-parser.vala
deleted file mode 120000
index 81129160..00000000
--- a/tests/rygel-search-criteria-parser.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-search-criteria-parser.vala
\ No newline at end of file
diff --git a/tests/rygel-search-expression.vala b/tests/rygel-search-expression.vala
deleted file mode 120000
index a0fd6b5b..00000000
--- a/tests/rygel-search-expression.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-search-expression.vala
\ No newline at end of file
diff --git a/tests/rygel-searchable-container.vala b/tests/rygel-searchable-container.vala
deleted file mode 120000
index 034cdfa6..00000000
--- a/tests/rygel-searchable-container.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-searchable-container.vala
\ No newline at end of file
diff --git a/tests/rygel-serializer_object-creator.vala b/tests/rygel-serializer_object-creator.vala
deleted file mode 120000
index a8cce1b0..00000000
--- a/tests/rygel-serializer_object-creator.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-serializer.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-get.vala b/tests/rygel-state-machine_http-get.vala
deleted file mode 120000
index 2b3a7af9..00000000
--- a/tests/rygel-state-machine_http-get.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-post.vala b/tests/rygel-state-machine_http-post.vala
deleted file mode 120000
index 2b3a7af9..00000000
--- a/tests/rygel-state-machine_http-post.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_http-response.vala b/tests/rygel-state-machine_http-response.vala
deleted file mode 120000
index 2b3a7af9..00000000
--- a/tests/rygel-state-machine_http-response.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-state-machine_object-creator.vala b/tests/rygel-state-machine_object-creator.vala
deleted file mode 120000
index 2b3a7af9..00000000
--- a/tests/rygel-state-machine_object-creator.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-core/rygel-state-machine.vala
\ No newline at end of file
diff --git a/tests/rygel-thumbnail.vala b/tests/rygel-thumbnail.vala
deleted file mode 120000
index 0b0ee8de..00000000
--- a/tests/rygel-thumbnail.vala
+++ /dev/null
@@ -1 +0,0 @@
-../src/librygel-server/rygel-thumbnail.vala
\ No newline at end of file