diff options
| -rw-r--r-- | tests/rygel-http-time-seek-test.vala | 2 | ||||
| -rw-r--r-- | tests/rygel-object-creator-test.vala | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/rygel-http-time-seek-test.vala b/tests/rygel-http-time-seek-test.vala index 9892e300..e916c686 100644 --- a/tests/rygel-http-time-seek-test.vala +++ b/tests/rygel-http-time-seek-test.vala @@ -283,7 +283,7 @@ private class Rygel.HTTPTimeSeekTest : GLib.Object { assert (seek != null); assert (seek.start == start); - assert (seek.stop == stop); + assert (seek.stop == stop - 1); assert (seek.length == seek.stop + TimeSpan.MILLISECOND - seek.start); var audio_item = request.object as AudioItem; diff --git a/tests/rygel-object-creator-test.vala b/tests/rygel-object-creator-test.vala index f2cbb451..471eba06 100644 --- a/tests/rygel-object-creator-test.vala +++ b/tests/rygel-object-creator-test.vala @@ -282,6 +282,7 @@ public class Rygel.SearchableContainer : Rygel.MediaContainer { public errordomain Rygel.ContentDirectoryError { BAD_METADATA, NO_SUCH_OBJECT, + NO_SUCH_CONTAINER, INVALID_ARGS, RESTRICTED_PARENT, ERROR @@ -353,12 +354,14 @@ public class Rygel.HTTPObjectCreatorTest : GLib.Object { // expected errors Error no_such_object; + Error no_such_container; Error restricted_parent; Error bad_metadata; Error invalid_args; public HTTPObjectCreatorTest () { this.no_such_object = new ContentDirectoryError.NO_SUCH_OBJECT(""); + this.no_such_container = new ContentDirectoryError.NO_SUCH_CONTAINER(""); this.restricted_parent = new ContentDirectoryError.RESTRICTED_PARENT(""); this.bad_metadata = new ContentDirectoryError.BAD_METADATA(""); this.invalid_args = new ContentDirectoryError.INVALID_ARGS(""); @@ -428,7 +431,7 @@ public class Rygel.HTTPObjectCreatorTest : GLib.Object { // test item node with restricted=1 tmp->set_prop ("restricted", "1"); - this.test_didl_parsing_step (xml, invalid_args.code); + this.test_didl_parsing_step (xml, bad_metadata.code); // test item node with invalid id tmp->unlink (); @@ -475,13 +478,13 @@ public class Rygel.HTTPObjectCreatorTest : GLib.Object { var action = new ServiceAction ("0", DIDL_ITEM); var creator = new ObjectCreator (content_directory, action); this.test_fetch_container_run (creator); - assert (action.error_code == no_such_object.code); + assert (action.error_code == no_such_container.code); // check case when found object is not a container → Error 710 // cf. ContentDirectory:2 spec, Table 2-22 root_container.found_object = new MediaObject (); this.test_fetch_container_run (creator); - assert (action.error_code == no_such_object.code); + assert (action.error_code == no_such_container.code); // check case when found container does not have OCMUpload set root_container.found_object = new MediaContainer (); @@ -505,7 +508,7 @@ public class Rygel.HTTPObjectCreatorTest : GLib.Object { content_directory.root_container = new MediaContainer (); action.id = "DLNA.ORG_AnyContainer"; this.test_fetch_container_run (creator); - assert (action.error_code == no_such_object.code); + assert (action.error_code == no_such_container.code); // check DLNA.ORG_AnyContainer when no writable container is found content_directory.root_container = new SearchableContainer (); |