bugfix SDC-1663

atdb/taskdatabase/tests/test_calculated_qualities.py

@@ -111,7 +111,7 @@ class TestCalculatedQualities(TestCase):
             quality_values = qualities.unpack_qualities_per_task(task,quality_values)
 
             try:
-                quality_per_sasid = task.calculated_qualities['per_sasid']
+                quality_per_sasid = task.activity.calculated_quality
             except:
                 # ignore the tasks that have no calculated quality.
                 pass
@@ -146,7 +146,7 @@ class TestCalculatedQualities(TestCase):
                 quality_indicators = task.quality_json["summary"]['details']['quality_indicators']
 
             try:
-                quality_per_sasid = task.calculated_qualities['per_sasid']
+                quality_per_sasid = task.activity.calculated_quality
             except:
                 # ignore the tasks that have no calculated quality.
                 pass
@@ -194,7 +194,7 @@ class TestCalculatedQualities(TestCase):
             quality_values = qualities.unpack_qualities_per_task(task,quality_values)
 
             try:
-                quality_per_sasid = task.calculated_qualities['per_sasid']
+                quality_per_sasid = task.activity.calculated_quality
             except:
                 # ignore the tasks that have no calculated quality.
                 pass
@@ -231,7 +231,7 @@ class TestCalculatedQualities(TestCase):
             quality_values = qualities.unpack_qualities_per_task(task,quality_values)
 
             try:
-                quality_per_sasid = task.calculated_qualities['per_sasid']
+                quality_per_sasid = task.activity.calculated_quality
             except:
                 # ignore the tasks that have no calculated quality.
                 pass
@@ -368,12 +368,10 @@ class TestCalculatedQualities(TestCase):
         # Act
         task.save()
         qualities_per_task = task.calculated_qualities['per_task']
-        quality_per_sasid = task.calculated_qualities['per_sasid']
 
         # Assert
         # good is based on rfi_percent
         self.assertEqual(qualities_per_task,expected_qualities_per_task)
 
         # also check if the quality per sas_id was stored in the expected locations
-        self.assertEqual(quality_per_sasid, "moderate")
         self.assertEqual(task.activity.calculated_quality, "moderate")
\ No newline at end of file

atdb/taskdatabase/tests/test_views.py

@@ -394,29 +394,7 @@ class TestViews(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(self.task1.remarks['discard_reason'], 'no longer needed')
 
-    @patch('taskdatabase.views.Task.objects.get')
-    @patch('taskdatabase.views.Task.objects.filter')
-    def test_validate_sasid(self, mock_filter, mock_get):
-        """
-        test TaskValidatedSasId
-        """
 
-        # Arrange
-        mock_get.return_value = self.task5
-        mock_filter.return_value = [self.task5, self.task6]
-
-        request = self.factory.get('/dummy-url')
-        self._set_up_session(request)
-        request.user = self.user
-
-        # Act
-        response = TaskValidateSasId(request, self.task5.id, quality='calculated', new_status="validated", page="0")
-
-        # Assert
-        self.assertEqual(self.task5.quality, 'good')
-        self.assertEqual(self.task6.quality, 'good')
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, reverse('validation') + '?' + 'page=0')
 
 
     @patch('taskdatabase.views.Task.objects.get')