WIP: tests scicrunch

Author: pcrespov

services/web/server/tests/unit/isolated/test_groups_classifiers.py

@@ -6,6 +6,7 @@
 ####################################################################################################################
 # NOTES
 
+
 #
 # To check times pytest --pdb -vv --durations=0  tests/unit/isolated/test_classifiers.py
 #
@@ -52,13 +53,32 @@
 import re
 from collections import defaultdict
 from copy import deepcopy
-from typing import List
+from typing import DefaultDict, List, Set
 
 from pydantic import BaseModel, Field
 
 # TODO: emulate server for testing
 # TODO:
 
+GROUP_CLASSIFIER_SAMPLE = {
+    "build_date": "2020-12-14T18:10:00Z",
+    "classifiers": {
+        "Programming Language::Python": {
+            "classifier": "RRID:SCR_008394",
+            "display_name": "Python",
+            "short_description": "Python Programming Language",
+        },
+        "Programming Language::Octave": {
+            "classifier": "RRID:SCR_014398",
+            "display_name": "GNU Octave",
+        },
+        "Jupyter Notebook": {
+            "classifier": "RRID:SCR_018315",
+            "display_name": "Jupyter Notebook",
+        },
+    },
+}
+
 
 SPLIT_STRIP_PATTERN = r"[^:\s][^:]*[^:\s]*"
 

services/web/server/tests/unit/isolated/test_scicrunch.py

@@ -9,11 +9,9 @@
 import pytest
 from aiohttp import ClientSession
 from servicelib.client_session import get_client_session
-from simcore_service_webserver.scicrunch import (
-    SciCrunchAPI,
-    SciCrunchSettings,
-    ValidationResult,
-)
+from simcore_service_webserver.scicrunch import SciCrunchAPI, SciCrunchSettings
+from simcore_service_webserver.scicrunch_api import ValidationResult
+from simcore_service_webserver.scicrunch_models import ListOfResourceHits
 
 # TODO: emulate server for testing
 RRID_PORTAL_API_KEY = os.environ.get("RRID_PORTAL_API_KEY")
@@ -29,19 +27,32 @@ async def fake_app(monkeypatch, loop):
 
 
 @pytest.fixture
-async def scicrunch(fake_app):
-    scicrunch_api = SciCrunchAPI.create_instance(
+async def scicrunch(fake_app) -> SciCrunchAPI:
+    scicrunch_api = SciCrunchAPI.acquire_instance(
         app=fake_app, settings=SciCrunchSettings(api_key=RRID_PORTAL_API_KEY)
     )
     assert scicrunch_api is SciCrunchAPI.get_instance(fake_app)
     return scicrunch_api
 
 
+# From https://scicrunch.org/resources
+VALID_RRID_SAMPLES = [
+    ("Antibody", "RRID:AB_90755"),
+    ("Plasmid", "RRID:Addgene_44362"),
+    ("Organism", "RRID:MMRRC_026409-UCD"),
+    ("Cell Line", "RRID:CVCL_0033"),
+    ("Tool", "RRID:SCR_007358"),
+]
+
+
+## TESTS -------------------------------------------------------
+
+
 @pytest.mark.skipif(
     RRID_PORTAL_API_KEY is None,
     reason="Testing agains actual service is intended for manual exploratory testing",
 )
-async def test_scicrunch_api_specs(loop):
+async def test_scicrunch_service_api_specs(loop):
     async with ClientSession() as client:
         resp = await client.get("https://scicrunch.org/swagger-docs/swagger.json")
         openapi_specs = await resp.json()
@@ -63,9 +74,10 @@ async def test_scicrunch_api_specs(loop):
         ("Octave", "RRID:SCR_014398"),  # TODO: should be valid!
         (None, "SCR_INVALID_XXXXX"),
         (None, "ANOTHER_INVALID_RRID"),
-    ],
+    ]
+    + VALID_RRID_SAMPLES,
 )
-async def test_rrid_validation(name, rrid, scicrunch):
+async def test_scicrunch_service_rrid_validation(name, rrid, scicrunch):
 
     validation_result = await scicrunch.validate_rrid(rrid)
 
@@ -85,8 +97,36 @@ async def test_rrid_validation(name, rrid, scicrunch):
         ("Language::Python", "SCR_008394"),
         ("Language::Octave", "SCR_014398"),
         ("osparc", "SCR_018997"),  # proper citation: (o²S²PARC, RRID:SCR_018997)
-    ],
+    ]
+    + VALID_RRID_SAMPLES,
 )
-async def test_get_rrid_fields(name, rrid, scicrunch):
+async def test_scicrunch_service_get_rrid_fields(name, rrid, scicrunch):
+    assert name is not None
     resource = await scicrunch.get_resource_fields(rrid)
     assert resource.scicrunch_id == rrid
+
+
+@pytest.mark.skipif(
+    RRID_PORTAL_API_KEY is None,
+    reason="Testing agains actual service is intended for manual exploratory testing",
+)
+async def test_scicrunch_service_autocomplete(scicrunch):
+
+    expected = ListOfResourceHits(
+        __root__=[
+            {
+                "rid": "SCR_000860",
+                "original_id": "nlx_155680",
+                "name": "cbiNifti: Matlab/Octave Nifti library",
+            },
+            {
+                "rid": "SCR_009637",
+                "original_id": "nlx_155924",
+                "name": "Pipeline System for Octave and Matlab",
+            },
+            {"rid": "SCR_014398", "original_id": "SCR_014398", "name": "GNU Octave"},
+        ]
+    )
+
+    hits = await scicrunch.search_resource("octave")
+    assert expected == hits