Merge pull request #142 from reportportal/develop

Release

Author: HardNorth

.github/workflows/ci.yml

@@ -37,11 +37,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: '11'
 
       - name: Build with Gradle
         run: ./gradlew build

.github/workflows/release.yml

@@ -49,11 +49,11 @@ jobs:
           version-file: ${{ env.VERSION_FILE }}
           version-file-extraction-pattern: ${{ env.VERSION_EXTRACT_PATTERN }}
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: '11'
 
       - name: Setup git credentials
         uses: oleksiyrudenko/gha-git-credentials@v2-latest

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated to [5.4.1](https://github.com/reportportal/client-java/releases/tag/5.4.1), by @HardNorth
+- Switch on use of `Instant` class instead of `Date` to get more timestamp precision, by @HardNorth
+- Replace "jsr305" annotations with "jakarta.annotation-api", by @HardNorth
+### Removed
+- Java 8-10 support, by @HardNorth
 
 ## [5.4.2]
 ### Changed

build.gradle

@@ -29,28 +29,29 @@ project.ext.limits = [
         'class'      : 87
 ]
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.3.17'
+    api 'com.epam.reportportal:client-java:5.4.1'
 
     compileOnly "org.junit.jupiter:junit-jupiter-api:${junit_version}"
     implementation 'org.slf4j:slf4j-api:2.0.7'
+    implementation 'org.apache.commons:commons-lang3:3.19.0'
 
-    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.13'
+    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.1.0'
     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'
     testImplementation 'org.mockito:mockito-core:3.3.3'
-    testImplementation 'ch.qos.logback:logback-classic:1.3.15'
-    testImplementation 'com.epam.reportportal:logger-java-logback:5.2.3'
+    testImplementation 'ch.qos.logback:logback-classic:1.5.18'
+    testImplementation 'com.epam.reportportal:logger-java-logback:5.4.0'
     testImplementation 'org.assertj:assertj-core:3.23.1'
     testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
 }

gradle.properties

@@ -1,4 +1,4 @@
-version=5.4.3-SNAPSHOT
+version=5.5.0-SNAPSHOT
 description=JUnit5 integration for ReportPortal
 junit_version=5.9.3
 # We need runner for JUnit 4 compatibility tests

src/main/java/com/epam/reportportal/junit5/ReportPortalExtension.java

@@ -33,19 +33,21 @@
 import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
 import com.epam.ta.reportportal.ws.model.launch.StartLaunchRQ;
 import io.reactivex.Maybe;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.extension.*;
 import org.opentest4j.TestAbortedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
@@ -65,11 +67,12 @@
  */
 public class ReportPortalExtension
 		implements Extension, BeforeAllCallback, BeforeEachCallback, InvocationInterceptor, AfterTestExecutionCallback, AfterAllCallback,
