Merge pull request #10 from reportportal/develop

Release
reportportal · Jan 22, 2025 · a0e3de2 · a0e3de2
2 parents 1036db7 + f757344
commit a0e3de2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,7 +54,7 @@ jobs:
           java-version: '8'
 
       - 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
@@ -1,6 +1,9 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.2.26](https://github.com/reportportal/client-java/releases/tag/5.2.26), by @HardNorth
+- `utils-java-formatting` library version updated on version [5.2.5](https://github.com/reportportal/utils-java-formatting/releases/tag/5.2.5), by @HardNorth
 
 ## [5.1.4]
 ### Changed

diff --git a/build.gradle b/build.gradle
@@ -37,15 +37,15 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:utils-java-formatting:5.2.3'
+    api 'com.epam.reportportal:utils-java-formatting:5.2.5'
     compileOnly "com.epam.reportportal:client-java:${client_version}"
     compileOnly "com.google.code.findbugs:jsr305:${jsr305_version}"
     compileOnly "com.squareup.okhttp3:okhttp:${okhttp_version}"
 
     testImplementation "com.epam.reportportal:client-java:${client_version}"
     testImplementation "com.google.code.findbugs:jsr305:${jsr305_version}"
     testImplementation "com.squareup.okhttp3:okhttp:${okhttp_version}"
-    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2'
+    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.7'
 
     testImplementation("org.junit.platform:junit-platform-runner:${junit5_runner_version}") {
         exclude module: 'junit'

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 version=5.1.5-SNAPSHOT
 description=Report Portal logger for OkHttp3 client
 okhttp_version=4.12.0
-client_version=5.2.13
+client_version=5.2.26
 jsr305_version=3.0.2
 junit5_version=5.6.3
 junit5_runner_version=1.6.3

diff --git a/src/test/java/com/epam/reportportal/okhttp3/ReportPortalOkHttp3LoggingInterceptorTest.java b/src/test/java/com/epam/reportportal/okhttp3/ReportPortalOkHttp3LoggingInterceptorTest.java
@@ -25,6 +25,7 @@
 import com.epam.reportportal.service.Launch;
 import com.epam.reportportal.service.ReportPortal;
 import com.epam.reportportal.service.step.StepReporter;
+import com.epam.reportportal.util.test.CommonUtils;
 import com.epam.reportportal.utils.files.Utils;
 import com.epam.reportportal.utils.http.ContentType;
 import okhttp3.*;
@@ -192,7 +193,7 @@ private Triple<List<String>, List<String>, List<ReportPortalMessage>> runChainCo
 			StepReporter reporter = mock(StepReporter.class);
 			utilities.when(Launch::currentLaunch).thenReturn(launch);
 			when(launch.getStepReporter()).thenReturn(reporter);
-			doNothing().when(reporter).sendStep(any(ItemStatus.class), stepCaptor.capture());
+			when(reporter.sendStep(any(ItemStatus.class), stepCaptor.capture())).thenReturn(CommonUtils.createMaybeUuid());
 			runChain(request, response, mock -> {
 				mock.when(() -> ReportPortal.emitLog(stringArgumentCaptor.capture(), anyString(), any(Date.class)))
 						.thenReturn(Boolean.TRUE);