Added Cucumber and JUnit 5 tests to the smoketests

serenity-bdd · Oct 20, 2024 · e3da38c · e3da38c
1 parent bdd7641
commit e3da38c
Show file tree

Hide file tree

Showing 18 changed files with 161 additions and 187 deletions.
diff --git a/serenity-junit/src/main/java/net/serenitybdd/junit/runners/SerenityParameterizedRunner.java b/serenity-junit/src/main/java/net/serenitybdd/junit/runners/SerenityParameterizedRunner.java
@@ -30,7 +30,9 @@
 /**
  * Run a Serenity test suite using a set of data.
  * Similar to the JUnit parameterized tests, but better ;-).
+ * @Deprecated we recommend moving to JUnit 5 which supports data-driven tests natively.
  */
+@Deprecated
 public class SerenityParameterizedRunner extends Suite implements Taggable {
 
     private static final int AVAILABLE_PROCESSORS = Runtime.getRuntime().availableProcessors();

diff --git a/serenity-smoketests/pom.xml b/serenity-smoketests/pom.xml
@@ -21,7 +21,7 @@
         <browserstack.browser></browserstack.browser>
         <browserstack.version></browserstack.version>
         <junit-jupiter.version>5.11.2</junit-jupiter.version>
-        <junit-platform-suite-api.version>1.11.1</junit-platform-suite-api.version>
+        <junit-platform-suite-api.version>1.11.2</junit-platform-suite-api.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -148,6 +148,9 @@
                 <configuration>
                     <source>11</source>
                     <target>11</target>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/...-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/tasks/CompleteItems.java b/...-smoketests/src/main/java/net/serenitybdd/demos/todos/screenplay/tasks/CompleteItems.java
@@ -0,0 +1,20 @@
+package net.serenitybdd.demos.todos.screenplay.tasks;
+
+import net.serenitybdd.demos.todos.screenplay.user_interface.TodoListItem;
+import net.serenitybdd.screenplay.Performable;
+import net.serenitybdd.screenplay.Task;
+import net.serenitybdd.screenplay.actions.Click;
+
+import java.util.List;
+
+public class CompleteItems {
+    public static Performable called(List<String> itemNames) {
+        return Task.where("{0} completes the items called: " + itemNames,
+                actor -> {
+                    itemNames.forEach(itemName -> actor.attemptsTo(
+                            Click.on(TodoListItem.COMPLETE_ITEM.of(itemName))
+                    ));
+                }
+        );
+    }
+}
diff --git a/...application/LearnAboutTheApplication.java → ...application/LearnAboutTheApplication.java b/...application/LearnAboutTheApplication.java → ...application/LearnAboutTheApplication.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.demos.todos.pageobjects.features.accessing_the_application;
+package net.serenitybdd.demos.todos.pageobjects.features.accessing_application;
 
 import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps;
 import net.serenitybdd.junit.runners.SerenityRunner;

diff --git a/.../demos/todos/pageobjects/features/accessing_the_application/AddDifferentSortsOfTodos.java b/.../demos/todos/pageobjects/features/accessing_the_application/AddDifferentSortsOfTodos.java
diff --git a/...tures/completing_todos/CompleteATodo.java → ...s/completing_the_todos/CompleteATodo.java b/...tures/completing_todos/CompleteATodo.java → ...s/completing_the_todos/CompleteATodo.java
@@ -1,12 +1,11 @@
-package net.serenitybdd.demos.todos.pageobjects.features.completing_todos;
+package net.serenitybdd.demos.todos.pageobjects.features.completing_the_todos;
 
 import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps;
 import net.serenitybdd.junit.runners.SerenityRunner;
 import net.serenitybdd.annotations.Managed;
 import net.serenitybdd.annotations.Steps;
 import net.serenitybdd.annotations.WithTag;
 import net.serenitybdd.annotations.WithTags;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -18,7 +17,6 @@
         @WithTag("version:RELEASE-2"),
         @WithTag("smoke"),
 })
-
 public class CompleteATodo {
 
     @Managed(uniqueSession = true)

diff --git a/...ures/completing_todos/ToggleAllTodos.java → .../completing_the_todos/ToggleAllTodos.java b/...ures/completing_todos/ToggleAllTodos.java → .../completing_the_todos/ToggleAllTodos.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.demos.todos.pageobjects.features.completing_todos;
+package net.serenitybdd.demos.todos.pageobjects.features.completing_the_todos;
 
 import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps;
 import net.serenitybdd.junit.runners.SerenityRunner;

diff --git a/...erenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/TodosBelongToAUser.java b/...erenitybdd/demos/todos/pageobjects/features/maintain_my_todo_list/TodosBelongToAUser.java
diff --git a/...ain_my_todo_list/ClearCompletedTodos.java → ...in_the_todo_list/ClearCompletedTodos.java b/...ain_my_todo_list/ClearCompletedTodos.java → ...in_the_todo_list/ClearCompletedTodos.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.demos.todos.pageobjects.features.maintain_my_todo_list;
+package net.serenitybdd.demos.todos.pageobjects.features.maintain_the_todo_list;
 
 import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps;
 import net.serenitybdd.junit.runners.SerenityRunner;

diff --git a/...es/maintain_my_todo_list/DeleteTodos.java → ...s/maintain_the_todo_list/DeleteTodos.java b/...es/maintain_my_todo_list/DeleteTodos.java → ...s/maintain_the_todo_list/DeleteTodos.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.demos.todos.pageobjects.features.maintain_my_todo_list;
+package net.serenitybdd.demos.todos.pageobjects.features.maintain_the_todo_list;
 
 import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps;
 import net.serenitybdd.junit.runners.SerenityRunner;

diff --git a/...maintain_my_todo_list/FilteringTodos.java → ...aintain_the_todo_list/FilteringTodos.java b/...maintain_my_todo_list/FilteringTodos.java → ...aintain_the_todo_list/FilteringTodos.java
@@ -1,4 +1,4 @@
-package net.serenitybdd.demos.todos.pageobjects.features.maintain_my_todo_list;
+package net.serenitybdd.demos.todos.pageobjects.features.maintain_the_todo_list;
 
 import net.serenitybdd.demos.todos.pageobjects.model.TodoStatusFilter;
 import net.serenitybdd.demos.todos.pageobjects.steps.TodoUserSteps;

diff --git a/...d/demos/todos/screenplay/features/accessing_the_application/LearnAboutTheApplication.java b/...d/demos/todos/screenplay/features/accessing_the_application/LearnAboutTheApplication.java
@@ -1,17 +1,16 @@
 package net.serenitybdd.demos.todos.screenplay.features.accessing_the_application;
 
+import net.serenitybdd.annotations.Managed;
 import net.serenitybdd.demos.todos.screenplay.questions.Application;
 import net.serenitybdd.demos.todos.screenplay.questions.Placeholder;
 import net.serenitybdd.demos.todos.screenplay.tasks.Start;
-import net.serenitybdd.junit.runners.SerenityRunner;
+import net.serenitybdd.junit5.SerenityJUnit5Extension;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.abilities.BrowseTheWeb;
-import net.serenitybdd.annotations.Managed;
-import net.serenitybdd.annotations.WithTag;
-import net.serenitybdd.annotations.WithTags;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.openqa.selenium.WebDriver;
 
 import static net.serenitybdd.screenplay.GivenWhenThen.*;
@@ -23,19 +22,15 @@
 /**
  * This example illustrates using Serenity Steps with JUnit.
  */
-@RunWith(SerenityRunner.class)
-@WithTags({
-        @WithTag("Screenplay pattern"),
-        @WithTag("version:RELEASE-1"),
-})
+@ExtendWith(SerenityJUnit5Extension.class)
 public class LearnAboutTheApplication {
 
     private Actor james = Actor.named("James");
 
     @Managed
     private WebDriver hisBrowser;
 
-    @Before
+    @BeforeEach
     public void jamesCanBrowseTheWeb() {
         james.can(BrowseTheWeb.with(hisBrowser));
     }

diff --git a/.../java/net/serenitybdd/demos/todos/screenplay/features/completing_todos/CompleteATodo.java b/.../java/net/serenitybdd/demos/todos/screenplay/features/completing_todos/CompleteATodo.java
@@ -1,66 +1,61 @@
 package net.serenitybdd.demos.todos.screenplay.features.completing_todos;
 
+import net.serenitybdd.annotations.Managed;
 import net.serenitybdd.demos.todos.screenplay.questions.TheItemStatus;
 import net.serenitybdd.demos.todos.screenplay.questions.TheItems;
 import net.serenitybdd.demos.todos.screenplay.tasks.CompleteItem;
 import net.serenitybdd.demos.todos.screenplay.tasks.Start;
-import net.serenitybdd.junit.runners.SerenityRunner;
+import net.serenitybdd.junit5.SerenityJUnit5Extension;
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.abilities.BrowseTheWeb;
-import net.serenitybdd.annotations.Managed;
-import net.serenitybdd.annotations.WithTag;
-import net.serenitybdd.annotations.WithTags;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.openqa.selenium.WebDriver;
 
 import static net.serenitybdd.demos.todos.screenplay.model.TodoStatus.Completed;
 import static net.serenitybdd.screenplay.GivenWhenThen.*;
 import static org.hamcrest.CoreMatchers.is;
 
-@RunWith(SerenityRunner.class)
-@WithTags({
-        @WithTag("Screenplay pattern"),
-        @WithTag("version:RELEASE-1"),
-})
+@ExtendWith(SerenityJUnit5Extension.class)
 public class CompleteATodo {
 
     private Actor james = Actor.named("James");
 
     @Managed
     private WebDriver hisBrowser;
 
-    @Before public void jamesCanBrowseTheWeb() {
+    @BeforeEach
+    public void jamesCanBrowseTheWeb() {
         james.can(BrowseTheWeb.with(hisBrowser));
     }
 
     @Test
     public void should_be_able_to_complete_a_todo() {
 
         givenThat(james).wasAbleTo(
-            Start.withATodoListContaining("Walk the dog", "Put out the garbage")
+                Start.withATodoListContaining("Walk the dog", "Put out the garbage")
         );
 
         when(james).attemptsTo(
-            CompleteItem.called("Walk the dog")
+                CompleteItem.called("Walk the dog")
         );
 
         then(james).should(
-            seeThat(TheItemStatus.forTheItemCalled("Walk the dog"), is(Completed)),
-            seeThat(TheItems.leftCount(), is(1))
+                seeThat(TheItemStatus.forTheItemCalled("Walk the dog"), is(Completed)),
+                seeThat(TheItems.leftCount(), is(1))
         );
     }
 
     @Test
     public void should_see_the_number_of_todos_decrease_when_an_item_is_completed() {
 
         givenThat(james).wasAbleTo(
-            Start.withATodoListContaining("Walk the dog", "Put out the garbage")
+                Start.withATodoListContaining("Walk the dog", "Put out the garbage")
         );
 
         when(james).attemptsTo(
-            CompleteItem.called("Walk the dog")
+                CompleteItem.called("Walk the dog")
         );
 
         then(james).should(seeThat(TheItems.leftCount(), is(1)));