From 24be34ddc8c1313a05f33bd6f4891f0e61b1f949 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 16 Feb 2024 16:24:13 +0300 Subject: [PATCH 01/21] Client version updated --- CHANGELOG.md | 3 +++ build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb4ea51..265576b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # Changelog ## [Unreleased] +### Changed +- JUnit 5 dependency marked as `compileOnly` to avoid overriding JUnit 5 API version for users, by @HardNorth +- Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth ## [5.2.1] ### Changed diff --git a/build.gradle b/build.gradle index 213c2ef..4db013c 100644 --- a/build.gradle +++ b/build.gradle @@ -37,10 +37,10 @@ repositories { } dependencies { - api 'com.epam.reportportal:client-java:5.2.4' + api 'com.epam.reportportal:client-java:5.2.5' api 'com.google.code.findbugs:jsr305:3.0.2' - implementation "org.junit.jupiter:junit-jupiter-api:${junit_version}" + compileOnly "org.junit.jupiter:junit-jupiter-api:${junit_version}" implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' From a52180246f4138bbdf59034a7b7d35bac6ba5359 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 16 Feb 2024 16:27:32 +0300 Subject: [PATCH 02/21] JSR 305 dependency marked as `implementation` --- CHANGELOG.md | 1 + build.gradle | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 265576b..6c49e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## [Unreleased] ### Changed - JUnit 5 dependency marked as `compileOnly` to avoid overriding JUnit 5 API version for users, by @HardNorth +- JSR 305 dependency marked as `implementation` to force users specify their own versions, by @HardNorth - Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth ## [5.2.1] diff --git a/build.gradle b/build.gradle index 4db013c..dec2dbd 100644 --- a/build.gradle +++ b/build.gradle @@ -38,9 +38,9 @@ repositories { dependencies { api 'com.epam.reportportal:client-java:5.2.5' - api 'com.google.code.findbugs:jsr305:3.0.2' compileOnly "org.junit.jupiter:junit-jupiter-api:${junit_version}" + implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' From e2754ff6d3e382687e3202d6f054c5544defc972 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 18:17:10 +0300 Subject: [PATCH 03/21] Remove Unique ID set --- CHANGELOG.md | 2 ++ .../com/epam/reportportal/junit5/ReportPortalExtension.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c49e70..19bbc11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ - JUnit 5 dependency marked as `compileOnly` to avoid overriding JUnit 5 API version for users, by @HardNorth - JSR 305 dependency marked as `implementation` to force users specify their own versions, by @HardNorth - Client version updated on [5.2.5](https://github.com/reportportal/client-java/releases/tag/5.2.5), by @HardNorth +### Removed +- Setting of Unique ID on Test Step and Configuration start, as redundant action, by @HardNorth ## [5.2.1] ### Changed diff --git a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java index e428f87..3e91e0a 100644 --- a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java +++ b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java @@ -673,7 +673,6 @@ protected StartTestItemRQ buildStartStepRq(@Nonnull final ExtensionContext conte rq.setStartTime(startTime); rq.setName(createStepName(context)); rq.setDescription(description); - rq.setUniqueId(context.getUniqueId()); rq.setType(itemType == TEMPLATE ? SUITE.name() : itemType.name()); String codeRef = getCodeRef(context); rq.setCodeRef(codeRef); @@ -705,6 +704,7 @@ protected StartTestItemRQ buildStartStepRq(@Nonnull final ExtensionContext conte * @return Request to ReportPortal */ @Nonnull + @SuppressWarnings("unused") protected StartTestItemRQ buildStartConfigurationRq(@Nonnull Method method, @Nonnull ExtensionContext parentContext, @Nonnull ExtensionContext context, @Nonnull ItemType itemType) { StartTestItemRQ rq = new StartTestItemRQ(); @@ -717,8 +717,6 @@ protected StartTestItemRQ buildStartConfigurationRq(@Nonnull Method method, @Non rq.setName(createConfigurationName(method.getDeclaringClass(), method)); rq.setDescription(createConfigurationDescription(method.getDeclaringClass(), method)); } - String uniqueId = parentContext.getUniqueId() + "/[method:" + method.getName() + "()]"; - rq.setUniqueId(uniqueId); ofNullable(context.getTags()).ifPresent(it -> rq.setAttributes(it.stream() .map(tag -> new ItemAttributesRQ(null, tag)) .collect(Collectors.toSet()))); From aeb577b79c585cd500b5eba2473e49e5258945f7 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 22:27:15 +0300 Subject: [PATCH 04/21] Remove junit-platform-runner from test dependencies, since it's redundant now --- build.gradle | 1 - gradle.properties | 1 - 2 files changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index dec2dbd..851159e 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,6 @@ dependencies { testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' - testImplementation ("org.junit.platform:junit-platform-runner:${junit_runner_version}") testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' diff --git a/gradle.properties b/gradle.properties index 495382e..1c59fd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ version=5.2.2-SNAPSHOT description=JUnit5 integration for ReportPortal junit_version=5.9.1 -junit_runner_version=1.9.1 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From cd7f5043a5dfb96769d6cd9c93ac1cee4aff1816 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 22:36:37 +0300 Subject: [PATCH 05/21] Add junit-platform-launcher --- build.gradle | 1 + gradle.properties | 1 + 2 files changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 851159e..403cecf 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,7 @@ dependencies { testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' + testImplementation "org.junit.platform:junit-platform-launcher:${junit_launcher_version}" testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' diff --git a/gradle.properties b/gradle.properties index 1c59fd9..52686c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ version=5.2.2-SNAPSHOT description=JUnit5 integration for ReportPortal junit_version=5.9.1 +junit_launcher_version=1.9.1 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From 812de02f1bb12295e2dcc631d6a52c214042064b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 22:42:30 +0300 Subject: [PATCH 06/21] Revert "Add junit-platform-launcher" This reverts commit cd7f5043a5dfb96769d6cd9c93ac1cee4aff1816. --- build.gradle | 1 - gradle.properties | 1 - 2 files changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 403cecf..851159e 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,6 @@ dependencies { testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' - testImplementation "org.junit.platform:junit-platform-launcher:${junit_launcher_version}" testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' diff --git a/gradle.properties b/gradle.properties index 52686c5..1c59fd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ version=5.2.2-SNAPSHOT description=JUnit5 integration for ReportPortal junit_version=5.9.1 -junit_launcher_version=1.9.1 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From eec4ca4f3f0c88c0d53a3945d3199aecc178973b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 22:42:30 +0300 Subject: [PATCH 07/21] Revert "Remove junit-platform-runner from test dependencies, since it's redundant now" This reverts commit aeb577b79c585cd500b5eba2473e49e5258945f7. --- build.gradle | 1 + gradle.properties | 1 + 2 files changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 851159e..dec2dbd 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,7 @@ dependencies { testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' + testImplementation ("org.junit.platform:junit-platform-runner:${junit_runner_version}") testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' diff --git a/gradle.properties b/gradle.properties index 1c59fd9..495382e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ version=5.2.2-SNAPSHOT description=JUnit5 integration for ReportPortal junit_version=5.9.1 +junit_runner_version=1.9.1 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From 73d657fc948c33d81a00f9e5fba7a05f7ef0f331 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 22:47:14 +0300 Subject: [PATCH 08/21] Actions versions update --- .github/workflows/ci.yml | 8 +++++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index debdd63..8438984 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -47,4 +47,6 @@ jobs: run: ./gradlew build - name: Codecov upload - run: bash <(curl -s https://codecov.io/bash) + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af89118..36c2502 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate versions uses: HardNorth/github-version-generate@v1 @@ -50,7 +50,7 @@ jobs: version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }} - name: Set up JDK 1.8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '8' @@ -108,7 +108,7 @@ jobs: - name: Checkout develop branch if: ${{ github.ref }} == 'master' - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'develop' fetch-depth: 0 From 0980b0b9a98fc81b098584800ce55a2c9e2a8709 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 22:55:14 +0300 Subject: [PATCH 09/21] Trigger build --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index dec2dbd..5143218 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,6 @@ dependencies { implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' - testImplementation ("org.junit.platform:junit-platform-runner:${junit_runner_version}") testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" From a4ba5bdb7c06790929ef772f458a6c507bf63de4 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 22:56:07 +0300 Subject: [PATCH 10/21] Logger update --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5143218..cbe45c9 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ dependencies { testImplementation 'org.hamcrest:hamcrest:2.2' testImplementation 'org.mockito:mockito-core:3.3.3' testImplementation 'ch.qos.logback:logback-classic:1.3.12' - testImplementation ('com.epam.reportportal:logger-java-logback:5.2.0') { + testImplementation ('com.epam.reportportal:logger-java-logback:5.2.1') { exclude module: 'client-java' } testImplementation 'org.assertj:assertj-core:3.23.1' From f2fe38f0080709c355d0f1706035101c3412c039 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 23:01:54 +0300 Subject: [PATCH 11/21] A try to fix codecov --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8438984..018f78f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,5 +48,3 @@ jobs: - name: Codecov upload uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} From b57fd4a3805e9f52890921b363df3210cfb50202 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Mon, 19 Feb 2024 23:05:47 +0300 Subject: [PATCH 12/21] Revert "A try to fix codecov" This reverts commit f2fe38f0080709c355d0f1706035101c3412c039. --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 018f78f..8438984 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,3 +48,5 @@ jobs: - name: Codecov upload uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} From 47a3f1a25a42451eb1662bbcfcfba9b86833b35b Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Wed, 21 Feb 2024 16:59:44 +0300 Subject: [PATCH 13/21] Update test utilities --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cbe45c9..8417aeb 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'org.slf4j:slf4j-api:2.0.7' - testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.2' + testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' testImplementation ("org.junit.platform:junit-platform-runner:${junit_runner_version}") testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" From 139c1e5c252821e979dbaba4927ebaf4854af1df Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Fri, 23 Feb 2024 19:17:36 +0300 Subject: [PATCH 14/21] `finishTest` method which controls finishing Tests with statuses --- CHANGELOG.md | 2 + gradle.properties | 2 +- .../junit5/ReportPortalExtension.java | 44 +++++++++++++------ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19bbc11..f97dcf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ## [Unreleased] +### Added +- `finishTest` method which controls finishing Tests with statuses, to distinguish them from suites and configuration methods, by @HardNorth ### Changed - JUnit 5 dependency marked as `compileOnly` to avoid overriding JUnit 5 API version for users, by @HardNorth - JSR 305 dependency marked as `implementation` to force users specify their own versions, by @HardNorth diff --git a/gradle.properties b/gradle.properties index 495382e..ef69a5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=5.2.2-SNAPSHOT +version=5.3.0-SNAPSHOT description=JUnit5 integration for ReportPortal junit_version=5.9.1 junit_runner_version=1.9.1 diff --git a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java index 3e91e0a..eb5f950 100644 --- a/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java +++ b/src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java @@ -316,9 +316,9 @@ public void interceptDynamicTest(Invocation invocation, DynamicTestInvocat startTestItem(extensionContext, STEP); try { invocation.proceed(); - finishTestItem(extensionContext, PASSED); + finishTest(extensionContext, PASSED); } catch (Throwable throwable) { - finishTestItem(extensionContext, getExecutionStatus(throwable)); + finishTest(extensionContext, getExecutionStatus(throwable)); throw throwable; } } @@ -344,7 +344,7 @@ protected ItemStatus getExecutionStatus(@Nonnull final ExtensionContext context) @Override public void afterTestExecution(ExtensionContext context) { finishTemplates(context); - finishTestItem(context, getExecutionStatus(context)); + finishTest(context, getExecutionStatus(context)); } @Override @@ -352,25 +352,17 @@ public void testDisabled(ExtensionContext context, Optional reason) { if (Boolean.parseBoolean(System.getProperty("reportDisabledTests"))) { String description = reason.orElse(createStepDescription(context)); startTestItem(context, Collections.emptyList(), STEP, description, Calendar.getInstance().getTime()); - finishTestItem(context, SKIPPED); + finishTest(context, SKIPPED); } } - @Override - public void testSuccessful(ExtensionContext context) { - } - - @Override - public void testAborted(ExtensionContext context, Throwable throwable) { - } - @Override public void testFailed(ExtensionContext context, Throwable cause) { context.getParent().ifPresent(parent -> { if(failedClassInits.contains(parent)) { startTestItem(context, STEP); sendStackTraceToRP(cause); - finishTestItem(context, FAILED); + finishTest(context, FAILED); } }); } @@ -554,6 +546,16 @@ protected void finishTestItem(@Nonnull final ExtensionContext context, @Nullable finishTestItem(context, buildFinishTestItemRq(context, status)); } + /** + * Finishes a test in RP with a specific status, builds a finish request based on the status + * + * @param context JUnit's test context + * @param status a test execution status + */ + protected void finishTest(@Nonnull final ExtensionContext context, @Nullable final ItemStatus status) { + finishTestItem(context, buildFinishTestRq(context, status)); + } + /** * Finishes a test item in RP with a custom request * @@ -741,6 +743,22 @@ protected StartTestItemRQ buildStartConfigurationRq(@Nonnull Method method, @Non protected void createSkippedSteps(ExtensionContext context, Throwable cause) { } + /** + * Extension point to customize a test result on it's finish + * + * @param context JUnit's test context + * @param status a test item execution result + * @return Request to ReportPortal + */ + @SuppressWarnings("unused") + @Nonnull + protected FinishTestItemRQ buildFinishTestRq(@Nonnull ExtensionContext context, @Nullable ItemStatus status) { + FinishTestItemRQ rq = new FinishTestItemRQ(); + ofNullable(status).ifPresent(s -> rq.setStatus(s.name())); + rq.setEndTime(Calendar.getInstance().getTime()); + return rq; + } + /** * Extension point to customize a test item result on it's finish * From 9d1402ab30cab879243b3b5ebd6fbac067e398d8 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 7 Mar 2024 12:21:32 +0300 Subject: [PATCH 15/21] Mute AspectJ warnings --- src/main/resources/META-INF/aop-ajc.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/resources/META-INF/aop-ajc.xml diff --git a/src/main/resources/META-INF/aop-ajc.xml b/src/main/resources/META-INF/aop-ajc.xml new file mode 100644 index 0000000..9bfa23e --- /dev/null +++ b/src/main/resources/META-INF/aop-ajc.xml @@ -0,0 +1,22 @@ + + + + + + + + From 79e9aef3a459ae75aa4d46835529a08c5aceb6f1 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 13:58:39 +0300 Subject: [PATCH 16/21] Slack link update --- README.md | 2 +- README_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0000e3e..2dd9485 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A JUnit 5 reporter that uploads the results to a ReportPortal server. [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-java-junit5.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-java-junit5) [![CI Build](https://github.com/reportportal/agent-java-junit5/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-java-junit5/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/agent-java-junit5/branch/develop/graph/badge.svg?token=tq832Jsqef)](https://codecov.io/gh/reportportal/agent-java-junit5) -[![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) diff --git a/README_TEMPLATE.md b/README_TEMPLATE.md index 169bec1..bba0cba 100644 --- a/README_TEMPLATE.md +++ b/README_TEMPLATE.md @@ -8,7 +8,7 @@ A JUnit 5 reporter that uploads the results to a ReportPortal server. [![Maven Central](https://img.shields.io/maven-central/v/com.epam.reportportal/agent-java-junit5.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/com.epam.reportportal/agent-java-junit5) [![CI Build](https://github.com/reportportal/agent-java-junit5/actions/workflows/ci.yml/badge.svg)](https://github.com/reportportal/agent-java-junit5/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/reportportal/agent-java-junit5/branch/develop/graph/badge.svg?token=tq832Jsqef)](https://codecov.io/gh/reportportal/agent-java-junit5) -[![Join Slack chat!](https://slack.epmrpp.reportportal.io/badge.svg)](https://slack.epmrpp.reportportal.io/) +[![Join Slack chat!](https://img.shields.io/badge/slack-join-brightgreen.svg)](https://slack.epmrpp.reportportal.io/) [![stackoverflow](https://img.shields.io/badge/reportportal-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/reportportal) [![Build with Love](https://img.shields.io/badge/build%20with-❤%EF%B8%8F%E2%80%8D-lightgrey.svg)](http://reportportal.io?style=flat) From 60b90dfb8d5a5b0f6d6e53ef40457264e6f16038 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 14:00:39 +0300 Subject: [PATCH 17/21] Dependencies update --- build.gradle | 1 - gradle.properties | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8417aeb..3cb5c53 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,6 @@ dependencies { implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' - testImplementation ("org.junit.platform:junit-platform-runner:${junit_runner_version}") testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' diff --git a/gradle.properties b/gradle.properties index ef69a5d..320385b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,6 @@ version=5.3.0-SNAPSHOT description=JUnit5 integration for ReportPortal -junit_version=5.9.1 -junit_runner_version=1.9.1 +junit_version=5.9.3 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From f61ffea95966fd6296c3f43818f5d47ad8de35bd Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 14:05:47 +0300 Subject: [PATCH 18/21] Dependencies update --- build.gradle | 2 +- gradle.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3cb5c53..696dd27 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' - testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" + testImplementation "org.junit.platform:junit-platform-launcher:${junit_launcher_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation 'org.hamcrest:hamcrest:2.2' diff --git a/gradle.properties b/gradle.properties index 320385b..ddb8e7c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ version=5.3.0-SNAPSHOT description=JUnit5 integration for ReportPortal junit_version=5.9.3 +junit_launcher_version=1.9.3 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From b8a641d1a306b165ac0dc15b722a0158a353b133 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 14:08:16 +0300 Subject: [PATCH 19/21] Dependencies update --- build.gradle | 2 +- gradle.properties | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 696dd27..3543e80 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' - testImplementation "org.junit.platform:junit-platform-launcher:${junit_launcher_version}" + testImplementation "org.junit.platform:junit-platform-runner:${junit_runner_version}" testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation 'org.hamcrest:hamcrest:2.2' diff --git a/gradle.properties b/gradle.properties index ddb8e7c..a0b0e09 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,8 @@ version=5.3.0-SNAPSHOT description=JUnit5 integration for ReportPortal junit_version=5.9.3 -junit_launcher_version=1.9.3 +# We need runner for JUnit 4 compatibility tests +junit_runner_version=1.9.3 scripts_url=https://raw.githubusercontent.com/reportportal/gradle-scripts scripts_branch=master excludeTests= From fa86abb3dca3db1f7acbf7e9ad055c906493fdd8 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 14:29:27 +0300 Subject: [PATCH 20/21] Dependencies update --- build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 3543e80..8d94e64 100644 --- a/build.gradle +++ b/build.gradle @@ -50,9 +50,7 @@ dependencies { testImplementation 'org.hamcrest:hamcrest:2.2' testImplementation 'org.mockito:mockito-core:3.3.3' testImplementation 'ch.qos.logback:logback-classic:1.3.12' - testImplementation ('com.epam.reportportal:logger-java-logback:5.2.1') { - exclude module: 'client-java' - } + testImplementation 'com.epam.reportportal:logger-java-logback:5.2.2' testImplementation 'org.assertj:assertj-core:3.23.1' testImplementation 'com.squareup.okhttp3:okhttp:4.12.0' } From 89e0ff84a070915039e6b5781b4a75b54d2fda12 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 14 Mar 2024 14:36:08 +0300 Subject: [PATCH 21/21] Dependencies update --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d94e64..cb8d967 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,8 @@ dependencies { implementation 'org.slf4j:slf4j-api:2.0.7' testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.3' - testImplementation "org.junit.platform:junit-platform-runner:${junit_runner_version}" + testImplementation "org.junit.platform:junit-platform-runner:${junit_runner_version}" // We need runner for JUnit 4 compatibility tests + testImplementation "org.junit.jupiter:junit-jupiter-engine:${junit_version}" // Required for tests to run testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}" testImplementation 'org.aspectj:aspectjweaver:1.9.19' testImplementation 'org.hamcrest:hamcrest:2.2'