move tests to testing/

gdcc · Apr 14, 2021 · 4bc100e · 4bc100e
1 parent fa6e5b3
commit 4bc100e
Show file tree

Hide file tree

Showing 27 changed files with 73 additions and 159 deletions.
diff --git a/tests/__init__.py → testing/__init__.py b/tests/__init__.py → testing/__init__.py
diff --git a/tests/config.py → testing/config.py b/tests/config.py → testing/config.py
@@ -1,9 +1,11 @@
 import os
+
 from pydantic import BaseSettings
 
 
 class Config(BaseSettings):
     INSTANCE: str
+    API_TOKEN: str = ""
     USER_AGENT: str = None
     HEADLESS: bool = True
     BROWSER: list = None

diff --git a/tests/conftest.py → testing/conftest.py b/tests/conftest.py → testing/conftest.py
@@ -1,9 +1,11 @@
-from json import load
 import os
+from json import load
 from time import sleep
+
 import pytest
 from selenium import webdriver
 from selenium.webdriver.common.by import By
+
 from .config import Config
 
 
@@ -95,12 +97,11 @@ def login_normal_user(driver, test_config, config, user, password):
     return driver
 
 
-def login_shibboleth_user(driver, test_config, config, user, password):
-    base_url = test_config["instance"]["base-url"]
+def login_shibboleth_user(driver, base_url, width, height, user, password, name):
     driver.get(f"{base_url}/loginpage.xhtml")
     sleep(5)
-    driver.set_window_size(config.WINDOW_WIDTH, config.WINDOW_HEIGHT)
-    sleep(5)
+    driver.set_window_size(width, height)
+    sleep(10)
     driver.find_element(By.ID, "idpSelectSelector").click()
     sleep(1)
     dropdown = driver.find_element(By.ID, "idpSelectSelector")
@@ -118,6 +119,7 @@ def login_shibboleth_user(driver, test_config, config, user, password):
         driver.find_element(By.ID, "_shib_idp_accept_TOU").click()
         driver.find_element(By.NAME, "_eventId_proceed").click()
         sleep(5)
+    assert driver.find_element(By.ID, "userDisplayInfoTitle").text == name
     return driver
 
 

diff --git a/tests/data/dataverse_test-upload.json → testing/data/dataverse_test-upload.json b/tests/data/dataverse_test-upload.json → testing/data/dataverse_test-upload.json
diff --git a/...instances/dataverse_dv03/test-config.json → ...instances/dataverse_dv03/test-config.json b/...instances/dataverse_dv03/test-config.json → ...instances/dataverse_dv03/test-config.json
diff --git a/...instances/dataverse_dv05/test-config.json → ...instances/dataverse_dv05/test-config.json b/...instances/dataverse_dv05/test-config.json → ...instances/dataverse_dv05/test-config.json
diff --git a/...dataverse_localhost_t550/test-config.json → ...dataverse_localhost_t550/test-config.json b/...dataverse_localhost_t550/test-config.json → ...dataverse_localhost_t550/test-config.json
diff --git a/...ces/dataverse_production/test-config.json → ...ces/dataverse_production/test-config.json b/...ces/dataverse_production/test-config.json → ...ces/dataverse_production/test-config.json
diff --git a/tests/data/instances/website/test-data.json → ...ing/data/instances/website/test-data.json b/tests/data/instances/website/test-data.json → ...ing/data/instances/website/test-data.json
diff --git a/tests/dataverse/__init__.py → testing/dataverse/__init__.py b/tests/dataverse/__init__.py → testing/dataverse/__init__.py
diff --git a/tests/dataverse/suite_basic.py → testing/dataverse/suite_basic.py b/tests/dataverse/suite_basic.py → testing/dataverse/suite_basic.py
@@ -7,4 +7,3 @@
 from .test_sitemap import *
 from .test_user_authentication import *
 from .test_user_profile import *
-
diff --git a/tests/dataverse/suite_data.py → testing/dataverse/suite_data.py b/tests/dataverse/suite_data.py → testing/dataverse/suite_data.py
@@ -1,3 +1,3 @@
-from .test_dataverses import *
-from .test_datasets import *
 from .test_datafiles import *
