From 6d3b75506e634fd2c708319839451e0ed7f47197 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 11 Apr 2024 12:52:15 +0300 Subject: [PATCH 1/3] Action version update --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b26222..0dd4893 100644 --- 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' From b6d31feede67065fd44dcf779bc730f0631dc298 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 22 Jan 2025 17:46:25 +0300 Subject: [PATCH 2/3] Client version update --- CHANGELOG.md | 3 +++ build.gradle | 4 ++-- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7952773..20e5fce 100644 --- 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 index e5db8aa..e8d6748 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ 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}" @@ -45,7 +45,7 @@ dependencies { 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 index 517e6e8..ff68124 100644 --- 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 From f75734425c1de47db8f2245ef7518883ae159989 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 22 Jan 2025 17:50:54 +0300 Subject: [PATCH 3/3] Fix tests --- .../okhttp3/ReportPortalOkHttp3LoggingInterceptorTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/epam/reportportal/okhttp3/ReportPortalOkHttp3LoggingInterceptorTest.java b/src/test/java/com/epam/reportportal/okhttp3/ReportPortalOkHttp3LoggingInterceptorTest.java index 61ff1c8..c53fbaa 100644 --- 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, List> 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);