diff --git a/pom.xml b/pom.xml index 5446e9a56b02c5acf8b349e5a1c3eca7845a5da3..2f88d6105284a1298bd8ab5fd11b961f11a03305 100755 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,11 @@ <version>4.7.9.Final</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-api</artifactId> + <version>30.1</version> + </dependency> <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> @@ -204,7 +209,7 @@ <dependency> <groupId>no.nibio.vips</groupId> <artifactId>VIPSCommon</artifactId> - <version>2.0.1</version> + <version>2.0.3-SNAPSHOT</version> </dependency> <dependency> <groupId>javax</groupId> diff --git a/selenium/tests/test_selenium.py b/selenium/tests/test_selenium.py index 45d44fdffd11f0106ad1a5edec3744ae763560da..73886a89623ffd01a4268b10895e49c516c5674e 100644 --- a/selenium/tests/test_selenium.py +++ b/selenium/tests/test_selenium.py @@ -7,7 +7,12 @@ from selenium.webdriver.support import expected_conditions as EC # https://github.com/SeleniumHQ/seleniumhq.github.io/blob/trunk/examples/python/README.md # BROWSER = 'chrome' -BROWSER = "firefox" +# BROWSER = "firefox" +BROWSER = "edge" + +HOST_URL = "http://vipslogic-local.no/" +#HOST_URL = "https://logic.testvips.nibio.no" +#HOST_URL = "https://logic.vips.nibio.no" @pytest.fixture @@ -20,10 +25,15 @@ def browser(): firefox_options = webdriver.FirefoxOptions() firefox_options.headless = False driver = webdriver.Firefox(options=firefox_options) + elif BROWSER == "edge": + edge_options = webdriver.EdgeOptions() + edge_options.headless = False + driver = webdriver.Edge(options=edge_options) else: raise Exception("Browser must be set to either chrome or firefox") - driver.get("http://vipslogic/index.html") + #driver.get("http://vipslogic/index.html") + driver.get(f"{HOST_URL}/index.html") assert driver.title == "Please log in" driver.implicitly_wait(0.5) @@ -45,7 +55,7 @@ def test_admin_organisms(browser): link = WebDriverWait(browser, 15).until( EC.element_to_be_clickable((By.XPATH, '//a[text()="Organisms"]')) ) - assert link.get_attribute("href") == "http://vipslogic/organism" + assert link.get_attribute("href") == f"{HOST_URL}/organism" link.click() assert browser.title == "Organisms" link = WebDriverWait(browser, 15).until( @@ -60,7 +70,7 @@ def test_admin_scheduling(browser): link = WebDriverWait(browser, 10).until( EC.element_to_be_clickable((By.XPATH, '//a[text()="Scheduling"]')) ) - assert link.get_attribute("href") == "http://vipslogic/scheduling" + assert link.get_attribute("href") == f"{HOST_URL}/scheduling" link.click() assert browser.title == "Scheduling overview" @@ -70,7 +80,7 @@ def test_admin_organization_group(browser): link = WebDriverWait(browser, 10).until( EC.element_to_be_clickable((By.XPATH, '//a[text()="Organization groups"]')) ) - assert link.get_attribute("href") == "http://vipslogic/organizationgroup" + assert link.get_attribute("href") == f"{HOST_URL}/organizationgroup" link.click() assert browser.title == "Organization groups" @@ -80,7 +90,7 @@ def test_admin_apple_fruit_moth(browser): link = WebDriverWait(browser, 10).until( EC.element_to_be_clickable((By.XPATH, '//a[text()="Apple fruit moth"]')) ) - assert link.get_attribute("href") == "http://vipslogic/applefruitmoth" + assert link.get_attribute("href") == f"{HOST_URL}/applefruitmoth" link.click() assert browser.title == "Rognebærmøllstasjoner" @@ -90,7 +100,7 @@ def test_admin_users(browser): link = WebDriverWait(browser, 20).until( EC.element_to_be_clickable((By.XPATH, '//a[text()="Users"]')) ) - assert link.get_attribute("href") == "http://vipslogic/user" + assert link.get_attribute("href") == f"{HOST_URL}/user" link.click() WebDriverWait(browser, 20).until( EC.visibility_of_element_located((By.XPATH, "//h1[text()='Users']")) @@ -103,7 +113,7 @@ def test_admin_forecasts(browser): link = WebDriverWait(browser, 20).until( EC.element_to_be_clickable((By.XPATH, '//a[text()="Forecasts"]')) ) - assert link.get_attribute("href") == "http://vipslogic/forecastConfiguration" + assert link.get_attribute("href") == f"{HOST_URL}/forecastConfiguration" link.click() WebDriverWait(browser, 20).until( EC.visibility_of_element_located((By.XPATH, "//h1[text()='Forecasts']")) diff --git a/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java b/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java index 600e163fe2d7527463ea8d087b13d60328a27142..b28098ff7f01144011fdb24b80b5a11d6246c1a4 100644 --- a/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java +++ b/src/main/java/no/nibio/vips/logic/controller/session/SessionControllerGetter.java @@ -34,7 +34,7 @@ public class SessionControllerGetter { // This obviously has to be changed when changing the application name in Maven // TODO: Refactor out to System properties (e.g. in standalone.xml in JBoss/WildFly) - public static final String JNDI_PATH = "java:global/VIPSLogic-2023.1/"; + public static final String JNDI_PATH = "java:global/VIPSLogic-2024.1/"; public static SchedulingBean getSchedulingBean() { diff --git a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java index 06e7363b938c4d32745695a4e713c60ad3e33ce7..be9bc11cda555726f828c73e5f3e31b4c5de2a66 100644 --- a/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java +++ b/src/main/java/no/nibio/vips/logic/modules/barkbeetle/BarkbeetleBean.java @@ -50,10 +50,7 @@ import javax.persistence.PersistenceContext; import org.geotools.geometry.jts.JTS; import org.geotools.referencing.CRS; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.TransformException; + import no.nibio.vips.logic.controller.session.SessionControllerGetter; import no.nibio.vips.logic.controller.session.UserBean; @@ -67,6 +64,10 @@ import no.nibio.vips.logic.messaging.UniversalMessageFormat; import no.nibio.vips.logic.util.GISEntityUtil; import no.nibio.vips.logic.util.Globals; import no.nibio.vips.logic.util.SimpleMailSender; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; +import org.geotools.api.referencing.operation.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory;