Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #216

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Release #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1cd629
Add JSR-305 annotations
HardNorth Dec 19, 2024
c2d019f
Client version update
HardNorth Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}") {
Expand All @@ -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'
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/com/epam/reportportal/testng/TestNGService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand All @@ -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();
Expand All @@ -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());
Expand All @@ -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));
Expand Down
Loading