Refactor Cucumber examples

example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/BasicRunTest.java

@@ -5,7 +5,10 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@CucumberOptions(plugin = "com.epam.reportportal.cucumber.ScenarioReporter",
-		features = "src/test/resources/features/attributes", glue = "com.epam.reportportal.example.cucumber6.attributes")
+@CucumberOptions(
+		plugin = { "pretty", "html:report.html", "com.epam.reportportal.example.cucumber6.attributes.KeyValueAttributeReporter" },
+		features = "src/test/resources/features",
+		tags = "not @ignore",
+		glue = "com.epam.reportportal.example.cucumber6.glue")
 public class BasicRunTest {
 }

example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/attributes/Stepdefs.java → example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/glue/attributes/Stepdefs.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.epam.reportportal.example.cucumber6.attributes;
+package com.epam.reportportal.example.cucumber6.glue.attributes;
 
 import com.epam.reportportal.annotations.attribute.Attribute;
 import com.epam.reportportal.annotations.attribute.Attributes;

example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/logging/LaunchIdLogging.java → example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/glue/logging/LaunchIdLogging.java

@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package com.epam.reportportal.example.cucumber6.logging;
+package com.epam.reportportal.example.cucumber6.glue.logging;
 
-import com.epam.reportportal.example.cucumber6.RunLoggingTest;
+import com.epam.reportportal.example.cucumber6.BasicRunTest;
 import com.epam.reportportal.service.Launch;
 import com.epam.ta.reportportal.ws.model.launch.LaunchResource;
 import io.cucumber.java.en.Given;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import retrofit2.HttpException;
 
 import static java.util.Optional.ofNullable;
 
 /**
- * An example how to get and report current Launch ID, run {@link RunLoggingTest} class to see results.
+ * An example how to get and report current Launch ID, run {@link BasicRunTest} class to see results.
  */
 public class LaunchIdLogging {
 	private static final Logger LOGGER = LoggerFactory.getLogger(LaunchIdLogging.class);
@@ -35,8 +36,22 @@ public class LaunchIdLogging {
 	public void logLaunchLink() {
 		ofNullable(Launch.currentLaunch()).ifPresent(l -> {
 			String launchUuid = l.getLaunch().blockingGet();
-			LaunchResource launchInfo = l.getClient().getLaunchByUuid(launchUuid).blockingGet();
-			LOGGER.info("Launch ID: {}", launchInfo.getLaunchId());
+			int tries = 0;
+			LaunchResource launchInfo = null;
+			do {
+				try {
+					launchInfo =  l.getClient().getLaunchByUuid(launchUuid).blockingGet();
+					break;
+				} catch (HttpException e) {
+					LOGGER.error("Failed to get launch ID", e);
+					try {
+						Thread.sleep(1000);
+					} catch (InterruptedException ex) {
+						throw new RuntimeException(ex);
+					}
+				}
+			} while (tries++ < 5);
+			LOGGER.info("Launch ID: {}", ofNullable(launchInfo).map(LaunchResource::getLaunchId).orElse(null));
 		});
 	}
 }

example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/logging/LaunchUrlLogging.java → example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/glue/logging/LaunchUrlLogging.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.epam.reportportal.example.cucumber6.logging;
+package com.epam.reportportal.example.cucumber6.glue.logging;
 
-import com.epam.reportportal.example.cucumber6.RunLoggingTest;
+import com.epam.reportportal.example.cucumber6.BasicRunTest;
 import com.epam.reportportal.listeners.ListenerParameters;
 import com.epam.reportportal.service.Launch;
 import io.cucumber.java.en.Given;
@@ -26,7 +26,7 @@
 import static java.util.Optional.ofNullable;
 
 /**
- * An example how to get and report current Launch URL, run {@link RunLoggingTest} class to see results.
+ * An example how to get and report current Launch URL, run {@link BasicRunTest} class to see results.
  */
 public class LaunchUrlLogging {
 	private static final Logger LOGGER = LoggerFactory.getLogger(LaunchUrlLogging.class);

example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/selenium/ScreenshotOnFailureHooks.java → example-cucumber6/src/test/java/com/epam/reportportal/example/cucumber6/glue/selenium/ScreenshotOnFailureHooks.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.epam.reportportal.example.cucumber6.selenium;
+package com.epam.reportportal.example.cucumber6.glue.selenium;
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
@@ -36,7 +36,7 @@ public class ScreenshotOnFailureHooks {
 
 	private WebDriver driver;
 
-	@Before
+	@Before("@selenium")
 	public void beforeScenario() {
 		driver = new ChromeDriver();
 	}
@@ -45,10 +45,11 @@ public void beforeScenario() {
 	public void test() {
 		driver.navigate().to("https://www.example.com");
 		LOGGER.warn("A failure test for demonstration, check out 'After hooks' for the failure screenshot");
-		Assert.assertEquals("Google", driver.getTitle());
+		String envTitle = System.getenv("RP_EXPECTED_TITLE");
+		Assert.assertEquals(envTitle == null ? "Google" : envTitle, driver.getTitle());
 	}
 
-	@After
+	@After("@selenium")
 	public void afterScenario(Scenario scenario) {
 		takeScreenshot(scenario);
 		driver.quit();

example-cucumber6/src/test/resources/features/selenium/screenshot.feature

@@ -1,4 +1,5 @@
 Feature: Screenshot reporting
 
+  @selenium
   Scenario: Screenshot
     Given I report scenario with screenshot