X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/a4d8ba8f5aee04e305a1eb43d94bd97039f72167..71b70599a2cd81c13cc4326499a5d0c45358cd7d:/tests/files.py

diff --git a/tests/files.py b/tests/files.py
index 24d4ea4..69e98d4 100755
--- a/tests/files.py
+++ b/tests/files.py
@@ -23,8 +23,25 @@ import dtest,time,disorder,sys
 def test():
     """Check that the file listing comes out right"""
     dtest.start_daemon()
-    time.sleep(2)                       # give rescan a chance
-    assert dtest.check_files() == 0
+    assert dtest.check_files() == 0, "dtest.check_files"
+    print " checking regexp file listing"
+    c = disorder.client()
+    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"
+    # 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()