Versions promote

Author: HardNorth

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- Class level `@Attributes` annotation support
+### Changed
+- Version promoted to stable release
+- Client version updated on [5.1.0](https://github.com/reportportal/client-java/releases/tag/5.1.0)
 
 ## [5.1.0-RC-4]
 ### Added

build.gradle

@@ -28,9 +28,9 @@ repositories {
 }
 
 dependencies {
-    api 'com.epam.reportportal:client-java:5.1.0-RC-12'
+    api 'com.epam.reportportal:client-java:5.1.0'
     api 'com.epam.reportportal:commons-model:5.0.0'
-    api 'com.nordstrom.tools:junit-foundation:15.3.0'
+    api 'com.nordstrom.tools:junit-foundation:15.3.4'
     api 'com.google.code.findbugs:jsr305:3.0.2'
 
     implementation 'org.slf4j:slf4j-api:1.7.25'

gradle.properties

@@ -1,4 +1,4 @@
-version=5.1.0-RC-5-SNAPSHOT
+version=5.1.0-SNAPSHOT
 description=ReportPortal JUnit 4 client
 junit5_version=5.6.3
 junit5_runner_version=1.6.3

src/main/java/com/epam/reportportal/junit/ReportPortalListener.java

@@ -54,6 +54,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.*;
@@ -393,8 +394,7 @@ protected void finishTest(@Nonnull final AtomicTest testContext) {
 					if (ItemStatus.FAILED == theoryStatus) {
 						sendReportPortalMsg(l.getItemId(), LogLevel.ERROR, context.getTestThrowable(key));
 					}
-					stopTestMethod(
-							l,
+					stopTestMethod(l,
 							method,
 							buildFinishStepRq(runner, method, callable, theoryStatus == null ? ItemStatus.PASSED : theoryStatus)
 					);
@@ -1031,6 +1031,12 @@ protected String getCodeRef(@Nonnull final FrameworkMethod frameworkMethod) {
 		return TestCaseIdUtils.getCodeRef(frameworkMethod.getMethod());
 	}
 
+	@Nonnull
+	private Set<ItemAttributesRQ> getAttributes(@Nonnull final AnnotatedElement annotatedElement) {
+		return ofNullable(annotatedElement.getAnnotation(Attributes.class)).map(AttributeParser::retrieveAttributes)
+				.orElse(Collections.emptySet());
+	}
+
 	/**
 	 * Extract and returns static attributes of a test class (set with {@link Category} annotation)
 	 *
@@ -1039,8 +1045,12 @@ protected String getCodeRef(@Nonnull final FrameworkMethod frameworkMethod) {
 	 */
 	@Nonnull
 	protected Set<ItemAttributesRQ> getAttributes(@Nonnull final TestClass testClass) {
-		return ofNullable(testClass.getAnnotation(Category.class)).map(a -> Arrays.stream(a.value())
-				.map(c -> new ItemAttributesRQ(null, c.getSimpleName()))).orElse(Stream.empty()).collect(Collectors.toSet());
+		Stream<ItemAttributesRQ> categories = ofNullable(testClass.getAnnotation(Category.class)).map(a -> Arrays.stream(a.value())
+				.map(c -> new ItemAttributesRQ(null, c.getSimpleName()))).orElse(Stream.empty());
+		Stream<ItemAttributesRQ> attributes = ofNullable(testClass.getJavaClass()).map(this::getAttributes)
+				.map(Set::stream)
+				.orElse(Stream.empty());
+		return Stream.concat(categories, attributes).collect(Collectors.toSet());
 	}
 
 	/**
@@ -1053,8 +1063,9 @@ protected Set<ItemAttributesRQ> getAttributes(@Nonnull final TestClass testClass
 	protected Set<ItemAttributesRQ> getAttributes(@Nonnull final FrameworkMethod frameworkMethod) {
 		Stream<ItemAttributesRQ> categories = ofNullable(frameworkMethod.getAnnotation(Category.class)).map(a -> Arrays.stream(a.value())
 				.map(c -> new ItemAttributesRQ(null, c.getSimpleName()))).orElse(Stream.empty());
-		Stream<ItemAttributesRQ> attributes = ofNullable(frameworkMethod.getMethod()).flatMap(m -> ofNullable(m.getAnnotation(Attributes.class)).map(
-				a -> AttributeParser.retrieveAttributes(a).stream())).orElse(Stream.empty());
+		Stream<ItemAttributesRQ> attributes = ofNullable(frameworkMethod.getMethod()).map(this::getAttributes)
+				.orElse(Collections.emptySet())
+				.stream();
 		return Stream.concat(categories, attributes).collect(Collectors.toSet());
 	}
 

src/test/java/com/epam/reportportal/junit/attribute/ClassKvAttributeTest.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.epam.reportportal.junit.attribute;
+
+import com.epam.reportportal.junit.ReportPortalListener;
+import com.epam.reportportal.junit.features.attribute.ClassLevelKeyValueAttributeTest;
+import com.epam.reportportal.junit.utils.TestUtils;
+import com.epam.reportportal.service.ReportPortal;
+import com.epam.reportportal.service.ReportPortalClient;
+import com.epam.reportportal.util.test.CommonUtils;
+import com.epam.ta.reportportal.ws.model.StartTestItemRQ;
+import com.epam.ta.reportportal.ws.model.attribute.ItemAttributesRQ;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
+
+import static com.epam.reportportal.junit.utils.TestUtils.PROCESSING_TIMEOUT;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.*;
+
+public class ClassKvAttributeTest {
+
+	private final String classId = CommonUtils.namedId("class_");
+	private final String methodId = CommonUtils.namedId("method_");
+
+	private final ReportPortalClient client = mock(ReportPortalClient.class);
+
+	@BeforeEach
+	public void setupMock() {
+		TestUtils.mockLaunch(client, null, null, classId, methodId);
+		TestUtils.mockBatchLogging(client);
+		ReportPortalListener.setReportPortal(ReportPortal.create(client, TestUtils.standardParameters(), TestUtils.testExecutor()));
+	}
+
+	@Test
+	public void verify_static_attribute_bypass() {
+		TestUtils.runClasses(ClassLevelKeyValueAttributeTest.class);
+
+		ArgumentCaptor<StartTestItemRQ> captor = ArgumentCaptor.forClass(StartTestItemRQ.class);
+		verify(client, timeout(PROCESSING_TIMEOUT)).startTestItem(
+				ArgumentMatchers.startsWith(TestUtils.ROOT_SUITE_PREFIX),
+				captor.capture()
+		);
+
+		StartTestItemRQ suiteRq = captor.getValue();
+		assertThat(suiteRq.getAttributes(), allOf(notNullValue(), hasSize(1)));
+		ItemAttributesRQ attribute = suiteRq.getAttributes().iterator().next();
+		assertThat(attribute.getKey(), equalTo(ClassLevelKeyValueAttributeTest.KEY));
+		assertThat(attribute.getValue(), equalTo(ClassLevelKeyValueAttributeTest.VALUE));
+
+		captor = ArgumentCaptor.forClass(StartTestItemRQ.class);
+		verify(client, timeout(PROCESSING_TIMEOUT)).startTestItem(same(classId), captor.capture());
+		StartTestItemRQ testRq = captor.getValue();
+		assertThat(testRq.getAttributes(), anyOf(nullValue(), emptyIterable()));
+	}
+}

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 EPAM Systems
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.epam.reportportal.junit.features.attribute;
+
+import com.epam.reportportal.annotations.attribute.Attribute;
+import com.epam.reportportal.annotations.attribute.Attributes;
+import org.junit.Test;
+
+@Attributes(attributes = { @Attribute(key = ClassLevelKeyValueAttributeTest.KEY, value = ClassLevelKeyValueAttributeTest.VALUE) })
+public class ClassLevelKeyValueAttributeTest {
+
+	public static final String KEY = "attribute_test_key";
+	public static final String VALUE = "attribute_test_value";
+
+	@Test
+	public void first() {
+		System.out.println("Test class: " + getClass().getCanonicalName());
+	}
+}