You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2025/08/14 10:10:48 UTC

(openmeetings) branch master updated: [OPENMEETINGS-2799] test logging is improved

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new db5d474c5 [OPENMEETINGS-2799] test logging is improved
db5d474c5 is described below

commit db5d474c51f18fd3237f345539189f9e1b241e93
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Thu Aug 14 17:10:37 2025 +0700

    [OPENMEETINGS-2799] test logging is improved
---
 .../openmeetings/web/AbstractOmServerTest.java      | 21 ++++++++++++++++++++-
 .../openmeetings/ws/AbstractWebServiceTest.java     | 14 +++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java
index 3ebd4cb77..90b6af6c2 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/AbstractOmServerTest.java
@@ -44,8 +44,10 @@ import org.apache.openmeetings.installation.InstallationConfig;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.util.OmFileHelper;
 import org.apache.tomcat.util.scan.Constants;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -92,8 +94,19 @@ public abstract class AbstractOmServerTest {
 		}
 	}
 
+	public static String getTestCoordinates(TestInfo testInfo) {
+		String meth = testInfo.getTestMethod().map(m -> m.getName()).orElse("method n/a");
+		String res = testInfo.getTestClass().map(c -> c.getSimpleName()).orElse("class n/a") + ".";
+		if (testInfo.getDisplayName().contains(meth)) {
+			res += testInfo.getDisplayName();
+		} else {
+			res += meth + testInfo.getDisplayName();
+		}
+		return res;
+	}
+
 	@BeforeEach
-	public void serverSetup() throws Exception {
+	public void serverSetup(TestInfo testInfo) throws Exception {
 		if (app.getName() == null) {
 			app.setName(DEFAULT_CONTEXT_NAME);
 		}
@@ -102,6 +115,12 @@ public abstract class AbstractOmServerTest {
 		}
 		ensureApplication();
 		ensureSchema(userDao, importInitvalues);
+		log.info("Test started: {} ---", getTestCoordinates(testInfo));
+	}
+
+	@AfterEach
+	void tearDown(TestInfo testInfo) {
+		log.info(" --- test finished: {}", getTestCoordinates(testInfo));
 	}
 
 	public static void setOmHome() {
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java
index 83d957483..ba0f3232b 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/AbstractWebServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.ws;
 import static java.util.UUID.randomUUID;
 import static org.apache.openmeetings.web.AbstractOmServerTest.createPass;
 import static org.apache.openmeetings.web.AbstractOmServerTest.ensureSchema;
+import static org.apache.openmeetings.web.AbstractOmServerTest.getTestCoordinates;
 import static org.apache.openmeetings.web.AbstractOmServerTest.SOAP_USERNAME;
 import static org.apache.openmeetings.web.AbstractOmServerTest.USER_PASS;
 import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
@@ -47,16 +48,21 @@ import org.apache.openmeetings.db.entity.file.BaseFileItem;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.installation.ImportInitvalues;
 import org.apache.openmeetings.webservice.util.AppointmentMessageBodyReader;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import jakarta.ws.rs.core.Form;
 import jakarta.ws.rs.core.MediaType;
 
 @Tag("webservice")
 public abstract class AbstractWebServiceTest {
+	private static final Logger log = LoggerFactory.getLogger(AbstractWebServiceTest.class);
 	private static final String HOST = "localhost";
 	private static final String CONTEXT = "/openmeetings";
 	private static int port = 8080;
@@ -103,8 +109,14 @@ public abstract class AbstractWebServiceTest {
 	}
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	public void setUp(TestInfo testInfo) throws Exception {
 		ensureSchema(getBean(UserDao.class), getBean(ImportInitvalues.class));
+		log.info("Test started: {} ---", getTestCoordinates(testInfo));
+	}
+
+	@AfterEach
+	void tearDown(TestInfo testInfo) {
+		log.info(" --- test finished: {}", getTestCoordinates(testInfo));
 	}
 
 	protected static CallResult<RoomDTO> createAndValidate(RoomDTO r) {