diff options
| -rwxr-xr-x | clitest.py | 20 | ||||
| -rwxr-xr-x | libtest.py | 2 |
2 files changed, 2 insertions, 20 deletions
| @@ -30,6 +30,7 @@ class Test_List_cli(test.MATTest): | |||
| 30 | def test_list_clean(self): | 30 | def test_list_clean(self): |
| 31 | '''check if get_meta returns meta''' | 31 | '''check if get_meta returns meta''' |
| 32 | for clean, dirty in self.file_list: | 32 | for clean, dirty in self.file_list: |
| 33 | #fixme : a (clean|dirty).(jpg|pdf|...).out ? | ||
| 33 | proc = subprocess.Popen(['./cli.py', '-d', clean], | 34 | proc = subprocess.Popen(['./cli.py', '-d', clean], |
| 34 | stdout=subprocess.PIPE) | 35 | stdout=subprocess.PIPE) |
| 35 | stdout, stderr = proc.communicate() | 36 | stdout, stderr = proc.communicate() |
| @@ -43,24 +44,6 @@ class Test_List_cli(test.MATTest): | |||
| 43 | stdout, stderr = proc.communicate() | 44 | stdout, stderr = proc.communicate() |
| 44 | self.assertNotEqual(stdout, "[+] File %s" % dirty) | 45 | self.assertNotEqual(stdout, "[+] File %s" % dirty) |
| 45 | 46 | ||
| 46 | class Test_List_Harmful_cli(test.MATTest): | ||
| 47 | def test_list_clean(self): | ||
| 48 | '''check if get_meta returns no meta at all''' | ||
| 49 | for clean, dirty in self.file_list: | ||
| 50 | proc = subprocess.Popen(['./cli.py', '--harmful', clean], | ||
| 51 | stdout=subprocess.PIPE) | ||
| 52 | stdout, stderr = proc.communicate() | ||
| 53 | self.assertNotEqual(stdout.strip('\n'), '[+] File %s :' % clean) | ||
| 54 | |||
| 55 | def test_list_dirty(self): | ||
| 56 | '''check if get_meta returns harmful meta''' | ||
| 57 | for clean, dirty in self.file_list: | ||
| 58 | proc = subprocess.Popen(['./cli.py', '--harmful', dirty], | ||
| 59 | stdout=subprocess.PIPE) | ||
| 60 | stdout, stderr = proc.communicate() | ||
| 61 | self.assertNotEqual(stdout.strip('\n'), '[+] File %s :' % dirty) | ||
| 62 | |||
| 63 | |||
| 64 | 47 | ||
| 65 | class Test_isClean_cli(test.MATTest): | 48 | class Test_isClean_cli(test.MATTest): |
| 66 | #FIXME : use an external file with string as const ? | 49 | #FIXME : use an external file with string as const ? |
| @@ -86,5 +69,4 @@ if __name__ == '__main__': | |||
| 86 | suite.addTest(unittest.makeSuite(Test_Remove_cli)) | 69 | suite.addTest(unittest.makeSuite(Test_Remove_cli)) |
| 87 | suite.addTest(unittest.makeSuite(Test_List_cli)) | 70 | suite.addTest(unittest.makeSuite(Test_List_cli)) |
| 88 | suite.addTest(unittest.makeSuite(Test_isClean_cli)) | 71 | suite.addTest(unittest.makeSuite(Test_isClean_cli)) |
| 89 | suite.addTest(unittest.makeSuite(Test_List_Harmful_cli)) | ||
| 90 | unittest.TextTestRunner(verbosity=2).run(suite) | 72 | unittest.TextTestRunner(verbosity=2).run(suite) |
| @@ -30,7 +30,7 @@ class Test_List_lib(test.MATTest): | |||
| 30 | for clean, dirty in self.file_list: | 30 | for clean, dirty in self.file_list: |
| 31 | current_file = mat.create_class_file(dirty) | 31 | current_file = mat.create_class_file(dirty) |
| 32 | meta_list = dict({"fixme":"please"},) | 32 | meta_list = dict({"fixme":"please"},) |
| 33 | self.assertDictEqual(current_file.get_meta(), meta_list) | 33 | self.assertEqual(current_file.get_meta(), meta_list) |
| 34 | 34 | ||
| 35 | def testlist_list_empty(self): | 35 | def testlist_list_empty(self): |
| 36 | '''check that a listing of a clean file return an empty dict''' | 36 | '''check that a listing of a clean file return an empty dict''' |