+from .test_datasets import *
+from .test_dataverses import *
diff --git a/tests/dataverse/test_api.py → testing/dataverse/test_api.py b/tests/dataverse/test_api.py → testing/dataverse/test_api.py
diff --git a/tests/dataverse/test_datafiles.py → testing/dataverse/test_datafiles.py b/tests/dataverse/test_datafiles.py → testing/dataverse/test_datafiles.py
@@ -4,7 +4,9 @@
 import pytest
 import requests
 
-from ..conftest import get_instance_dir, read_json, login_normal_user
+from ..conftest import get_instance_dir
+from ..conftest import login_normal_user
+from ..conftest import read_json
 
 
 class TestDatafiles:

diff --git a/tests/dataverse/test_datasets.py → testing/dataverse/test_datasets.py b/tests/dataverse/test_datasets.py → testing/dataverse/test_datasets.py
@@ -4,7 +4,9 @@
 import pytest
 import requests
 
-from ..conftest import get_instance_dir, read_json, login_normal_user
+from ..conftest import get_instance_dir
+from ..conftest import login_normal_user
+from ..conftest import read_json
 
 
 class TestDatasets:
@@ -23,29 +25,25 @@ def test_all_datasets(self, config, test_config, firefox):
             config.USER_SUPERUSER_PWD,
         )
 
-        for ds in datasets:
+        for ds in datasets:  # TODO: remove list subscripting
             url = f"{base_url}/dataset.xhtml?persistentId={ds['pid']}"
             firefox.get(url)
             sleep(1)
             assert url == firefox.current_url
 
-    def test_all_doiorg_pages(self, config, test_config, firefox):
+    def test_all_doiorg_pages(self, config, test_config):
         if not test_config["tests"]["all-datasets"]["test"]:
             pytest.skip("Test not configured to be executed.")
 
         instance_dir = get_instance_dir(config)
         datasets = read_json(os.path.join(instance_dir, config.FILENAME_DATASETS))
-        firefox = login_normal_user(
-            firefox,
-            test_config,
-            config,
-            config.USER_SUPERUSER,
-            config.USER_SUPERUSER_PWD,
-        )
+        base_url = test_config["instance"]["base-url"]
 
         # Resolve doi.org URL
         for ds in datasets:
-            url = f"https://doi.org/{ds['pid'][4:]}"
-            firefox.get(url)
+            url_start = f"https://doi.org/{ds['pid'][4:]}"
+            url_end = f"{base_url}/dataset.xhtml?persistentId={ds['pid']}"
+            resp = requests.get(url_start)
             sleep(3)
-            assert url == firefox.current_url
+            assert resp.status_code == 200
+            assert url_end == resp.current_url
diff --git a/tests/dataverse/test_dataverses.py → testing/dataverse/test_dataverses.py b/tests/dataverse/test_dataverses.py → testing/dataverse/test_dataverses.py
@@ -3,7 +3,9 @@
 
 import pytest
 
-from ..conftest import get_instance_dir, read_json, login_normal_user
+from ..conftest import get_instance_dir
+from ..conftest import login_normal_user
+from ..conftest import read_json
 
 
 class TestDataverses:

diff --git a/testing/dataverse/test_homepage.py b/testing/dataverse/test_homepage.py
@@ -0,0 +1,10 @@
+import os
+from time import sleep
+
+import pytest
+import requests
+from selenium.webdriver.common.by import By
+
+from ..conftest import click_cookie_rollbar
+from ..conftest import get_instance_dir
+from ..conftest import read_json
diff --git a/tests/dataverse/test_metadata_server.py → testing/dataverse/test_metadata_server.py b/tests/dataverse/test_metadata_server.py → testing/dataverse/test_metadata_server.py
diff --git a/tests/dataverse/test_resources.py → testing/dataverse/test_resources.py b/tests/dataverse/test_resources.py → testing/dataverse/test_resources.py
diff --git a/tests/dataverse/test_robots_txt.py → testing/dataverse/test_robots_txt.py b/tests/dataverse/test_robots_txt.py → testing/dataverse/test_robots_txt.py
diff --git a/tests/dataverse/test_search.py → testing/dataverse/test_search.py b/tests/dataverse/test_search.py → testing/dataverse/test_search.py
diff --git a/tests/dataverse/test_sitemap.py → testing/dataverse/test_sitemap.py b/tests/dataverse/test_sitemap.py → testing/dataverse/test_sitemap.py
diff --git a/tests/dataverse/test_user_authentication.py → ...ing/dataverse/test_user_authentication.py b/tests/dataverse/test_user_authentication.py → ...ing/dataverse/test_user_authentication.py
@@ -4,15 +4,19 @@
 import requests
 from selenium.webdriver.common.by import By
 
