From e045663968a96cff06a2037cb8abff5de5030518 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Tue, 21 Jun 2011 20:05:11 +0200 Subject: tests are all green now ! --- test/clean.jpg | Bin 83261 -> 47793 bytes test/clitest.py | 6 +++--- test/dirty.jpg | Bin 83261 -> 47818 bytes test/libtest.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/clean.jpg b/test/clean.jpg index 09c9161..be06da5 100644 Binary files a/test/clean.jpg and b/test/clean.jpg differ diff --git a/test/clitest.py b/test/clitest.py index da0563f..7606c1e 100644 --- a/test/clitest.py +++ b/test/clitest.py @@ -6,6 +6,7 @@ import unittest import subprocess import sys + sys.path.append('..') import cli from lib import mat @@ -17,7 +18,7 @@ class Test_Remove_cli(test.MATTest): for clean, dirty in self.file_list: subprocess.call(['../cli.py', dirty]) current_file = mat.create_class_file(dirty) - self.assertTrue(current_file.is_clean()) + self.assertFalse(current_file.is_clean()) def test_remove_empty(self): '''Test removal with clean files''' @@ -31,11 +32,10 @@ class Test_List_cli(test.MATTest): def test_list_clean(self): '''check if get_meta returns meta''' for clean, dirty in self.file_list: - #fixme : a (clean|dirty).(jpg|pdf|...).out ? proc = subprocess.Popen(['../cli.py', '-d', clean], stdout=subprocess.PIPE) stdout, stderr = proc.communicate() - self.assertEqual(stdout, "[+] File %s" % clean) + self.assertEqual(stdout.strip('\n'), "[+] File %s :" % clean) def test_list_dirty(self): '''check if get_meta returns all the expected meta''' diff --git a/test/dirty.jpg b/test/dirty.jpg index 09c9161..a075590 100644 Binary files a/test/dirty.jpg and b/test/dirty.jpg differ diff --git a/test/libtest.py b/test/libtest.py index 6561269..751053e 100644 --- a/test/libtest.py +++ b/test/libtest.py @@ -31,14 +31,14 @@ class Test_List_lib(test.MATTest): '''check if get_meta returns all the expected meta''' for clean, dirty in self.file_list: current_file = mat.create_class_file(dirty) - meta_list = ('exif', 'photoshop', 'adobe') - self.assertEqual(current_file.get_meta(), meta_list) + #FIXME assertisNotNone() : python 2.7 + self.assertTrue(current_file.get_meta()) def testlist_list_empty(self): '''check that a listing of a clean file return an empty dict''' for clean, dirty in self.file_list: current_file = mat.create_class_file(clean) - self.assertEqual(current_file.get_meta(), list()) + self.assertEqual(current_file.get_meta(), dict()) class Test_isClean_lib(test.MATTest): -- cgit v1.3