[chronojump/chronojump-importer] Adds new unit tests, fixes a real problem with update_session_ids().

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

commit 01bd09224d201fd76ece8176b30e30f15d9b53ff
Author: Carles Pina i Estany <carles pina cat>
Date:   Wed Sep 7 19:34:24 2016 +0100

    Adds new unit tests, fixes a real problem with update_session_ids().

 src/chronojump-importer/chronojump_importer.py     |    3 +-
 .../chronojump_importer_test.py                    |   39 +++++++++++++++-----
 .../tests/generic-expected-a.sqlite                |  Bin 61440 -> 61440 bytes
 .../tests/generic-expected-b.sqlite                |  Bin 61440 -> 61440 bytes
 .../tests/generic-expected-c.sqlite                |  Bin 61440 -> 61440 bytes
 5 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/src/chronojump-importer/chronojump_importer.py b/src/chronojump-importer/chronojump_importer.py
index 1acfe27..8cfa13c 100755
--- a/src/chronojump-importer/chronojump_importer.py
+++ b/src/chronojump-importer/chronojump_importer.py
@@ -198,10 +198,9 @@ def update_session_ids(table, new_session_id):
 
     changed = False
 
-    for row in table:
+    for row in result:
         row["sessionID"] = new_session_id
         changed = True
-        break
 
     assert changed
 
diff --git a/src/chronojump-importer/chronojump_importer_test.py 
b/src/chronojump-importer/chronojump_importer_test.py
index 9deb493..7933c2a 100755
--- a/src/chronojump-importer/chronojump_importer_test.py
+++ b/src/chronojump-importer/chronojump_importer_test.py
@@ -13,23 +13,25 @@ import pprint
 @ddt.ddt
 class TestImporter(unittest.TestCase):
     def setUp(self):
-        self.temporary_directory_path = tempfile.mkdtemp(prefix="chronojump_importer_test_")
+        pass
 
     def tearDown(self):
-        shutil.rmtree(self.temporary_directory_path)
+        pass
 
     # lists the names. They will expand to generic-destination-X.sqlite / generic-source-X.sqlite / 
generic-expected-X.sqlite
     @ddt.data("a", "b", "c")
     def test_importerGeneric(self, data):
+        temporary_directory_path = tempfile.mkdtemp(prefix="chronojump_importer_test_")
+
         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(temporary_directory_path, source_file_name)
+        destination_file_path = "{}/{}".format(temporary_directory_path, destination_file_name)
+        original_destination_file_path = "{}/{}".format(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)
@@ -37,11 +39,11 @@ class TestImporter(unittest.TestCase):
 
         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, 
temporary_directory_path))
+        os.system("echo .dump | sqlite3 tests/{} > {}/expected.sql".format(expected_file_name, 
temporary_directory_path))
 
-        actual_file = open(self.temporary_directory_path + "/destination.sql")
-        expected_file = open(self.temporary_directory_path + "/expected.sql")
+        actual_file = open(temporary_directory_path + "/destination.sql")
+        expected_file = open(temporary_directory_path + "/expected.sql")
 
         actual_dump = actual_file.readlines()
         expected_dump = expected_file.readlines()
@@ -55,10 +57,29 @@ class TestImporter(unittest.TestCase):
         self.maxDiff = None
         self.assertEqual(diff, "")
 
+        # shutil.rmtree(self.temporary_directory_path)
+
     def test_increment_suffix(self):
         self.assertEqual(chronojump_importer.increment_suffix("Free Jump"), "Free Jump (1)")
         self.assertEqual(chronojump_importer.increment_suffix("Free Jump (1)"), "Free Jump (2)")
         self.assertEqual(chronojump_importer.increment_suffix("Free Jump (2)"), "Free Jump (3)")
 
+    def test_remove_elements(self):
+        l=[1,2,3,4,5]
+        actual = chronojump_importer.remove_elements(l, [2,4])
+        self.assertEqual(actual, [1,3,5])
+
+    def test_add_prefix(self):
+        l=['hello', 'chronojump']
+        actual = chronojump_importer.add_prefix(l, "test_")
+        self.assertEqual(actual, ["test_hello", "test_chronojump"])
+
+    def test_update_session_ids(self):
+        table=[{'sessionID': 2, 'name': 'hello'}, {'sessionID':3, 'name':'bye'}]
+
+        actual = chronojump_importer.update_session_ids(table, 4)
+        for row in actual:
+            self.assertEqual(row['sessionID'], 4)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/src/chronojump-importer/tests/generic-expected-a.sqlite 
b/src/chronojump-importer/tests/generic-expected-a.sqlite
index 8d52927..67c48b3 100644
Binary files a/src/chronojump-importer/tests/generic-expected-a.sqlite and 
b/src/chronojump-importer/tests/generic-expected-a.sqlite differ
diff --git a/src/chronojump-importer/tests/generic-expected-b.sqlite 
b/src/chronojump-importer/tests/generic-expected-b.sqlite
index 81b9a51..aa7192d 100644
Binary files a/src/chronojump-importer/tests/generic-expected-b.sqlite and 
b/src/chronojump-importer/tests/generic-expected-b.sqlite differ
diff --git a/src/chronojump-importer/tests/generic-expected-c.sqlite 
b/src/chronojump-importer/tests/generic-expected-c.sqlite
index 4c06ff0..f254ab8 100644
Binary files a/src/chronojump-importer/tests/generic-expected-c.sqlite and 
b/src/chronojump-importer/tests/generic-expected-c.sqlite differ