Merge pull request #75 from reportportal/develop

Release

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
 ## [Unreleased]
+### Added
+- A test retry feature which is based on corresponding JunitFoundation's
+  [feature](https://github.com/sbabcoc/JUnit-Foundation#automatic-retry-of-failed-tests).
+- `@Ignore` annotation support
+### Changed
+- JunitFoundation version was updated on 12.3.0
 
 ## [5.0.0-BETA-12]
 ### Changed
@@ -11,7 +17,7 @@
 - Client version updated on [5.0.13](https://github.com/reportportal/client-java/releases/tag/5.0.13)
 ### Removed
 - Some protected methods for extensions implementation were removed due to their redundancy. Alternative methods for extensions will be 
-added in further implementation.
+  added in further implementation.
 
 ## [5.0.0-BETA-11]
 

build.gradle

@@ -55,7 +55,7 @@ dependencies {
     api 'com.epam.reportportal:client-java:5.0.13'
     api 'com.epam.reportportal:commons-model:5.0.0'
     api 'com.google.code.findbugs:jsr305:3.0.2'
-    api ('com.nordstrom.tools:junit-foundation:12.2.0') {
+    api ('com.nordstrom.tools:junit-foundation:12.3.0') {
         exclude module: 'junit'
     }
     api 'junit:junit:4.13.1'

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

@@ -16,6 +16,7 @@
 package com.epam.reportportal.junit;
 
 import com.epam.reportportal.listeners.ItemStatus;
+import com.epam.ta.reportportal.ws.model.FinishTestItemRQ;
 import com.nordstrom.automation.junit.AtomicTest;
 import org.junit.internal.runners.model.ReflectiveCallable;
 import org.junit.runners.model.FrameworkMethod;
@@ -83,12 +84,21 @@ public interface IListenerHandler {
 	 */
 	void stopTestMethod(Object runner, FrameworkMethod method, ReflectiveCallable callable);
 
+	/**
+	 * Send a <b>finish test item</b> request for the indicated test method to Report Portal.
+	 *
+	 * @param runner JUnit test runner
+	 * @param method {@link FrameworkMethod} object for test
+	 * @param rq     {@link FinishTestItemRQ} a finish request to send
+	 */
+	void stopTestMethod(Object runner, FrameworkMethod method, FinishTestItemRQ rq);
+
 	/**
 	 * Record the status of the specified test method.
 	 *
 	 * @param callable {@link ReflectiveCallable} object being intercepted
 	 * @param status   test completion status
-	 * @deprecated
+	 * @deprecated use {@link #markCurrentTestMethod(ReflectiveCallable, ItemStatus)}
 	 */
 	@Deprecated
 	void markCurrentTestMethod(ReflectiveCallable callable, String status);
@@ -98,9 +108,7 @@ public interface IListenerHandler {
 	 *
 	 * @param callable {@link ReflectiveCallable} object being intercepted
 	 * @param status   test completion status
-	 * @deprecated
 	 */
-	@Deprecated
 	void markCurrentTestMethod(ReflectiveCallable callable, ItemStatus status);
 
 	/**

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

@@ -17,12 +17,11 @@
 
 import com.epam.reportportal.listeners.ItemStatus;
 import com.epam.reportportal.service.tree.TestItemTree;
-import com.nordstrom.automation.junit.AtomicTest;
-import io.reactivex.Maybe;
 import org.junit.internal.runners.model.ReflectiveCallable;
 import org.junit.runner.Description;
 import org.junit.runners.model.FrameworkMethod;
 
+import javax.annotation.Nullable;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -67,6 +66,7 @@ public void setStatusOfTestMethod(ReflectiveCallable callable, ItemStatus status
 	 * @param callable {@link ReflectiveCallable} object being intercepted
 	 * @return status for test method
 	 */
+	@Nullable
 	public ItemStatus getStatusOfTestMethod(ReflectiveCallable callable) {
 		return statusOfTestMethod.get(callable);
 	}