diff --git a/test/test_sweeper.py b/test/test_sweeper.py index 445b387..734ca23 100644 --- a/test/test_sweeper.py +++ b/test/test_sweeper.py @@ -3,7 +3,7 @@ # License: GPLv3 import unittest -from sweeper import file_dups, iter_file_dups, file_dups_immediate +from sweeper import file_dups, iter_file_dups import os mydir = os.path.dirname(os.path.realpath(__file__)) @@ -23,15 +23,6 @@ class TestSweeper(unittest.TestCase): for h, flist in dups.items(): self.assertTrue(len(flist) == 1) - def test_iter_fule_dups_rethash(self): - for item in iter_file_dups([os.path.join(mydir, 'testfiles_dups')], - rethash=True): - self.assertTrue(type(item).__name__ == 'tuple') - - def test_iter_fule_dups_norethash(self): - for item in iter_file_dups([os.path.join(mydir, 'testfiles_dups')]): - self.assertTrue(type(item).__name__ == 'list') - # does not actually test safe_mode, we would need to find # hash collision def test_file_dups_safe_mode(self): @@ -42,13 +33,23 @@ class TestSweeper(unittest.TestCase): dups_exist = True self.assertTrue(dups_exist) - def test_file_dups_immediate_dups(self): - it = file_dups_immediate([os.path.join(mydir, 'testfiles_dups')]) + def test_iter_file_dups_dups(self): + it = iter_file_dups([os.path.join(mydir, 'testfiles_dups')]) + dups_exist = False + for x in it: + dups_exist = True + filepath, h, dups = x + self.assertNotIn(filepath, dups) + self.assertTrue(len(dups) > 0) + self.assertTrue(dups_exist) + + def test_iter_file_dups_nodups(self): + it = iter_file_dups([os.path.join(mydir, 'testfiles_nodups')]) dups_exist = False for x in it: dups_exist = True break - self.assertTrue(dups_exist) + self.assertFalse(dups_exist) if __name__ == '__main__':