Merge pull request #216 from reportportal/develop

Release
reportportal · Jan 21, 2025 · fac04f7 · fac04f7
2 parents 665ed20 + c2d019f
commit fac04f7
Show file tree

Hide file tree

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

diff --git a/build.gradle b/build.gradle
@@ -39,12 +39,12 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.2.23'
+    api 'com.epam.reportportal:client-java:5.2.25'
 
     compileOnly "org.testng:testng:${testng_version}"
-    implementation 'org.slf4j:slf4j-api:2.0.4'
+    implementation 'org.slf4j:slf4j-api:2.0.7'
 
-    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.6'
+    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.7'
 
     testImplementation "org.testng:testng:${testng_version}"
     testImplementation("org.junit.platform:junit-platform-runner:${junit5_runner_version}") {
@@ -58,9 +58,9 @@ dependencies {
     testImplementation 'org.hamcrest:hamcrest-core:2.2'
     testImplementation "org.mockito:mockito-core:${mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
-    testImplementation 'ch.qos.logback:logback-classic:1.4.12'
+    testImplementation 'ch.qos.logback:logback-classic:1.4.14'
 
-    testImplementation 'com.epam.reportportal:logger-java-logback:5.2.2'
+    testImplementation 'com.epam.reportportal:logger-java-logback:5.2.3'
 
     testImplementation 'commons-io:commons-io:2.17.0'
     testImplementation 'com.ibm.icu:icu4j:67.1'

diff --git a/src/main/java/com/epam/reportportal/testng/TestNGService.java b/src/main/java/com/epam/reportportal/testng/TestNGService.java
@@ -474,7 +474,7 @@ protected void createSkippedSteps(ITestResult testResult) {
 	@Nullable
 	protected com.epam.ta.reportportal.ws.model.issue.Issue createIssue(@Nonnull ITestResult testResult) {
 		String stepName = createStepName(testResult);
-		List<ParameterResource> parameters = createStepParameters(testResult);
+		List<ParameterResource> parameters = ofNullable(createStepParameters(testResult)).orElse(Collections.emptyList());
 		return getMethodAnnotation(Issues.class, testResult).map(i -> IssueUtils.createIssue(i, stepName, parameters))
 				.orElseGet(() -> getMethodAnnotation(Issue.class, testResult).map(i -> IssueUtils.createIssue(i, stepName, parameters))
 						.orElse(null));
@@ -548,6 +548,7 @@ public void sendReportPortalMsg(final ITestResult result) {
 	 * @param suite TestNG suite
 	 * @return Request to ReportPortal
 	 */
+	@Nonnull
 	protected StartTestItemRQ buildStartSuiteRq(ISuite suite) {
 		StartTestItemRQ rq = new StartTestItemRQ();
 		rq.setName(suite.getName());
@@ -582,6 +583,7 @@ protected StartTestItemRQ buildStartTestItemRq(@Nonnull ITestContext testContext
 	 * @param parameters Launch Configuration parameters
 	 * @return Request to ReportPortal
 	 */
+	@Nonnull
 	protected StartLaunchRQ buildStartLaunchRq(ListenerParameters parameters) {
 		StartLaunchRQ rq = new StartLaunchRQ();
 		rq.setName(parameters.getLaunchName());
@@ -614,6 +616,7 @@ protected StartLaunchRQ buildStartLaunchRq(ListenerParameters parameters) {
 	 * @return Request to ReportPortal
 	 */
 	@SuppressWarnings("unused")
+	@Nonnull
 	protected FinishExecutionRQ buildFinishLaunchRq(ListenerParameters parameters) {
 		FinishExecutionRQ rq = new FinishExecutionRQ();
 		rq.setEndTime(Calendar.getInstance().getTime());
@@ -627,6 +630,7 @@ protected FinishExecutionRQ buildFinishLaunchRq(ListenerParameters parameters) {
 	 * @return Request to ReportPortal
 	 */
 	@SuppressWarnings("unused")
+	@Nonnull
 	protected FinishTestItemRQ buildFinishTestSuiteRq(ISuite suite) {
 		/* 'real' end time */
 		Date now = Calendar.getInstance().getTime();
@@ -641,6 +645,7 @@ protected FinishTestItemRQ buildFinishTestSuiteRq(ISuite suite) {
 	 * @param testContext TestNG test context
 	 * @return Request to ReportPortal
 	 */
+	@Nonnull
 	protected FinishTestItemRQ buildFinishTestRq(ITestContext testContext) {
 		FinishTestItemRQ rq = new FinishTestItemRQ();
 		rq.setEndTime(testContext.getEndDate());
@@ -653,6 +658,7 @@ protected FinishTestItemRQ buildFinishTestRq(ITestContext testContext) {
 	 * @param testResult TestNG's testResult context
 	 * @return Test/Step Parameters being sent to ReportPortal
 	 */
+	@Nullable
 	protected List<ParameterResource> createStepParameters(ITestResult testResult) {
 		List<ParameterResource> parameters = Lists.newArrayList();
 		parameters.addAll(createDataProviderParameters(testResult));