Merge pull request #102 from reportportal/develop

Release

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.2.13](https://github.com/reportportal/client-java/releases/tag/5.2.13), by @HardNorth
 
 ## [5.2.2]
 ### Changed

build.gradle

@@ -37,7 +37,7 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.2.11'
+    api 'com.epam.reportportal:client-java:5.2.13'
     api 'info.cukes:gherkin:2.12.2'
 
     implementation 'org.slf4j:slf4j-api:2.0.7'

src/main/java/com/epam/reportportal/cucumber/AbstractReporter.java

@@ -26,6 +26,7 @@
 import com.epam.reportportal.service.tree.TestItemTree;
 import com.epam.reportportal.utils.*;
 import com.epam.reportportal.utils.files.ByteSource;
+import com.epam.reportportal.utils.http.ContentType;
 import com.epam.reportportal.utils.properties.SystemAttributesExtractor;
 import com.epam.ta.reportportal.ws.model.FinishExecutionRQ;
 import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
@@ -569,7 +570,7 @@ private static String getDataType(@Nonnull byte[] data) {
 	 */
 	@Override
 	public void embedding(String mimeType, byte[] data) {
-		String type = ofNullable(mimeType).filter(m -> m.contains("/")).orElseGet(() -> getDataType(data));
+		String type = ofNullable(mimeType).filter(ContentType::isValidType).orElseGet(() -> getDataType(data));
 		String attachmentName = ofNullable(type).map(t -> t.substring(0, t.indexOf("/"))).orElse("");
 		ReportPortal.emitLog(new ReportPortalMessage(ByteSource.wrap(data), type, attachmentName),
 				"UNKNOWN",

src/test/java/com/epam/reportportal/cucumber/integration/callback/scenario/CallbackReportingSteps.java

@@ -64,6 +64,7 @@ private void sendFinishRequest(TestItemTree.TestItemLeaf testResultLeaf, String
 		finishTestItemRQ.setDescription(description);
 		finishTestItemRQ.setStatus(status);
 		finishTestItemRQ.setEndTime(Calendar.getInstance().getTime());
+		//noinspection ResultOfMethodCallIgnored
 		ItemTreeReporter.finishItem(AbstractReporter.getReportPortal().getClient(),
 				finishTestItemRQ,
 				AbstractReporter.ITEM_TREE.getLaunchId(),

src/test/java/com/epam/reportportal/cucumber/integration/callback/step/CallbackReportingSteps.java

@@ -65,6 +65,7 @@ private void sendFinishRequest(TestItemTree.TestItemLeaf testResultLeaf, String
 		finishTestItemRQ.setDescription(description);
 		finishTestItemRQ.setStatus(status);
 		finishTestItemRQ.setEndTime(Calendar.getInstance().getTime());
+		//noinspection ResultOfMethodCallIgnored
 		ItemTreeReporter.finishItem(AbstractReporter.getReportPortal().getClient(),
 				finishTestItemRQ,
 				AbstractReporter.ITEM_TREE.getLaunchId(),