[chronojump/chronojump-importer] Adds new integration tests.



commit c20b5a3a42084c9ae1bc55ab173214568bb1ed6e
Author: Carles Pina i Estany <carles pina cat>
Date:   Fri Sep 9 11:11:58 2016 +0100

    Adds new integration tests.

 src/chronojump-importer/chronojump_importer.py     |    3 +-
 .../chronojump_importer_test.py                    |   23 +++++++++++++-------
 .../tests/padu-destination.sqlite                  |  Bin 0 -> 61440 bytes
 src/chronojump-importer/tests/padu-expected.sqlite |  Bin 0 -> 66560 bytes
 src/chronojump-importer/tests/padu-source.sqlite   |  Bin 0 -> 209920 bytes
 .../tests/yoyo-destination.sqlite                  |  Bin 0 -> 1771520 bytes
 src/chronojump-importer/tests/yoyo-expected.sqlite |  Bin 0 -> 1772544 bytes
 src/chronojump-importer/tests/yoyo-source.sqlite   |  Bin 0 -> 1771520 bytes
 8 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/src/chronojump-importer/chronojump_importer.py b/src/chronojump-importer/chronojump_importer.py
index 8cfa13c..5904e42 100755
--- a/src/chronojump-importer/chronojump_importer.py
+++ b/src/chronojump-importer/chronojump_importer.py
@@ -202,7 +202,8 @@ def update_session_ids(table, new_session_id):
         row["sessionID"] = new_session_id
         changed = True
 
-    assert changed
+    if len(table) > 0:
+        assert changed
 
     return result
 
diff --git a/src/chronojump-importer/chronojump_importer_test.py 
b/src/chronojump-importer/chronojump_importer_test.py
index 150f22f..34dc42c 100755
--- a/src/chronojump-importer/chronojump_importer_test.py
+++ b/src/chronojump-importer/chronojump_importer_test.py
@@ -19,16 +19,22 @@ class TestImporter(unittest.TestCase):
     def tearDown(self):
         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")
+    # lists the names. {} will expand to source/destination/expected.
+    @ddt.data(
+        {'base_filename': 'generic-{}-a.sqlite', 'session': 1},
+        {'base_filename': 'generic-{}-b.sqlite', 'session': 1},
+        {'base_filename': 'generic-{}-c.sqlite', 'session': 1},
+        {'base_filename': 'padu-{}.sqlite', 'session': 19},
+        {'base_filename': 'yoyo-{}.sqlite', 'session': 19}
+    )
     def test_importerGeneric(self, data):
-        temporary_directory_path = tempfile.mkdtemp(prefix="chronojump_importer_test_")
+        base_filename = data['base_filename']
+        source_file_name = base_filename.format('source')
+        destination_file_name = base_filename.format('destination')
+        expected_file_name = base_filename.format('expected')
+        original_destination_file_path = base_filename.format('original-destination')
 
-        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)
+        temporary_directory_path = 
tempfile.mkdtemp(prefix="chronojump_importer_test_{}".format(base_filename.replace("{}", "")))
 
         source_file_path = "{}/{}".format(temporary_directory_path, source_file_name)
         destination_file_path = "{}/{}".format(temporary_directory_path, destination_file_name)
@@ -119,5 +125,6 @@ class TestImporter(unittest.TestCase):
         database.close()
         os.remove(filename)
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/src/chronojump-importer/tests/padu-destination.sqlite 
b/src/chronojump-importer/tests/padu-destination.sqlite
new file mode 100644
index 0000000..67c48b3
Binary files /dev/null and b/src/chronojump-importer/tests/padu-destination.sqlite differ
diff --git a/src/chronojump-importer/tests/padu-expected.sqlite 
b/src/chronojump-importer/tests/padu-expected.sqlite
new file mode 100644
index 0000000..d5a30be
Binary files /dev/null and b/src/chronojump-importer/tests/padu-expected.sqlite differ
diff --git a/src/chronojump-importer/tests/padu-source.sqlite 
b/src/chronojump-importer/tests/padu-source.sqlite
new file mode 100644
index 0000000..5c8c715
Binary files /dev/null and b/src/chronojump-importer/tests/padu-source.sqlite differ
diff --git a/src/chronojump-importer/tests/yoyo-destination.sqlite 
b/src/chronojump-importer/tests/yoyo-destination.sqlite
new file mode 100644
index 0000000..9d24151
Binary files /dev/null and b/src/chronojump-importer/tests/yoyo-destination.sqlite differ
diff --git a/src/chronojump-importer/tests/yoyo-expected.sqlite 
b/src/chronojump-importer/tests/yoyo-expected.sqlite
new file mode 100644
index 0000000..51e33ef
Binary files /dev/null and b/src/chronojump-importer/tests/yoyo-expected.sqlite differ
diff --git a/src/chronojump-importer/tests/yoyo-source.sqlite 
b/src/chronojump-importer/tests/yoyo-source.sqlite
new file mode 100644
index 0000000..9d24151
Binary files /dev/null and b/src/chronojump-importer/tests/yoyo-source.sqlite differ


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]