Remedy Test License ID Clashing

Author: bencap

tests/helpers/constants.py

@@ -14,6 +14,7 @@
 VALID_GENE = "BRCA1"
 
 SAVED_PUBMED_PUBLICATION = {
+    "recordType": "PublicationIdentifier",
     "identifier": "20711194",
     "dbName": "PubMed",
     "title": "None",
@@ -28,6 +29,7 @@
 }
 
 SAVED_DOI_IDENTIFIER = {
+    "recordType": "DoiIdentifier",
     "identifier": TEST_CROSSREF_IDENTIFIER,
     "url": f"https://doi.org/{TEST_CROSSREF_IDENTIFIER}",
     "id": 1,
@@ -51,6 +53,7 @@
 }
 
 SAVED_CONTRIBUTOR = {
+    "recordType": "Contributor",
     "orcidId": TEST_USER["username"],
     "givenName": TEST_USER["first_name"],
     "familyName": TEST_USER["last_name"],
@@ -80,6 +83,7 @@
 }
 
 SAVED_EXTRA_CONTRIBUTOR = {
+    "recordType": "Contributor",
     "orcidId": EXTRA_USER["username"],
     "givenName": EXTRA_USER["first_name"],
     "familyName": EXTRA_USER["last_name"],
@@ -350,22 +354,14 @@
     "active": True,
 }
 
-TEST_INACTIVE_LICENSE = {
-    "id": 2,
-    "short_name": "Long",
-    "long_name": "Short",
-    "text": "Be evil.",
-    "link": "localhost",
-    "version": "1.0",
-    "active": False,
-}
-
 SAVED_SHORT_TEST_LICENSE = {
+    "recordType": "ShortLicense",
     "id": TEST_LICENSE["id"],
     "shortName": TEST_LICENSE["short_name"],
     "longName": TEST_LICENSE["long_name"],
     "link": TEST_LICENSE["link"],
     "version": TEST_LICENSE["version"],
+    "active": TEST_LICENSE["active"],
 }
 
 EXTRA_LICENSE = {
@@ -375,14 +371,37 @@
     "text": "Don't be tooooo evil.",
     "link": "localhost",
     "version": "1.0",
+    "active": True,
 }
 
 SAVED_SHORT_EXTRA_LICENSE = {
+    "recordType": "ShortLicense",
     "id": EXTRA_LICENSE["id"],
     "shortName": EXTRA_LICENSE["short_name"],
     "longName": EXTRA_LICENSE["long_name"],
     "link": EXTRA_LICENSE["link"],
     "version": EXTRA_LICENSE["version"],
+    "active": EXTRA_LICENSE["active"],
+}
+
+TEST_INACTIVE_LICENSE = {
+    "id": 3,
+    "short_name": "Long",
+    "long_name": "Short",
+    "text": "Be evil.",
+    "link": "localhost",
+    "version": "1.0",
+    "active": False,
+}
+
+SAVED_SHORT_INACTIVE_LICENSE = {
+    "recordType": "ShortLicense",
+    "id": TEST_INACTIVE_LICENSE["id"],
+    "shortName": TEST_INACTIVE_LICENSE["short_name"],
+    "longName": TEST_INACTIVE_LICENSE["long_name"],
+    "link": TEST_INACTIVE_LICENSE["link"],
+    "version": TEST_INACTIVE_LICENSE["version"],
+    "active": TEST_INACTIVE_LICENSE["active"],
 }
 
 TEST_SEQ_SCORESET = {

tests/routers/test_licenses.py

@@ -15,7 +15,7 @@ def test_can_list_licenses_as_any_user_class(setup_router_db, client, user_overr
 
     assert response.status_code == 200
     response_value = response.json()
-    assert len(response_value) == 2
+    assert len(response_value) == 3
 
 
 @pytest.mark.parametrize("user_overrides", [None, "anonymous_app_overrides", "admin_app_overrides"])
@@ -29,7 +29,7 @@ def test_can_list_active_licenses_as_any_user_class(setup_router_db, client, use
 
     assert response.status_code == 200
     response_value = response.json()
-    assert len(response_value) == 1
+    assert len(response_value) == 2
     license_state = [_license["active"] for _license in response_value]
     assert all(license_state)
 

tests/routers/test_score_set.py

@@ -29,6 +29,7 @@
     TEST_SAVED_SCORESET_RANGE,
     TEST_MINIMAL_ACC_SCORESET_RESPONSE,
     TEST_USER,
+    TEST_INACTIVE_LICENSE,
     SAVED_DOI_IDENTIFIER,
     SAVED_EXTRA_CONTRIBUTOR,
     SAVED_PUBMED_PUBLICATION,
@@ -1532,7 +1533,7 @@ def test_cannot_create_score_set_with_inactive_license(session, client, setup_ro
     experiment = create_experiment(client)
     score_set_post_payload = deepcopy(TEST_MINIMAL_SEQ_SCORESET)
     score_set_post_payload["experimentUrn"] = experiment["urn"]
-    score_set_post_payload["licenseId"] = 2
+    score_set_post_payload["licenseId"] = TEST_INACTIVE_LICENSE["id"]
     response = client.post("/api/v1/score-sets/", json=score_set_post_payload)
     assert response.status_code == 400
 
@@ -1541,7 +1542,7 @@ def test_cannot_modify_score_set_to_inactive_license(session, client, setup_rout
     experiment = create_experiment(client)
     score_set = create_seq_score_set(client, experiment["urn"])
     score_set_post_payload = score_set.copy()
-    score_set_post_payload.update({"licenseId": 2, "urn": score_set["urn"]})
+    score_set_post_payload.update({"licenseId": TEST_INACTIVE_LICENSE["id"], "urn": score_set["urn"]})
     response = client.put(f"/api/v1/score-sets/{score_set['urn']}", json=score_set_post_payload)
     assert response.status_code == 400