diff --git a/tests/data/pb_responses/user_studies.json b/tests/data/pb_responses/user_studies.json index 40aa65b3..18a0a00d 100644 --- a/tests/data/pb_responses/user_studies.json +++ b/tests/data/pb_responses/user_studies.json @@ -14,5 +14,13 @@ "Q_COMPLETE": true, "STUDYID": 65432, "TITLE": "Peanut butter consumption among quiet dogs" + }, + { + "DATE_MODIFIED": "2020-02-19T14:24:55.101695", + "HSRNUMBER": "45678", + "NETBADGEID": "dhf8r", + "Q_COMPLETE": true, + "STUDYID": 1, + "TITLE": "Efficacy of xenomorph bio-augmented circuits on dexterity of cybernetic prostheses" } ] diff --git a/tests/test_study_api.py b/tests/test_study_api.py index 4edeea8f..e4cd6425 100644 --- a/tests/test_study_api.py +++ b/tests/test_study_api.py @@ -68,10 +68,9 @@ class TestStudyApi(BaseTest): db_studies_before = session.query(StudyModel).all() num_db_studies_before = len(db_studies_before) + # Mock Protocol Builder response mock_get.return_value.ok = True mock_get.return_value.text = self.protocol_builder_response('user_studies.json') - # pb_response = ProtocolBuilderService.get_studies(self.test_uid) - # self.assertIsNotNone(pb_response) self.load_example_data() api_response = self.app.get('/v1.0/study', @@ -79,11 +78,6 @@ class TestStudyApi(BaseTest): headers=self.logged_in_headers(), content_type="application/json") self.assert_success(api_response) - - db_studies_after = session.query(StudyModel).all() - num_db_studies_after = len(db_studies_after) - self.assertGreater(num_db_studies_after, num_db_studies_before) - json_data = json.loads(api_response.get_data(as_text=True)) api_studies = StudyModelSchema(many=True).load(json_data, session=session) @@ -96,8 +90,13 @@ class TestStudyApi(BaseTest): else: num_active += 1 - self.assertEqual(num_inactive, num_db_studies_before) - self.assertEqual(num_active, num_db_studies_after - num_db_studies_before) + db_studies_after = session.query(StudyModel).all() + num_db_studies_after = len(db_studies_after) + self.assertGreater(num_db_studies_after, num_db_studies_before) + self.assertGreater(num_inactive, 0) + self.assertGreater(num_active, 0) + self.assertEqual(len(api_studies), num_db_studies_after) + self.assertEqual(num_active + num_inactive, num_db_studies_after) def test_study_api_get_single_study(self): self.load_example_data()