[chronojump/chronojump-importer] Organizes better the tests (specially the output).

[Carles Pina i Estany <carlespina src gnome org>]

commit d26836edc98966727a46f338e96d42074380c30d
Author: Carles Pina i Estany <carles pina cat>
Date:   Mon Sep 5 18:11:20 2016 +0100

    Organizes better the tests (specially the output).

 .../chronojump_importer_test.py                    |   65 +++++++++-----------
 src/chronojump-importer/requirements.txt           |    1 +
 2 files changed, 31 insertions(+), 35 deletions(-)
---
diff --git a/src/chronojump-importer/chronojump_importer_test.py 
b/src/chronojump-importer/chronojump_importer_test.py
index b7a9d14..065dd20 100755
--- a/src/chronojump-importer/chronojump_importer_test.py
+++ b/src/chronojump-importer/chronojump_importer_test.py
@@ -7,58 +7,53 @@ import subprocess
 import tempfile
 import shutil
 import difflib
+import ddt
 import pprint
 
-
+@ddt.ddt
 class TestImporter(unittest.TestCase):
     def setUp(self):
         self.temporary_directory_path = tempfile.mkdtemp(prefix="chronojump_importer_test_")
 
     def tearDown(self):
-        pass
-        #shutil.rmtree(self.temporary_directory_path)
-
-    def test_importerGeneric(self):
-
-        # lists the names. They will expand to generic-destination-X.sqlite / generic-source-X.sqlite / 
generic-expected-X.sqlite
-        generic_tests = ["a", "b"]
+        shutil.rmtree(self.temporary_directory_path)
 
-        for generic_test in generic_tests:
-            source_file_name = "generic-source-{}.sqlite".format(generic_test)
-            destination_file_name = "generic-destination-{}.sqlite".format(generic_test)
-            expected_file_name = "generic-expected-{}.sqlite".format(generic_test)
-            original_destination_file_path = "generic-original-destination-{}.sqlite".format(generic_test)
+    # lists the names. They will expand to generic-destination-X.sqlite / generic-source-X.sqlite / 
generic-expected-X.sqlite
+    @ddt.data("a", "b")
+    def test_importerGeneric(self, data):
+        generic_test = data
+        source_file_name = "generic-source-{}.sqlite".format(generic_test)
+        destination_file_name = "generic-destination-{}.sqlite".format(generic_test)
+        expected_file_name = "generic-expected-{}.sqlite".format(generic_test)
+        original_destination_file_path = "generic-original-destination-{}.sqlite".format(generic_test)
 
-            source_file_path = "{}/{}".format(self.temporary_directory_path, source_file_name)
-            destination_file_path = "{}/{}".format(self.temporary_directory_path, destination_file_name)
-            original_destination_file_path = "{}/{}".format(self.temporary_directory_path, 
original_destination_file_path)
+        source_file_path = "{}/{}".format(self.temporary_directory_path, source_file_name)
+        destination_file_path = "{}/{}".format(self.temporary_directory_path, destination_file_name)
+        original_destination_file_path = "{}/{}".format(self.temporary_directory_path, 
original_destination_file_path)
 
-            shutil.copy("tests/{}".format(source_file_name), source_file_path)
-            shutil.copy("tests/{}".format(destination_file_name), destination_file_path)
-            shutil.copy("tests/{}".format(destination_file_name), original_destination_file_path)
+        shutil.copy("tests/{}".format(source_file_name), source_file_path)
+        shutil.copy("tests/{}".format(destination_file_name), destination_file_path)
+        shutil.copy("tests/{}".format(destination_file_name), original_destination_file_path)
 
-            chronojump_importer.import_database(source_file_path, destination_file_path, 1)
+        chronojump_importer.import_database(source_file_path, destination_file_path, 1)
 
-            os.system("echo .dump | sqlite3 {} > {}/destination.sql".format(destination_file_path, 
self.temporary_directory_path))
-            os.system("echo .dump | sqlite3 tests/{} > {}/expected.sql".format(expected_file_name, 
self.temporary_directory_path))
+        os.system("echo .dump | sqlite3 {} > {}/destination.sql".format(destination_file_path, 
self.temporary_directory_path))
+        os.system("echo .dump | sqlite3 tests/{} > {}/expected.sql".format(expected_file_name, 
self.temporary_directory_path))
 
-            actual_file = open(self.temporary_directory_path + "/destination.sql")
-            expected_file = open(self.temporary_directory_path + "/expected.sql")
+        actual_file = open(self.temporary_directory_path + "/destination.sql")
+        expected_file = open(self.temporary_directory_path + "/expected.sql")
 
-            actual_dump = actual_file.readlines()
-            expected_dump = expected_file.readlines()
+        actual_dump = actual_file.readlines()
+        expected_dump = expected_file.readlines()
 
-            actual_file.close()
-            expected_file.close()
+        actual_file.close()
+        expected_file.close()
 
-            diff = difflib.unified_diff(actual_dump, expected_dump)
-            diff = "".join(diff)
-            print(diff)
-            command = "diff -u {}/destination.sql {}/expected.sql".format(self.temporary_directory_path, 
self.temporary_directory_path)
-            diff = subprocess.getoutput(command)
+        diff = difflib.unified_diff(actual_dump, expected_dump)
+        diff = "".join(diff)
 
-            self.maxDiff = None
-            self.assertEqual(diff, "")
+        self.maxDiff = None
+        self.assertEqual(diff, "")
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/src/chronojump-importer/requirements.txt b/src/chronojump-importer/requirements.txt
new file mode 100644
index 0000000..3a9eaad
--- /dev/null
+++ b/src/chronojump-importer/requirements.txt
@@ -0,0 +1 @@
+ddt==1.1.0