[#138] Added FolderCategory and SizeCategory.

core/tests/base.py

@@ -42,8 +42,8 @@ class NamedObject:
     def __init__(self, name="foobar", with_words=False, size=1, folder=None):
         self.name = name
         if folder is None:
-            folder = Path('basepath')
-        self._folder = folder
+            folder = 'basepath'
+        self._folder = Path(folder)
         self.size = size
         self.md5partial = name
         self.md5 = name

core/tests/prioritize_test.py

@@ -32,7 +32,9 @@ def app_with_dupes(dupes):
 def app_normal_results():
     # Just some results, with different extensions and size, for good measure.
     dupes = [
-        [no('foo1.ext1', size=1), no('foo2.ext2', size=2)],
+        [
+            no('foo1.ext1', size=1, folder='folder1'),
+            no('foo2.ext2', size=2, folder='folder2')],
     ]
     return app_with_dupes(dupes)
 
@@ -43,7 +45,7 @@ def test_kind_subcrit(app):
     eq_(app.pdialog.criteria_list[:], ['ext1', 'ext2'])
 
 @with_app(app_normal_results)
-def test_perform_reprioritization(app):
+def test_kind_reprioritization(app):
     # Just a simple test of the system as a whole.
     # select a criterion, and perform re-prioritization and see if it worked.
     app.select_pri_criterion("Kind")
@@ -51,3 +53,44 @@ def test_perform_reprioritization(app):
     app.pdialog.add_selected()
     app.pdialog.perform_reprioritization()
     eq_(app.rtable[0].data[0], 'foo2.ext2')
+
+@with_app(app_normal_results)
+def test_folder_subcrit(app):
+    app.select_pri_criterion("Folder")
+    eq_(app.pdialog.criteria_list[:], ['folder1', 'folder2'])
+
+@with_app(app_normal_results)
+def test_folder_reprioritization(app):
+    app.select_pri_criterion("Folder")
+    app.pdialog.criteria_list.select([1]) # folder2
+    app.pdialog.add_selected()
+    app.pdialog.perform_reprioritization()
+    eq_(app.rtable[0].data[0], 'foo2.ext2')
+
+@with_app(app_normal_results)
+def test_prilist_display(app):
+    # The prioritization list displays selected criteria correctly.
+    app.select_pri_criterion("Kind")
+    app.pdialog.criteria_list.select([1]) # ext2
+    app.pdialog.add_selected()
+    app.select_pri_criterion("Folder")
+    app.pdialog.criteria_list.select([1]) # folder2
+    app.pdialog.add_selected()
+    expected = [
+        "Kind (ext2)",
+        "Folder (folder2)",
+    ]
+    eq_(app.pdialog.prioritization_list[:], expected)
+
+@with_app(app_normal_results)
+def test_size_subcrit(app):
+    app.select_pri_criterion("Size")
+    eq_(app.pdialog.criteria_list[:], ['Highest', 'Lowest'])
+
+@with_app(app_normal_results)
+def test_size_reprioritization(app):
+    app.select_pri_criterion("Size")
+    app.pdialog.criteria_list.select([0]) # highest
+    app.pdialog.add_selected()
+    app.pdialog.perform_reprioritization()
+    eq_(app.rtable[0].data[0], 'foo2.ext2')