Merge pull request #41 from reportportal/develop

Release
reportportal · Jan 21, 2025 · b5ad61e · b5ad61e
2 parents 2f40cbe + 721a0e3
commit b5ad61e
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.2.25](https://github.com/reportportal/client-java/releases/tag/5.2.25), by @HardNorth
 
 ## [5.1.2]
 ### Changed

diff --git a/gradle.properties b/gradle.properties
@@ -5,10 +5,10 @@ gradle_version=8.2
 karate_version=1.4.1
 junit_version=5.10.1
 mockito_version=5.4.0
-test_utils_version=0.0.3
-client_version=5.2.15
+test_utils_version=0.0.7
+client_version=5.2.25
 slf4j_api_version=2.0.7
-logger_version=5.2.2
+logger_version=5.2.3
 hamcrest_version=2.2
 okhttp_version=4.12.0
 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts

diff --git a/src/main/java/com/epam/reportportal/karate/ReportPortalPublisher.java b/src/main/java/com/epam/reportportal/karate/ReportPortalPublisher.java
@@ -298,7 +298,7 @@ public void finishBackground(@Nullable StepResult stepResult, @Nonnull ScenarioR
 	private Date getStepStartTime(@Nonnull Maybe<String> stepId) {
 		long currentStepStartTime = Calendar.getInstance().getTime().getTime();
 
-		if (!stepStartTimeMap.keySet().isEmpty()) {
+		if (!stepStartTimeMap.isEmpty()) {
 			long lastStepStartTime = stepStartTimeMap.get(stepId);
 
 			if (lastStepStartTime >= currentStepStartTime) {

diff --git a/src/main/java/com/epam/reportportal/karate/ReportPortalUtils.java b/src/main/java/com/epam/reportportal/karate/ReportPortalUtils.java
@@ -25,7 +25,7 @@
 import com.epam.reportportal.utils.AttributeParser;
 import com.epam.reportportal.utils.ParameterUtils;
 import com.epam.reportportal.utils.TestCaseIdUtils;
-import com.epam.reportportal.utils.markdown.MarkdownUtils;
+import com.epam.reportportal.utils.formatting.MarkdownUtils;
 import com.epam.reportportal.utils.properties.SystemAttributesExtractor;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
@@ -61,7 +61,7 @@ public class ReportPortalUtils {
 	public static final String SKIPPED_ISSUE_KEY = "skippedIssue";
 	public static final String SCENARIO_CODE_REFERENCE_PATTERN = "%s/[SCENARIO:%s]";
 	public static final String EXAMPLE_CODE_REFERENCE_PATTERN = "%s/[EXAMPLE:%s%s]";
-	public static final String MARKDOWN_DELIMITER = "\n" + MarkdownUtils.LOGICAL_SEPARATOR + "\n";
+	public static final String MARKDOWN_DELIMITER = MarkdownUtils.LOGICAL_SEPARATOR;
 	public static final String MARKDOWN_DELIMITER_PATTERN = "%s" + MARKDOWN_DELIMITER + "%s";
 	public static final String FEATURE_TAG = "Feature: ";
 	public static final String SCENARIO_TAG = "Scenario: ";

diff --git a/src/test/java/com/epam/reportportal/karate/call/CallWithParametersHookTest.java b/src/test/java/com/epam/reportportal/karate/call/CallWithParametersHookTest.java
@@ -20,7 +20,7 @@
 import com.epam.reportportal.service.ReportPortal;
 import com.epam.reportportal.service.ReportPortalClient;
 import com.epam.reportportal.util.test.CommonUtils;
-import com.epam.reportportal.utils.markdown.MarkdownUtils;
+import com.epam.reportportal.utils.formatting.MarkdownUtils;
 import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
 import com.intuit.karate.Results;
 import org.apache.commons.lang3.tuple.Pair;
@@ -47,7 +47,7 @@ public class CallWithParametersHookTest {
 	private static final String PARAMETERS_DESCRIPTION_PATTERN =
 			"Parameters:\n\n" + MarkdownUtils.TABLE_INDENT + "|\u00A0vara\u00A0|\u00A0result\u00A0|\n" + MarkdownUtils.TABLE_INDENT
 					+ "|------|--------|\n" + MarkdownUtils.TABLE_INDENT
-					+ "|\u00A0\u00A02\u00A0\u00A0\u00A0|\u00A0\u00A0\u00A04\u00A0\u00A0\u00A0\u00A0|\n"
+					+ "|\u00A0\u00A02\u00A0\u00A0\u00A0|\u00A0\u00A0\u00A04\u00A0\u00A0\u00A0\u00A0|\n\n"
 					+ MarkdownUtils.TABLE_ROW_SEPARATOR;
 	private final String featureId = CommonUtils.namedId("feature_");
 	private final String scenarioId = CommonUtils.namedId("scenario_");

diff --git a/src/test/java/com/epam/reportportal/karate/description/NoDescriptionExamplesTest.java b/src/test/java/com/epam/reportportal/karate/description/NoDescriptionExamplesTest.java
@@ -20,7 +20,7 @@
 import com.epam.reportportal.service.ReportPortal;
 import com.epam.reportportal.service.ReportPortalClient;
 import com.epam.reportportal.util.test.CommonUtils;
-import com.epam.reportportal.utils.markdown.MarkdownUtils;
+import com.epam.reportportal.utils.formatting.MarkdownUtils;
 import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
 import com.intuit.karate.Results;
 import org.apache.commons.lang3.tuple.Pair;

diff --git a/...tportal/karate/description/ScenarioDescriptionErrorLogWithDescriptionAndExamplesTest.java b/...tportal/karate/description/ScenarioDescriptionErrorLogWithDescriptionAndExamplesTest.java
@@ -22,7 +22,7 @@
 import com.epam.reportportal.service.ReportPortal;
 import com.epam.reportportal.service.ReportPortalClient;
 import com.epam.reportportal.util.test.CommonUtils;
-import com.epam.reportportal.utils.markdown.MarkdownUtils;
+import com.epam.reportportal.utils.formatting.MarkdownUtils;
 import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
 import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
 import com.intuit.karate.Results;
@@ -48,7 +48,7 @@
 
 public class ScenarioDescriptionErrorLogWithDescriptionAndExamplesTest {
 
-    public static final String MARKDOWN_DELIMITER_PATTERN_THREE_ARGS = "%s\n---\n%s\n---\n%s";
+    public static final String MARKDOWN_DELIMITER_PATTERN_THREE_ARGS = "%s\n\n---\n\n%s\n\n---\n\n%s";
     public static final String ERROR = "did not evaluate to 'true': mathResult == 5\nclasspath:feature/simple_failed_description_examples.feature:8";
     public static final String ERROR_MESSAGE = "Then assert mathResult == 5\n" + ERROR;
     public static final String DESCRIPTION_ERROR_LOG = "Error:\n" + ERROR;

diff --git a/...com/epam/reportportal/karate/description/ScenarioDescriptionErrorLogWithExamplesTest.java b/...com/epam/reportportal/karate/description/ScenarioDescriptionErrorLogWithExamplesTest.java
@@ -22,7 +22,7 @@
 import com.epam.reportportal.service.ReportPortal;
 import com.epam.reportportal.service.ReportPortalClient;
 import com.epam.reportportal.util.test.CommonUtils;
-import com.epam.reportportal.utils.markdown.MarkdownUtils;
+import com.epam.reportportal.utils.formatting.MarkdownUtils;
 import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
 import com.epam.ta.reportportal.ws.model.log.SaveLogRQ;
 import com.intuit.karate.Results;

diff --git a/src/test/java/com/epam/reportportal/karate/description/SimpleDescriptionTest.java b/src/test/java/com/epam/reportportal/karate/description/SimpleDescriptionTest.java
@@ -78,7 +78,7 @@ public void test_description_for_all_possible_items(boolean report) {
 		verify(client, times(3)).startTestItem(same(scenarioId), stepCaptor.capture());
 
 		StartTestItemRQ featureStart = featureCaptor.getValue();
-		assertThat(featureStart.getDescription(), endsWith("feature/description.feature\n---\nThis is my Feature description."));
+		assertThat(featureStart.getDescription(), endsWith("feature/description.feature\n\n---\n\nThis is my Feature description."));
 
 		StartTestItemRQ scenarioStart = scenarioCaptor.getValue();
 		assertThat(scenarioStart.getDescription(), equalTo(SCENARIO_DESCRIPTION));