junit version for serenity

Author: jonathanaustin

Diff for: model-api/pom.xml

@@ -18,8 +18,8 @@
 	<dependencies>
 		<!-- Junit -->
 		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<!-- POJO Tester -->

Diff for: model-bdd/src/main/resources/api/bdd/features/RetrieveClient.feature

@@ -9,9 +9,9 @@ Scenario: Retrieve a valid client
   Then User gets "ORG1" client
 
 Scenario: Retrieve an invalid client
-  When User retrieves client "notfound"
-  Then User gets client exception for "notfound"
+  When User retrieves a client that does not exist
+  Then User gets client not found exception for retrieve
 
 Scenario: Retrieve a client has a system error
-  When User retrieves client "error"
-  Then User gets service exception for "error"
+  When User retrieves client that causes a service exception
+  Then User gets service exception for retrieve

Diff for: model-bdd/src/main/resources/api/bdd/features/UpdateClient.feature

@@ -0,0 +1,26 @@
+Feature: Update client details
+  User wants to update a client
+
+Background: Client service available
+  Given A client update service is available
+
+Scenario: Update a client
+  When User retrieves client "ORG1"
+   And User updates client name to "foo"
+   And User submits client "ORG1"
+  Then User gets updated client "ORG1"
+
+Scenario: Update a client with validation error
+  When User retrieves client "ORG1"
+   And User updates client name to blank
+   And User submits client "ORG1"
+  Then User gets validation exception for "ORG1"
+
+Scenario: Update an invalid client
+  When User submits a client that does not exist
+  Then User gets client not found exception for update
+
+Scenario: Update a client has a system error
+  When User retrieves client "ORG1"
+   And User submits a client that receives a service exception
+  Then User gets service exception for update

Diff for: model-mock-impl/pom.xml

@@ -49,7 +49,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 

Diff for: model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveApplicationSteps.java renamed to model-mock-impl/src/test/java/com/sample/app/model/bdd/steps/RetrieveClientSteps.java

@@ -5,29 +5,29 @@
 import com.sample.app.model.exception.ServiceException;
 import com.sample.app.model.impl.ClientServicesMockImpl;
 import com.sample.app.model.services.ClientServices;
-import cucumber.api.java.en.Given;
-import cucumber.api.java.en.Then;
-import cucumber.api.java.en.When;
+import io.cucumber.java.en.Given;
+import io.cucumber.java.en.Then;
+import io.cucumber.java.en.When;
 import org.junit.Assert;
 
 /**
  * Retrieve client steps.
  */
-public class RetrieveApplicationSteps {
+public class RetrieveClientSteps {
 
 	private final ClientServices backing = new ClientServicesMockImpl();
 
 	private ClientDetail client;
 	private Exception error;
 
 	@Given("A client retrieve service is available")
-	public void wantToRetrieveApplication() {
+	public void wantToRetrieveClient() {
 		this.error = null;
 		this.client = null;
 	}
 
 	@When("User retrieves client {string}")
-	public void retrieveApplication(final String id) {
+	public void retrieveClient(final String id) {
 		client = null;
 		error = null;
 		try {
@@ -37,20 +37,30 @@ public void retrieveApplication(final String id) {
 		}
 	}
 
+	@When("User retrieves a client that does not exist")
+	public void retrieveClientNotExists() {
+		retrieveClient("notfound");
+	}
+
+	@When("User retrieves client that causes a service exception")
+	public void retrieveClientCausesError() {
+		retrieveClient("error");
+	}
+
 	@Then("User gets {string} client")
 	public void shouldHaveApplication(final String id) {
 		Assert.assertNotNull("Client should have been retrieved", client);
 		Assert.assertEquals("Incorrect client id retrieved", id, client.getClientId());
 	}
 
-	@Then("User gets client exception for {string}")
-	public void shouldHaveApplicationException(final String id) {
-		Assert.assertTrue("Service should have created not found exception", error instanceof ClientNotFoundException);
+	@Then("User gets client not found exception for retrieve")
+	public void shouldHaveClientNotFoundException() {
+		Assert.assertTrue("Service should have caused client not found exception", error instanceof ClientNotFoundException);
 	}
 
-	@Then("User gets service exception for {string}")
-	public void shouldHaveServiceException(final String id) {
-		Assert.assertTrue("Service should have created service exception", error instanceof ServiceException);
+	@Then("User gets service exception for retrieve")
+	public void shouldHaveServiceException() {
+		Assert.assertTrue("Service should have caused service exception", error instanceof ServiceException);
 	}
 
 }

Diff for: pom.xml

@@ -223,6 +223,14 @@
 				<version>0.8.13</version>
 			</dependency>
 
+			<!-- Serenity & Cucumber only work with junit 4 (and not vintage junit 5) -->
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.12</version>
+				<scope>test</scope>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 

Diff for: rest-api/pom.xml

@@ -43,9 +43,10 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- Junit -->
 		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
 

Diff for: web-ui/pom.xml

@@ -60,12 +60,12 @@
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
 		</dependency>
 
+		<!-- Junit -->
 		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>