✅ Clean up tests

tests/diagnosis/test_diagnosis_resources.py

@@ -26,14 +26,7 @@ def test_post(self):
         """
         Test create a new diagnosis
         """
-        # Create study
-        study = Study(external_id='phs001')
-
-        # Create a participant
-        p = Participant(external_id='Test subject 0', is_proband=True,
-                        study=study)
-        db.session.add(p)
-        db.session.commit()
+        kwargs = self._create_save_to_db()
 
         # Create diagnosis data
         kwargs = {
@@ -42,7 +35,7 @@ def test_post(self):
             'age_at_event_days': 365,
             'diagnosis_category': 'cancer',
             'tumor_location': 'Brain',
-            'participant_id': p.kf_id
+            'participant_id': kwargs.get('participant_id')
         }
         # Send get request
         response = self.client.post(url_for(DIAGNOSES_LIST_URL),
@@ -60,6 +53,7 @@ def test_post(self):
             if k == 'participant_id':
                 continue
             self.assertEqual(diagnosis[k], getattr(dg, k))
+        self.assertEqual(2, Diagnosis.query.count())
 
     def test_post_missing_req_params(self):
         """

tests/participant/test_participant_resources.py

@@ -26,7 +26,6 @@ def test_post_participant(self):
         resp = json.loads(response.data.decode("utf-8"))
 
         self.assertEqual(response.status_code, 201)
-        self._test_response_content(resp, 201)
 
         self.assertIn('participant', resp['_status']['message'])
         self.assertIn('created', resp['_status']['message'])
@@ -77,7 +76,6 @@ def test_get_participant(self):
                                    headers=self._api_headers())
         resp = json.loads(response.data.decode("utf-8"))
         self.assertEqual(response.status_code, 200)
-        self._test_response_content(resp, 200)
 
         participant = resp['results']
         p = Participant.query.first()
@@ -123,7 +121,6 @@ def test_patch_participant(self):
 
         # Message
         resp = json.loads(response.data.decode("utf-8"))
-        self._test_response_content(resp, 200)
         self.assertIn('participant', resp['_status']['message'])
         self.assertIn('updated', resp['_status']['message'])
 
@@ -221,12 +218,3 @@ def _make_participant(self, external_id="TEST-0001"):
                                     headers=self._api_headers(),
                                     data=json.dumps(body))
         return response
-
-    def _test_response_content(self, resp, status_code):
-        """
-        Test that response body has expected fields
-        """
-        self.assertIn('results', resp)
-        self.assertIn('_status', resp)
-        self.assertIn('message', resp['_status'])
-        self.assertEqual(resp['_status']['code'], status_code)

tests/sample/test_sample_resources.py

@@ -25,15 +25,7 @@ def test_post(self):
         """
         Test create a new sample
         """
-        study = Study(external_id='phs001')
-        db.session.add(study)
-        db.session.commit()
-
-        # Create a participant
-        p = Participant(external_id='Test subject 0',
-                        is_proband=True, study_id=study.kf_id)
-        db.session.add(p)
-        db.session.commit()
+        kwargs = self._create_save_to_db()
 
         # Create sample data
         kwargs = {
@@ -43,7 +35,7 @@ def test_post(self):
             'anatomical_site': 'Brain',
             'age_at_event_days': 365,
             'tumor_descriptor': 'Metastatic',
-            'participant_id': p.kf_id
+            'participant_id': kwargs.get('participant_id')
         }
         # Send post request
         response = self.client.post(url_for(SAMPLES_LIST_URL),
@@ -59,6 +51,7 @@ def test_post(self):
         for k, v in kwargs.items():
             if k is not 'participant_id':
                 self.assertEqual(sample.get(k), v)
+        self.assertEqual(2, Sample.query.count())
 
     def test_post_missing_req_params(self):
         """

tests/test_api.py

@@ -99,19 +99,15 @@ def test_read_only(self, client, entities, endpoint, method, fields):
             assert (field not in body['results']
                     or body['results'][field] != 'test')
 
-    @pytest.mark.parametrize('endpoint, method, field', [
-        ('/participants', 'POST', 'blah'),
-        ('/participants', 'PATCH', 'blah'),
-        ('/demographics', 'PATCH', 'blah'),
-        ('/diagnoses', 'POST', 'blah'),
-        ('/diagnoses', 'PATCH', 'blah'),
-        ('/samples', 'POST', 'blah'),
-        ('/samples', 'PATCH', 'blah')
-    ])
-    def test_unknown_field(self, client, entities, endpoint, method, field):
+    @pytest.mark.parametrize('method', ['POST', 'PATCH'])
+    @pytest.mark.parametrize('endpoint', ['/participants',
+                                          '/demographics',
+                                          '/diagnoses',
+                                          '/samples'])
+    def test_unknown_field(self, client, entities, endpoint, method):
         """ Test that unknown fields are rejected when trying to create  """
         inputs = entities[endpoint]
-        inputs.update({field: 'test'})
+        inputs.update({'blah': 'test'})
         action = 'create'
         if method.lower() in {'put', 'patch'}:
             action = 'update'