Merge pull request #113 from reportportal/develop

Release

Author: HardNorth

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Client version updated on [5.3.14](https://github.com/reportportal/client-java/releases/tag/5.3.14), by @HardNorth
+- JUnit-Foundation updated on [17.2.4](https://github.com/sbabcoc/JUnit-Foundation/releases/tag/junit-foundation-17.2.4), by @HardNorth
 
 ## [5.2.4]
 ### Changed

build.gradle

@@ -39,12 +39,12 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.2.25'
-    api 'com.nordstrom.tools:junit-foundation:17.1.1'
+    api 'com.epam.reportportal:client-java:5.3.14'
+    api 'com.nordstrom.tools:junit-foundation:17.2.4'
 
     implementation 'org.slf4j:slf4j-api:2.0.7'
 
-    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.7'
+    testImplementation 'com.epam.reportportal:agent-java-test-utils:0.0.12'
 
     testImplementation 'org.aspectj:aspectjweaver:1.9.19'
     testImplementation 'org.hamcrest:hamcrest-core:2.2'

gradle.properties

@@ -1,4 +1,4 @@
-version=5.2.5-SNAPSHOT
+version=5.3.0-SNAPSHOT
 description=ReportPortal JUnit 4 client
 junit5_version=5.6.3
 junit5_runner_version=1.6.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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

@@ -28,6 +28,7 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatchers;
 
+import java.util.Arrays;
 import java.util.List;
 
 import static com.epam.reportportal.junit.utils.TestUtils.PROCESSING_TIMEOUT;
@@ -52,6 +53,11 @@ public void setupMock() {
 	@Test
 	public void verify_static_test_code_reference_generation() {
 		TestUtils.runClasses(CodeRefTest.class);
+		String methodName = Arrays.stream(CodeRefTest.class.getDeclaredMethods())
+				.filter(m -> m.getAnnotation(org.junit.Test.class) != null)
+				.findAny()
+				.orElseThrow(() -> new IllegalArgumentException("No test method in test class"))
+				.getName();
 
 		ArgumentCaptor<StartTestItemRQ> captor = ArgumentCaptor.forClass(StartTestItemRQ.class);
 		verify(client, timeout(PROCESSING_TIMEOUT)).startTestItem(ArgumentMatchers.startsWith("root_"), captor.capture());
@@ -65,9 +71,7 @@ public void verify_static_test_code_reference_generation() {
 
 		assertThat(classRq.getCodeRef(), allOf(notNullValue(), equalTo(CodeRefTest.class.getCanonicalName())));
 		assertThat(classRq.getType(), allOf(notNullValue(), equalTo(ItemType.TEST.name())));
-		assertThat(testRq.getCodeRef(), allOf(notNullValue(),
-				equalTo(CodeRefTest.class.getCanonicalName() + "." + CodeRefTest.class.getDeclaredMethods()[0].getName())
-		));
+		assertThat(testRq.getCodeRef(), allOf(notNullValue(), equalTo(CodeRefTest.class.getCanonicalName() + "." + methodName)));
 	}
 
 }

src/test/java/com/epam/reportportal/junit/features/attribute/MultiValueAttributeTest.java

@@ -23,12 +23,16 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 public class MultiValueAttributeTest {
 	private static final String VALUE_1 = "v1";
 	private static final String VALUE_2 = "v2";
 
-	public static final Collection<Pair<String, String>> ATTRIBUTES = Arrays.asList(Pair.of(null, VALUE_1), Pair.of(null, VALUE_2));
+	public static final Collection<Pair<String, String>> ATTRIBUTES = Collections.unmodifiableList(Arrays.asList(
+			Pair.of(null, VALUE_1),
+			Pair.of(null, VALUE_2)
+	));
 
 	@Test
 	@Attributes(multiValueAttributes = { @MultiValueAttribute(isNullKey = true, values = { VALUE_1, VALUE_2 }) })

src/test/java/com/epam/reportportal/junit/features/attribute/MultipleAttributeTest.java

@@ -24,6 +24,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 public class MultipleAttributeTest {
 	private static final String KEY_1 = "key1";
@@ -36,11 +37,12 @@ public class MultipleAttributeTest {
 	private static final String VALUE_3 = "v";
 	private static final String VALUE_4 = VALUE_3;
 
-	public static final Collection<Pair<String, String>> ATTRIBUTES = Arrays.asList(Pair.of(KEY_1, VALUE_1),
+	public static final Collection<Pair<String, String>> ATTRIBUTES = Collections.unmodifiableList(Arrays.asList(
+			Pair.of(KEY_1, VALUE_1),
 			Pair.of(KEY_2, VALUE_2),
 			Pair.of(KEY_3, VALUE_3),
 			Pair.of(KEY_4, VALUE_4)
-	);
+	));
 
 	@Test
 	@Attributes(attributes = { @Attribute(key = KEY_1, value = VALUE_1), @Attribute(key = KEY_2, value = VALUE_2) }, multiKeyAttributes = {

src/test/java/com/epam/reportportal/junit/testcaseid/TestCaseIdStaticTest.java

@@ -27,6 +27,8 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 
+import java.util.Arrays;
+
 import static com.epam.reportportal.junit.utils.TestUtils.PROCESSING_TIMEOUT;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
@@ -51,12 +53,17 @@ public void setupMock() {
 	@Test
 	public void verify_static_test_case_id_generation() {
 		TestUtils.runClasses(CodeRefTest.class);
+		String methodName = Arrays.stream(CodeRefTest.class.getDeclaredMethods())
+				.filter(m -> m.getAnnotation(org.junit.Test.class) != null)
+				.findAny()
+				.orElseThrow(() -> new IllegalArgumentException("No test method in test class"))
+				.getName();
 
 		ArgumentCaptor<StartTestItemRQ> captor = ArgumentCaptor.forClass(StartTestItemRQ.class);
 		verify(client, timeout(PROCESSING_TIMEOUT)).startTestItem(same(classId), captor.capture());
 
 		assertThat(captor.getValue().getTestCaseId(), allOf(notNullValue(),
-				equalTo(CodeRefTest.class.getCanonicalName() + "." + CodeRefTest.class.getDeclaredMethods()[0].getName())
+				equalTo(CodeRefTest.class.getCanonicalName() + "." + methodName)
 		));
 	}
 }