From 4702306d55644914b6684733681d35c3697331c6 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 11 Apr 2024 12:51:00 +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 82707b48dcad5bc4bd12cc5ba117e93d441dea59 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 22 Jan 2025 17:56:43 +0300 Subject: [PATCH 2/3] Client version update --- CHANGELOG.md | 3 +++ build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d1f2e9..e35c09d 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` dependency version updated on [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 18e1c7d..255fd1a 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}" implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'org.apache.httpcomponents:httpcore:4.4.16' diff --git a/gradle.properties b/gradle.properties index 26a685a..7c47ecb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ junit5_version=5.6.3 junit5_runner_version=1.6.3 mockito_version=4.5.1 httpclient_version=4.5.14 -client_version=5.2.13 +client_version=5.2.26 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From 0ffaeb93a556f69ef19be77aa488477c127103b1 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 22 Jan 2025 18:01:49 +0300 Subject: [PATCH 3/3] Fix tests --- build.gradle | 2 +- .../httpcomponents/ReportPortalHttpLoggingInterceptorTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 255fd1a..edec751 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { implementation 'org.apache.httpcomponents:httpcore:4.4.16' testImplementation "com.epam.reportportal:client-java:${client_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/src/test/java/com/epam/reportportal/httpcomponents/ReportPortalHttpLoggingInterceptorTest.java b/src/test/java/com/epam/reportportal/httpcomponents/ReportPortalHttpLoggingInterceptorTest.java index 9e3af7e..61a1264 100644 --- a/src/test/java/com/epam/reportportal/httpcomponents/ReportPortalHttpLoggingInterceptorTest.java +++ b/src/test/java/com/epam/reportportal/httpcomponents/ReportPortalHttpLoggingInterceptorTest.java @@ -24,6 +24,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 org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; @@ -136,7 +137,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);