Merge branch 'develop' of https://github.com/reportportal/client-java …

…into EPMRPP-89703-lib-merge
reportportal · Apr 10, 2024 · c8da2f9 · c8da2f9
2 parents d7c2826 + 02114ae
commit c8da2f9
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,6 @@ on:
     branches:
       - '*'
       - '!master'
-      - '!v4-hotfix'
     paths-ignore:
       - README.md
       - README_TEMPLATE.md
@@ -27,7 +26,6 @@ on:
     branches:
       - master
       - develop
-      - v4-hotfix
 
 jobs:
   build:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,7 +55,7 @@ jobs:
           version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }}
 
       - name: Setup git credentials
-        uses: oleksiyrudenko/gha-git-credentials@v2.1.1
+        uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
           name: 'reportportal.io'
           email: 'support@reportportal.io'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [5.2.14]
+### Added
+- `MarkdownUtils.asTwoParts(String, String)` method, by @HardNorth
+
 ## [5.2.13]
 ### Changed
 - Return back `ContentType#parse` method for backward compatibility, by @HardNorth

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
-The latest version: 5.2.13. Please use `Maven Central` link above to get the client.
+The latest version: 5.2.14. Please use `Maven Central` link above to get the client.
 
 ## JVM-based clients configuration
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.2.14-SNAPSHOT
+version=5.2.15-SNAPSHOT
 description=EPAM ReportPortal. Client
 retrofit_version=2.9.0
 okhttp_version=4.12.0

diff --git a/src/main/java/com/epam/reportportal/utils/markdown/MarkdownUtils.java b/src/main/java/com/epam/reportportal/utils/markdown/MarkdownUtils.java
@@ -41,6 +41,7 @@ public class MarkdownUtils {
 	public static final int PADDING_SPACES_NUM = 2;
 	public static final int MAX_TABLE_SIZE = 83;
 	public static final int MIN_COL_SIZE = 3;
+	public static final String LOGICAL_SEPARATOR = "---";
 
 	/**
 	 * Adds special prefix to make log message being processed as markdown
@@ -198,4 +199,8 @@ public static String formatDataTable(@Nonnull final Map<String, String> table) {
 		toFormat.add(keys.stream().map(table::get).collect(Collectors.toList()));
 		return formatDataTable(toFormat);
 	}
+
+	public static String asTwoParts(@Nonnull String firstPart, @Nonnull String secondPart) {
+		return firstPart + NEW_LINE + LOGICAL_SEPARATOR + NEW_LINE + secondPart;
+	}
 }
diff --git a/src/test/java/com/epam/reportportal/utils/http/ContentTypeTest.java b/src/test/java/com/epam/reportportal/utils/http/ContentTypeTest.java
@@ -70,6 +70,7 @@ private static Iterable<Object[]> testMediaTypeValid() {
 				new Object[] { "application/json", true },
 				new Object[] { "video/vnd.iptvforum.2dparityfec-2005", true },
 				new Object[] { "application/json; charset=utf-8", false },
+				new Object[] { "application/json;", false },
 				new Object[] { "pdf", false },
 				new Object[] { "    ", false },
 				new Object[] { "; charset=utf-8", false },

diff --git a/src/test/java/com/epam/reportportal/utils/markdown/MarkdownUtilsTest.java b/src/test/java/com/epam/reportportal/utils/markdown/MarkdownUtilsTest.java
@@ -154,4 +154,13 @@ public void test_format_data_table_min_size_transpose_pad() {
 		List<List<String>> table = Arrays.asList(Arrays.asList("var_a", "var_b", "result"), Arrays.asList("2", "2", "4"));
 		assertThat(formatDataTable(table, 14), equalTo(MIN_ROW_WIDTH_EXPECTED_TABLE_TRANSPOSE_PAD));
 	}
+
+	public static final String TEXT_PART_ONE = "This is a text";
+	public static final String TEXT_PART_TWO = "This is another text";
+	public static final String EXPECTED_TWO_PARTS = TEXT_PART_ONE + "\n---\n" + TEXT_PART_TWO;
+
+	@Test
+	public void test_format_two_parts() {
+		assertThat(asTwoParts(TEXT_PART_ONE, TEXT_PART_TWO), equalTo(EXPECTED_TWO_PARTS));
+	}
 }