fix test (#7078)

Hack23 · Jan 23, 2025 · 2eeb00f · 2eeb00f
1 parent d1732d4
commit 2eeb00f
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 53 deletions.
diff --git a/citizen-intelligence-agency/pom.xml b/citizen-intelligence-agency/pom.xml
@@ -1694,15 +1694,8 @@
           <excludes>
             <exclude>**/*$*</exclude>
           </excludes>
-          <systemPropertyVariables>
-            <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
-          </systemPropertyVariables>
-          <argLine>
-            --add-opens java.base/java.lang=ALL-UNNAMED
-            --add-opens java.base/java.util=ALL-UNNAMED
-            --add-opens java.base/java.lang.reflect=ALL-UNNAMED
-            -Xmx2048m
-          </argLine>
+          <argLine>${surefireArgLine} ${testAdditionalRuntimeArgLine}</argLine>
+          <useModulePath>false</useModulePath>
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
         </configuration>

diff --git a/...ntelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractUITest.java b/...ntelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/AbstractUITest.java
@@ -1,11 +1,8 @@
 package com.hack23.cia.systemintegrationtest;
 
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.openqa.selenium.WebDriver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.hack23.cia.systemintegrationtest.ui.TestConstants;
 import com.hack23.cia.systemintegrationtest.ui.UserPageVisit;
@@ -16,16 +13,11 @@
  */
 public abstract class AbstractUITest extends AbstractRoleSystemITest {
 
-	/** The Constant LOG. */
-	private static final Logger LOG = LoggerFactory.getLogger(AbstractUITest.class);
 
 	/** The Constant DEFAULT_TIMEOUT. */
 	protected static final long DEFAULT_TIMEOUT = TestConstants.DEFAULT_TIMEOUT;
 
-	/** The Constant BASE_URL. */
-	protected static final String BASE_URL = System.getProperty("system.test.target.url",
-			CitizenIntelligenceAgencyServer.ACCESS_URL);
-
+
 	/** The driver. */
 	protected static WebDriver driver;
 
@@ -37,21 +29,10 @@ public abstract class AbstractUITest extends AbstractRoleSystemITest {
 	 */
 	@BeforeClass
 	public static void globalSetup() {
-		LOG.info("Setting up test with browser");
 		driver = WebDriverFactory.createDriver();
 		pageVisit = new UserPageVisit(driver);
 	}
 
-	/**
-	 * Global teardown.
-	 */
-	@AfterClass
-	public static void globalTeardown() {
-		LOG.info("Tearing down WebDriver after all tests have run");
-		if (driver != null) {
-			driver.quit();
-		}
-	}
 
 	@After
 	public void cleanBrowser() {

diff --git a/...gency/src/test/java/com/hack23/cia/systemintegrationtest/suites/IntegrationTestSuite.java b/...gency/src/test/java/com/hack23/cia/systemintegrationtest/suites/IntegrationTestSuite.java
@@ -1,20 +1,21 @@
 package com.hack23.cia.systemintegrationtest.suites;
 
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.openqa.selenium.WebDriver;
 
 import com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer;
 import com.hack23.cia.systemintegrationtest.admin.configuration.AdminConfigurationTest;
 import com.hack23.cia.systemintegrationtest.admin.data.AdminDataTest;
 import com.hack23.cia.systemintegrationtest.admin.operations.AdminOperationsTest;
 import com.hack23.cia.systemintegrationtest.admin.security.AdminSecurityTest;
+import com.hack23.cia.systemintegrationtest.ui.UserPageVisit;
+import com.hack23.cia.systemintegrationtest.ui.WebDriverFactory;
 import com.hack23.cia.systemintegrationtest.user.home.UserHomeTest;
 
-import io.github.bonigarcia.wdm.WebDriverManager;
-import io.github.bonigarcia.wdm.config.DriverManagerType;
-
 /**
  * The Class IntegrationTestSuite.
  */
@@ -27,11 +28,19 @@
     UserHomeTest.class
 })
 public class IntegrationTestSuite {
-
-	protected static final boolean usingExternalServer;
 
-	/** The webdriver setup. */
-	private static boolean webdriverSetup = false;
+	/** The Constant BASE_URL. */
+	protected static final String BASE_URL = System.getProperty("system.test.target.url",
+			CitizenIntelligenceAgencyServer.ACCESS_URL);
+
+	/** The driver. */
+	protected static WebDriver driver;
+
+
+	/** The page visit. */
+	protected static UserPageVisit pageVisit;
+
+	protected static final boolean usingExternalServer;
 
 	/** The Constant webDriverMap. */
 	static {
@@ -47,6 +56,25 @@ public class IntegrationTestSuite {
 		CitizenIntelligenceAgencyServer.setEnv("CIA_APP_ENCRYPTION_PASSWORD", "allhaildiscordia");
 	}
 
+	/**
+	 * Global setup.
+	 */
+	@BeforeClass
+	public static void globalSetup() {
+		driver = WebDriverFactory.createDriver();
+		pageVisit = new UserPageVisit(driver);
+	}
+
+	/**
+	 * Global teardown.
+	 */
+	@AfterClass
+	public static void globalTeardown() {
+		if (driver != null) {
+			driver.quit();
+		}
+	}
+
 	/**
 	 * Start server.
 	 *
@@ -58,10 +86,6 @@ public static final synchronized void startServer() throws Exception {
 		if (!usingExternalServer) {
 			CitizenIntelligenceAgencyServer.startTestServer();
 		}
-		if(!webdriverSetup) {
-			WebDriverManager.getInstance(DriverManagerType.CHROME).setup();
-			webdriverSetup=true;
-		}
 	}
 
 	/**
@@ -77,6 +101,10 @@ public static final synchronized void stopServer() throws Exception {
 		}
 	}
 
-
-
+	@After
+	public void cleanBrowser() {
+		pageVisit.cleanBrowser();
+	}
+
+
 }
diff --git a/...gence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/UnitTestSuite.java b/...gence-agency/src/test/java/com/hack23/cia/systemintegrationtest/suites/UnitTestSuite.java
@@ -48,5 +48,5 @@
     ListPropertyConverterTest.class,
     UserContextUtilTest.class})
 public class UnitTestSuite {
-		
+
 }
diff --git a/...igence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/WebDriverFactory.java b/...igence-agency/src/test/java/com/hack23/cia/systemintegrationtest/ui/WebDriverFactory.java
@@ -4,11 +4,15 @@
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 
+import io.github.bonigarcia.wdm.WebDriverManager;
+import io.github.bonigarcia.wdm.config.DriverManagerType;
+
 /**
  * A factory for creating WebDriver objects.
  */
 public class WebDriverFactory {
 
+	private static WebDriver driver; 
 
     /**
      * Instantiates a new web driver factory.
@@ -22,8 +26,11 @@ private WebDriverFactory() {
      * @return the web driver
      */
     public static WebDriver createDriver() {
-        final WebDriver driver = createChromeDriver();
-        configureDriver(driver);
+       if (driver == null ) {
+    	   WebDriverManager.getInstance(DriverManagerType.CHROME).setup();
+    	   driver = createChromeDriver();
+    	   configureDriver(driver);
+       }
         return driver;
     }
 

diff --git a/citizen-intelligence-agency/src/test/resources/logback-test.xml b/citizen-intelligence-agency/src/test/resources/logback-test.xml
@@ -25,23 +25,21 @@
 
 	<logger name="org.eclipse" level="warn" />
 
-	<logger name="org.springframework" level="info" />
-	<logger name="org.springframework.web" level="info" />
+	<logger name="org.springframework" level="error" />
+	<logger name="org.springframework.web" level="error" />
 	<logger name="org.springframework.oxm.jaxb" level="error" />
 
-	<logger name="org.springframework.security" level="warn" />
+	<logger name="org.springframework.security" level="error" />
 
-	<logger name="org.apache.activemq.artemis" level="warn" />
+	<logger name="org.apache.activemq.artemis" level="error" />
 
 	<logger name="ch.qos.logback.core" level="warn" />
 
-
-	<logger name="com.hack23.cia" level="info" />
-	<logger name="com.hack23.cia.systemintegrationtest" level="info" />
+	<logger name="com.hack23.cia" level="error" />
 
 
 	<root level="error">
 		<appender-ref ref="console" />
 	</root>
 
-</configuration>
+</configuration>