-from ..conftest import login_normal_user, login_shibboleth_user
+from ..conftest import login_normal_user
+from ..conftest import login_shibboleth_user
 
 
-class TestUserAuthentication:
-    def test_shibboleth_interfaces(self, test_config):
-        if not test_config["tests"]["login"]["shibboleth-endpoint"]["test"]:
+class TestShibboleth:
+    def test_interfaces(self, test_config):
+        test_cfg = test_config["tests"]["login"]["shibboleth-endpoint"]
+        instance_cfg = test_config["instance"]
+
+        if not test_cfg:
             pytest.skip("Test not configured to be executed.")
 
-        base_url = test_config["instance"]["base-url"]
+        base_url = instance_cfg["base-url"]
         url = f"{base_url}/Shibboleth.sso/DiscoFeed"
         resp = requests.get(url)
         sleep(3)
@@ -27,34 +31,44 @@ def test_shibboleth_interfaces(self, test_config):
         assert resp.status_code == 200
         assert resp.url == url
 
-    def test_login_normal_user(self, test_config, config, browser):
-        if not test_config["tests"]["login"]["normal-user"]["test"]:
+    def test_login(self, test_config, config, browser):
+        test_cfg = test_config["tests"]["login"]["shibboleth-user"]
+        instance_cfg = test_config["instance"]
+
+        if not test_cfg["test"]:
             pytest.skip("Test not configured to be executed.")
 
         for name, driver in browser.items():
-            driver = login_normal_user(
-                driver, test_config, config, config.USER_NORMAL, config.USER_NORMAL_PWD,
+            driver = login_shibboleth_user(
+                driver,
+                test_cfg["base-url"],
+                config.WINDOW_WIDTH,
+                config.WINDOW_,
+                config.USER_SHIBBOLETH,
+                config.USER_SHIBBOLETH_PWD,
+                config.USER_SHIBBOLETH_NAME,
             )
-            assert test_config["instance"]["title"] == driver.title
+            assert instance_cfg["title"] == driver.title
             assert (
                 driver.find_element(By.ID, "userDisplayInfoTitle").text
-                == config.USER_NORMAL_NAME
+                == config.USER_SHIBBOLETH_NAME
             )
 
-    def test_login_shibboleth_user(self, test_config, config, browser):
-        if not test_config["tests"]["login"]["shibboleth-user"]["test"]:
+
+class TestNormalLogin:
+    def test_login(self, test_config, config, browser):
+        test_cfg = test_config["tests"]["login"]["normal-user"]
+        instance_cfg = test_config["instance"]
+
+        if not test_cfg["test"]:
             pytest.skip("Test not configured to be executed.")
 
         for name, driver in browser.items():
-            driver = login_shibboleth_user(
-                driver,
-                test_config,
-                config,
-                config.USER_SHIBBOLETH,
-                config.USER_SHIBBOLETH_PWD,
+            driver = login_normal_user(
+                driver, test_config, config, config.USER_NORMAL, config.USER_NORMAL_PWD,
             )
-            assert test_config["instance"]["title"] == driver.title
+            assert instance_cfg["title"] == driver.title
             assert (
                 driver.find_element(By.ID, "userDisplayInfoTitle").text
-                == config.USER_SHIBBOLETH_NAME
+                == config.USER_NORMAL_NAME
             )
diff --git a/tests/dataverse/test_user_profile.py → testing/dataverse/test_user_profile.py b/tests/dataverse/test_user_profile.py → testing/dataverse/test_user_profile.py
diff --git a/tests/website/__init__.py → testing/website/__init__.py b/tests/website/__init__.py → testing/website/__init__.py
diff --git a/tests/website/test_resources.py → testing/website/test_resources.py b/tests/website/test_resources.py → testing/website/test_resources.py
diff --git a/tests/dataverse/test_homepage.py b/tests/dataverse/test_homepage.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@
		from .test_sitemap import *
		from .test_user_authentication import *
		from .test_user_profile import *