Increasing Coverage

Working to raise code coverage.

Working: #14

Author: OpenDataAlex

process_tracker/data_store.py

@@ -285,8 +285,8 @@ def topic_deleter(self, topic, name):
                     % (topic, name)
                 )
         else:
-            ClickException("Invalid topic.  Unable to delete instance.").show()
             self.logger.error("%s is an invalid topic.  Unable to delete." % topic)
+            raise ClickException("Invalid topic.  Unable to delete instance.")
 
         if item_delete:
             self.session.commit()
@@ -446,7 +446,7 @@ def verify_and_connect_to_data_store(self):
             errors.append(
                 Exception(
                     "Data store has not been properly configured.  Please read how to set up the "
-                    "Process Tracking data store by going to: <insert read the docs url here>"
+                    "Process Tracking data store by going to: https://process-tracker.readthedocs.io/en/latest/"
                 )
             )
 

process_tracker/extract_tracker.py

@@ -132,8 +132,10 @@ def add_dependency(self, dependency_type, dependency):
                 parent_extract_id=self.extract.extract_id,
             )
         else:
-            self.logger.error("Invalid dependency type.")
-            raise Exception("Invalid extract dependency type.")
+            self.logger.error("Invalid extract dependency type.")
+            raise Exception(
+                "%s is an invalid extract dependency type." % dependency_type
+            )
 
         self.session.add(dependency)
         self.session.commit()
@@ -148,7 +150,7 @@ def change_extract_status(self, new_status):
         status_date = datetime.now()
         if new_status in self.extract_status_types:
 
-            if new_status == self.extract_status_loading:
+            if new_status == "loading":
 
                 self.extract_dependency_check()
 

process_tracker/process_tracker.py

@@ -110,7 +110,7 @@ def change_run_status(self, new_status, end_date=None):
         if end_date is None:
             end_date = datetime.now()
 
-        if self.process_status_types[new_status]:
+        if new_status in self.process_status_types.keys():
 
             self.process_tracking_run.process_status_id = self.process_status_types[
                 new_status
@@ -134,10 +134,7 @@ def change_run_status(self, new_status, end_date=None):
             self.session.commit()
 
         else:
-            raise Exception(
-                "%s is not a valid process status type.  "
-                "Please add the status to process_status_type_lkup" % new_status
-            )
+            raise Exception("The provided status type %s is invalid." % new_status)
 
     def find_ready_extracts_by_filename(self, filename):
         """

tests/test_cli.py

@@ -108,6 +108,18 @@ def test_create_error_type(self):
 
         self.assertEqual(0, result.exit_code)
 
+    # def test_create_invalid_type(self):
+    #     """
+    #     Testing that when an invalid type is passed to the create option, an exception occurs.
+    #     :return:
+    #     """
+    #     given_result = self.runner.invoke(main, 'create -t blarg -n "Argle Bargle"')
+    #     given_result = given_result.exception
+    #
+    #     expected_result = "Invalid topic type."
+    #
+    #     return self.assertEqual(expected_result, given_result)
+
     def test_create_process_type(self):
         """
         Testing that when creating an process type record it is added.
@@ -270,6 +282,18 @@ def test_delete_error_type_protected(self):
         self.assertIn(expected_result, result.output)
         self.assertEqual(0, result.exit_code)
 
+    # def test_delete_invalid_type(self):
+    #     """
+    #     Testing that when an invalid type is passed to the delete option, an exception occurs.
+    #     :return:
+    #     """
+    #     given_result = self.runner.invoke(main, 'delete -t blarg -n "Argle Bargle"')
+    #     given_result = given_result.exception
+    #
+    #     expected_result = "Invalid topic.  Unable to delete instance."
+    #
+    #     return self.assertEqual(expected_result, given_result)
+
     def test_delete_process_type(self):
         """
         Testing that when deleting an process type record not on the protected list, it is deleted.
@@ -466,6 +490,20 @@ def test_update_error_type_protected(self):
 
         self.assertIn(expected_result, result.output)
 
+    # def test_update_invalid_type(self):
+    #     """
+    #     Testing that when an invalid type is passed to the update option, an exception occurs.
+    #     :return:
+    #     """
+    #     given_result = self.runner.invoke(
+    #         main, 'update -t blarg -i "Testing" -n "Argle Bargle"'
+    #     )
+    #     given_result = given_result.exception
+    #
+    #     expected_result = "Invalid topic.  Unable to delete instance."
+    #
+    #     return self.assertEqual(expected_result, given_result)
+
     def test_update_process_type(self):
         """
          Testing that when updating a process type record not on the protected list, it is updated.

tests/test_extract_tracker.py

@@ -124,6 +124,20 @@ def test_add_dependency_child(self):
 
         self.assertEqual(expected_result, given_result)
 
+    def test_add_dependency_invalid_type(self):
+        """
+        Ensuring that when a dependency is added, only 'parent' and 'child' are accepted.
+        :return:
+        """
+
+        with self.assertRaises(Exception) as context:
+            self.extract.add_dependency(
+                dependency_type="blarg", dependency=self.extract.extract
+            )
+        return self.assertTrue(
+            "blarg is an invalid extract dependency type." in str(context.exception)
+        )
+
     def test_initialization_no_location_no_location_path(self):
         """
         Testing that if no location or location path is set, an error is thrown.

tests/test_process_tracker.py

@@ -125,6 +125,17 @@ def timestamp_converter(self, timestamp):
 
         return timestamp
 
+    def test_change_status_invalid_type(self):
+        """
+        Testing that if an invalid process status type is passed, it will trigger an exception.
+        :return:
+        """
+        with self.assertRaises(Exception) as context:
+            self.process_tracker.change_run_status(new_status="blarg")
+        return self.assertTrue(
+            "The provided status type blarg is invalid." in str(context.exception)
+        )
+
     def test_find_ready_extracts_by_filename_full(self):
         """
         Testing that for the given full filename, find the extract, provided it's in 'ready' state.
@@ -538,7 +549,7 @@ def test_register_new_process_run_exception(self):
         with self.assertRaises(Exception) as context:
             # Running registration a second time to mimic job being run twice
             self.process_tracker.register_new_process_run()
-        print(context.exception)
+
         return self.assertTrue(
             "The process Testing Process Tracking Initialization "
             "is currently running." in str(context.exception)