-		           TestWatcher {
+				   TestWatcher {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(ReportPortalExtension.class);
 
-	private static final Set<String> ASSUMPTION_CLASSES = new HashSet<>(Arrays.asList(TestAbortedException.class.getCanonicalName(),
+	private static final Set<String> ASSUMPTION_CLASSES = new HashSet<>(Arrays.asList(
+			TestAbortedException.class.getCanonicalName(),
 			"org.junit.AssumptionViolatedException"
 	));
 
@@ -112,7 +115,7 @@ private void finish(String id) {
 
 	private static void finish(Launch launch) {
 		FinishExecutionRQ rq = new FinishExecutionRQ();
-		rq.setEndTime(Calendar.getInstance().getTime());
+		rq.setEndTime(Instant.now());
 		launch.finish(rq);
 	}
 
@@ -134,7 +137,7 @@ protected StartLaunchRQ buildStartLaunchRq(ListenerParameters parameters) {
 		Set<ItemAttributesRQ> attributes = new HashSet<>(parameters.getAttributes());
 		attributes.addAll(collectSystemAttributes(parameters.getSkippedAnIssue()));
 		rq.setAttributes(attributes);
-		rq.setStartTime(Calendar.getInstance().getTime());
+		rq.setStartTime(Instant.now());
 		rq.setRerun(parameters.isRerun());
 		rq.setRerunOf(StringUtils.isNotBlank(parameters.getRerunOf()) ? parameters.getRerunOf() : null);
 		return rq;
@@ -164,19 +167,21 @@ protected String getLaunchId(ExtensionContext context) {
 	 * @return represents current launch
 	 */
 	protected Launch getLaunch(ExtensionContext context) {
-		return launchMap.computeIfAbsent(getLaunchId(context), id -> {
-			ReportPortal rp = getReporter();
-			ListenerParameters params = rp.getParameters();
-			StartLaunchRQ rq = buildStartLaunchRq(params);
-
-			Launch launch = rp.newLaunch(rq);
-			Runtime.getRuntime().addShutdownHook(getShutdownHook(id));
-			Maybe<String> launchIdResponse = launch.start();
-			if (params.isCallbackReportingEnabled()) {
-				TEST_ITEM_TREE.setLaunchId(launchIdResponse);
-			}
-			return launch;
-		});
+		return launchMap.computeIfAbsent(
+				getLaunchId(context), id -> {
+					ReportPortal rp = getReporter();
+					ListenerParameters params = rp.getParameters();
+					StartLaunchRQ rq = buildStartLaunchRq(params);
+
+					Launch launch = rp.newLaunch(rq);
+					Runtime.getRuntime().addShutdownHook(getShutdownHook(id));
+					Maybe<String> launchIdResponse = launch.start();
+					if (params.isCallbackReportingEnabled()) {
+						TEST_ITEM_TREE.setLaunchId(launchIdResponse);
+					}
+					return launch;
+				}
+		);
 	}
 
 	@Override
@@ -377,7 +382,7 @@ public void testFailed(ExtensionContext context, Throwable cause) {
 	 */
 	protected void finishBeforeAll(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
 			ExtensionContext context, Maybe<String> id) throws Throwable {
-		Date startTime = Calendar.getInstance().getTime();
+		Instant startTime = Instant.now();
 		try {
 			finishBeforeAfter(invocation, context, id);
 		} catch (Throwable throwable) {
@@ -398,7 +403,7 @@ protected void finishBeforeAll(Invocation<Void> invocation, ReflectiveInvocation
 	 */
 	protected void finishBeforeEach(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
 			ExtensionContext context, Maybe<String> id) throws Throwable {
-		Date startTime = Calendar.getInstance().getTime();
+		Instant startTime = Instant.now();
 		try {
 			finishBeforeAfter(invocation, context, id);
 		} catch (Throwable throwable) {
@@ -465,29 +470,31 @@ protected void startTestItem(ExtensionContext context, List<Object> arguments, I
 	 * @param startTime   a start time of the item
 	 */
 	protected void startTestItem(@Nonnull final ExtensionContext context, @Nonnull final List<Object> arguments,
-			@Nonnull final ItemType itemType, @Nullable final String description, @Nullable final Date startTime) {
-		idMapping.computeIfAbsent(context, c -> {
-			StartTestItemRQ rq = buildStartStepRq(c, arguments, itemType, description, startTime);
-			Launch launch = getLaunch(c);
-
-			Maybe<String> parentId = c.getParent().flatMap(parent -> Optional.ofNullable(idMapping.get(parent))).orElse(null);
-			Maybe<String> itemId;
-			TestItemTree.TestItemLeaf leaf;
-			if (parentId == null) {
-				itemId = launch.startTestItem(rq);
-				leaf = createTestItemLeaf(itemId);
-			} else {
-				itemId = launch.startTestItem(parentId, rq);
-				leaf = createTestItemLeaf(parentId, itemId);
-			}
-			if (getReporter().getParameters().isCallbackReportingEnabled()) {
-				TEST_ITEM_TREE.getTestItems().put(createItemTreeKey(rq.getName()), leaf);
-			}
-			if (TEMPLATE == itemType) {
-				testTemplates.put(c, itemId);
-			}
-			return itemId;
-		});
+			@Nonnull final ItemType itemType, @Nullable final String description, @Nullable final Instant startTime) {
+		idMapping.computeIfAbsent(
+				context, c -> {
+					StartTestItemRQ rq = buildStartStepRq(c, arguments, itemType, description, startTime);
+					Launch launch = getLaunch(c);
+
+					Maybe<String> parentId = c.getParent().flatMap(parent -> Optional.ofNullable(idMapping.get(parent))).orElse(null);
+					Maybe<String> itemId;
+					TestItemTree.TestItemLeaf leaf;
+					if (parentId == null) {
+						itemId = launch.startTestItem(rq);
+						leaf = createTestItemLeaf(itemId);
+					} else {
+						itemId = launch.startTestItem(parentId, rq);
+						leaf = createTestItemLeaf(parentId, itemId);
+					}
+					if (getReporter().getParameters().isCallbackReportingEnabled()) {
+						TEST_ITEM_TREE.getTestItems().put(createItemTreeKey(rq.getName()), leaf);
+					}
+					if (TEMPLATE == itemType) {
+						testTemplates.put(c, itemId);
+					}
+					return itemId;
+				}
+		);
 	}
 
 	/**
@@ -648,10 +655,10 @@ protected Optional<Method> getTestMethod(ExtensionContext context) {
 
 	private Optional<Method> getOptionalTestMethod(ExtensionContext context) {
 		Optional<Method> optionalMethod = context.getTestMethod();
-		if (!optionalMethod.isPresent()) {
+		if (optionalMethod.isEmpty()) {
 			//if not present means that we are in the dynamic test, in this case we need to move to the parent context
 			Optional<ExtensionContext> parentContext = context.getParent();
-			if (!parentContext.isPresent()) {
+			if (parentContext.isEmpty()) {
 				return Optional.empty();
 			}
 			return parentContext.get().getTestMethod();
@@ -679,7 +686,7 @@ protected String createStepName(ExtensionContext context, ItemType itemType) {
 		}
 
 		Optional<Method> optionalMethod = getOptionalTestMethod(context);
-		if (!optionalMethod.isPresent()) {
+		if (optionalMethod.isEmpty()) {
 			return defaultValue;
 		}
 		Method method = optionalMethod.get();
@@ -710,9 +717,9 @@ protected String createStepName(ExtensionContext context, ItemType itemType) {
 	 */
 	@Nonnull
 	protected StartTestItemRQ buildStartStepRq(@Nonnull final ExtensionContext context, @Nonnull final List<Object> arguments,
-			@Nonnull final ItemType itemType, @Nullable final String description, @Nullable final Date startTime) {
+			@Nonnull final ItemType itemType, @Nullable final String description, @Nullable final Instant startTime) {
 		StartTestItemRQ rq = new StartTestItemRQ();
-		rq.setStartTime(ofNullable(startTime).orElseGet(Calendar.getInstance()::getTime));
+		rq.setStartTime(ofNullable(startTime).orElseGet(Instant::now));
 		rq.setName(createStepName(context, itemType));
 		rq.setDescription(ofNullable(description).orElseGet(() -> createStepDescription(context, itemType)));
 		rq.setType(itemType == TEMPLATE ? SUITE.name() : itemType.name());
@@ -750,7 +757,7 @@ protected StartTestItemRQ buildStartStepRq(@Nonnull final ExtensionContext conte
 	protected StartTestItemRQ buildStartConfigurationRq(@Nonnull Method method, @Nonnull ExtensionContext parentContext,
 			@Nonnull ExtensionContext context, @Nonnull ItemType itemType) {
 		StartTestItemRQ rq = new StartTestItemRQ();
-		rq.setStartTime(Calendar.getInstance().getTime());
+		rq.setStartTime(Instant.now());
 		Optional<Class<?>> testClass = context.getTestClass();
 		if (testClass.isPresent()) {
 			rq.setName(createConfigurationName(testClass.get(), method));
@@ -805,15 +812,16 @@ protected FinishTestItemRQ buildFinishTestRq(@Nonnull ExtensionContext context,
 		}
 		rq.setIssue(getIssue(context));
 		ofNullable(status).ifPresent(s -> rq.setStatus(s.name()));
-		rq.setEndTime(Calendar.getInstance().getTime());
+		rq.setEndTime(Instant.now());
 		return rq;
 	}
 
 	@Nullable
 	protected com.epam.ta.reportportal.ws.model.issue.Issue getIssue(@Nonnull ExtensionContext context) {
 		String stepName = createStepName(context, STEP);
 		List<ParameterResource> parameters = testParameters.containsKey(context) ? testParameters.remove(context) : Collections.emptyList();
-		return getOptionalTestMethod(context).map(m -> ofNullable(m.getAnnotation(Issues.class)).map(i -> IssueUtils.createIssue(i,
+		return getOptionalTestMethod(context).map(m -> ofNullable(m.getAnnotation(Issues.class)).map(i -> IssueUtils.createIssue(
+						i,
 						stepName,
 						parameters
 				)).orElseGet(() -> IssueUtils.createIssue(m.getAnnotation(Issue.class), stepName, parameters)))
@@ -832,7 +840,7 @@ protected com.epam.ta.reportportal.ws.model.issue.Issue getIssue(@Nonnull Extens
 	protected FinishTestItemRQ buildFinishTestItemRq(@Nonnull ExtensionContext context, @Nullable ItemStatus status) {
 		FinishTestItemRQ rq = new FinishTestItemRQ();
 		ofNullable(status).ifPresent(s -> rq.setStatus(s.name()));
-		rq.setEndTime(Calendar.getInstance().getTime());
+		rq.setEndTime(Instant.now());
 		return rq;
 	}
 
@@ -879,7 +887,7 @@ protected String createStepDescription(ExtensionContext context, final ItemType
 			return defaultValue;
 		}
 		Optional<Method> optionalMethod = getOptionalTestMethod(context);
-		if (!optionalMethod.isPresent()) {
+		if (optionalMethod.isEmpty()) {
 			return defaultValue;
 		}
 		Method method = optionalMethod.get();
@@ -918,11 +926,11 @@ protected String createConfigurationDescription(Class<?> testClass, Method metho
 	 * @param eventTime         <code>@BeforeEach</code> start time
 	 */
 	protected void reportSkippedStep(ReflectiveInvocationContext<Method> invocationContext, ExtensionContext context, Throwable throwable,
-			Date eventTime) {
-		Date skipStartTime = Calendar.getInstance().getTime();
-		if (skipStartTime.after(eventTime)) {
+			Instant eventTime) {
+		Instant skipStartTime = Instant.now();
+		if (skipStartTime.compareTo(eventTime) > 0) {
 			// to fix item ordering when @AfterEach starts in the same millisecond as skipped test
-			skipStartTime = new Date(skipStartTime.getTime() - 1);
+			skipStartTime = skipStartTime.minus(1, ChronoUnit.MILLIS);
 		}
 		final ItemType itemType = STEP;
 		startTestItem(context, invocationContext.getArguments(), itemType, createStepDescription(context, itemType), skipStartTime);
@@ -941,6 +949,6 @@ protected void reportSkippedStep(ReflectiveInvocationContext<Method> invocationC
 	 */
 	@SuppressWarnings("unused")
 	protected void reportSkippedClassTests(ReflectiveInvocationContext<Method> invocationContext, ExtensionContext context,
-			Date eventTime) {
+			Instant eventTime) {
 	}
 }

src/test/java/com/epam/reportportal/junit5/AssumptionsTest.java

@@ -61,15 +61,12 @@ public void setupMock() {
 		Launch launch = AssumptionsTestExtension.LAUNCH;
 		when(launch.getStepReporter()).thenReturn(StepReporter.NOOP_STEP_REPORTER);
 		when(launch.startTestItem(any())).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
-		when(launch.startTestItem(
-				any(),
-				any()
-		)).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
+		when(launch.startTestItem(any(), any())).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
 	}
 
 	@ParameterizedTest
-	@ValueSource(classes = {AssumptionFailedTest.class, Junit4AssumptionFailedTest.class,
-			AssertJAssumptionFailedTest.class, Junit4ExtendedAssumptionFailedTest.class})
+	@ValueSource(classes = { AssumptionFailedTest.class, Junit4AssumptionFailedTest.class, AssertJAssumptionFailedTest.class,
+			Junit4ExtendedAssumptionFailedTest.class })
 	public void verify_assumption_failure_marks_test_as_skipped(Class<?> testClass) {
 		TestUtils.runClasses(testClass);
 

src/test/java/com/epam/reportportal/junit5/AttributesTest.java

@@ -38,13 +38,11 @@ protected Launch getLaunch(ExtensionContext context) {
 	public void setupMock() {
 		AttributesTestExtension.LAUNCH = mock(Launch.class);
 		when(AttributesTestExtension.LAUNCH.startTestItem(any())).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
-		when(AttributesTestExtension.LAUNCH.startTestItem(any(),
-				any()
-		)).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
-		when(AttributesTestExtension.LAUNCH.finishTestItem(
+		when(AttributesTestExtension.LAUNCH.startTestItem(
 				any(),
 				any()
-		)).thenAnswer(invocation -> Maybe.just(new OperationCompletionRS()));
+		)).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
+		when(AttributesTestExtension.LAUNCH.finishTestItem(any(), any())).thenAnswer(invocation -> Maybe.just(new OperationCompletionRS()));
 	}
 
 	@Test

src/test/java/com/epam/reportportal/junit5/CodeReferenceTest.java

@@ -37,7 +37,8 @@ protected Launch getLaunch(ExtensionContext context) {
 	public void setupMock() {
 		CodeReferenceTestExtension.LAUNCH = mock(Launch.class);
 		when(CodeReferenceTestExtension.LAUNCH.startTestItem(any())).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
-		when(CodeReferenceTestExtension.LAUNCH.startTestItem(any(),
+		when(CodeReferenceTestExtension.LAUNCH.startTestItem(
+				any(),
 				any()
 		)).thenAnswer((Answer<Maybe<String>>) invocation -> CommonUtils.createMaybeUuid());
 	}