More playlist testing. Fix sharing status of un-owned playlists.

diff --git a/lib/trackdb-playlists.c b/lib/trackdb-playlists.c
index fb01d20ec01c2931aa7432c0000396476d764488..133e8b75ee7624346b6696388005365ba578497a 100644 (file)
--- a/lib/trackdb-playlists.c
+++ b/lib/trackdb-playlists.c
@@ -81,7 +81,7 @@ int playlist_parse_name(const char *name,
     if(!valid_username(name))
       return -1;
     owner = 0;
     if(!valid_username(name))
       return -1;
     owner = 0;

-    share = "public";
+    share = "shared";

   }
   if(ownerp)
     *ownerp = owner;
   }
   if(ownerp)
     *ownerp = owner;

diff --git a/tests/playlists.py b/tests/playlists.py
index 600991a2b029dc89bb37dcfb2b217d30a5f3092b..11847fbbbbed67877c193b7dc2220c7324a7a1fd 100755 (executable)
--- a/tests/playlists.py
+++ b/tests/playlists.py
@@ -26,9 +26,11 @@ def test():
     dtest.create_user()
     c = disorder.client()
     c.random_disable()
     dtest.create_user()
     c = disorder.client()
     c.random_disable()

+    #

     print " checking initial playlist set is empty"
     l = c.playlists()
     assert l == [], "checking initial playlist set is empty"
     print " checking initial playlist set is empty"
     l = c.playlists()
     assert l == [], "checking initial playlist set is empty"

+    #

     print " creating a shared playlist"
     c.playlist_lock("wibble")
     c.playlist_set("wibble", ["one", "two", "three"])
     print " creating a shared playlist"
     c.playlist_lock("wibble")
     c.playlist_set("wibble", ["one", "two", "three"])


@@ -39,6 +41,26 @@ def test():
     print " checking new playlist contents is as assigned"
     l = c.playlist_get("wibble")
     assert l == ["one", "two", "three"], "checking playlist contents"
     print " checking new playlist contents is as assigned"
     l = c.playlist_get("wibble")
     assert l == ["one", "two", "three"], "checking playlist contents"

+    #
+    print " checking new playlist is shared"
+    s = c.playlist_get_share("wibble")
+    assert s == "shared", "checking playlist is shared"
+    #
+    print " checking cannot unshare un-owned playlist"
+    try:
+        c.playlist_set_share("wibble", "private")
+        print "*** should not be able to adjust shared playlist's sharing ***"
+        assert False
+    except disorder.operationError:
+        pass                            # good
+    #
+    print " modifying shared playlist"
+    c.playlist_lock("wibble")
+    c.playlist_set("wibble", ["three", "two", "one"])
+    c.playlist_unlock()
+    print " checking updated playlist contents is as assigned"
+    l = c.playlist_get("wibble")
+    assert l == ["three", "two", "one"], "checking modified playlist contents"

 
 if __name__ == '__main__':
     dtest.run()
 
 if __name__ == '__main__':
     dtest.run()