Merge event scheduling implementation. This fixes defect #6,

[disorder] / tests / files.py

diff --git a/tests/files.py b/tests/files.py
index e0237d44b7ffde2b9e715107d037ab3c737677d5..984c6cca89dd839d05e26f10112aada72b96a592 100755 (executable)
--- a/tests/files.py
+++ b/tests/files.py
@@ -1,37 +1,58 @@
 #! /usr/bin/env python
+#
+# This file is part of DisOrder.
+# Copyright (C) 2007, 2008 Richard Kettlewell
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
 import dtest,time,disorder,sys
 
 def test():
     """Check that the file listing comes out right"""
     dtest.start_daemon()
-    time.sleep(5)                       # give rescan a chance
+    dtest.create_user()
+    dtest.rescan()
+    assert dtest.check_files() == 0, "dtest.check_files"
+    print " checking regexp file listing"
     c = disorder.client()
-    failures = 0
-    for d in dtest.dirs_by_dir:
-        xdirs = dtest.dirs_by_dir[d]
-        dirs = c.directories(d)
-        xdirs.sort()
-        dirs.sort()
-        if dirs != xdirs:
-            print
-            print "directory: %s" % d
-            print "expected:  %s" % xdirs
-            print "got:       %s" % dirs
-            failures += 1
-    for d in dtest.files_by_dir:
-        xfiles = dtest.files_by_dir[d]
-        files = c.files(d)
-        xfiles.sort()
-        files.sort()
-        if files != xfiles:
-            print
-            print "directory: %s" % d
-            print "expected:  %s" % xfiles
-            print "got:       %s" % files
-            failures += 1
-    if failures:
-        print
-        sys.exit(1)
+    f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
+                "second")
+    assert len(f) == 1, "checking for one match"
+    assert f[0] == "%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
+    print " and again to exercise cache"
+    f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
+                "second")
+    assert len(f) == 1, "checking for one match"
+    assert f[0] == "%s/Joe Bloggs/First Album/02:Second track.ogg" % dtest.tracks
+    print " checking unicode regexp file listing"
+    f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
+                "first")
+    assert len(f) == 0, "checking for 0 matches"
+    print " and again to exercise cache"
+    f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
+                "first")
+    assert len(f) == 0, "checking for 0 matches"
+    # This is rather unsatisfactory but it is the current behavior.  We could
+    # for instance go to NFD for regexp matching but we'd have to do the same
+    # to the regexp, including replacing single characters with (possibly
+    # bracketed) decomposed forms.  Really the answer has to be a more
+    # Unicode-aware regexp library.
+    f = c.files("%s/Joe Bloggs/First Album" % dtest.tracks,
+                "fi\\p{Mn}*rst")
+    assert len(f) == 0, "checking for 0 matches"
 
 if __name__ == '__main__':
-    dtest.run(test)
+    dtest.run()