From 60540402ca12c25d3873d5074274675708b56d86 Mon Sep 17 00:00:00 2001
From: Hendrik Jungnitsch <hendrik.jungnitsch@gedoplan.de>
Date: Fr, 26 Aug 2022 17:10:56 +0200
Subject: [PATCH] exercise

---
 src/test/java/de/gedoplan/seminar/jpa/exercise/Exercise01Test.java |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/test/java/de/gedoplan/seminar/jpa/exercise/Exercise01Test.java b/src/test/java/de/gedoplan/seminar/jpa/exercise/Exercise01Test.java
index 399a155..cef9506 100644
--- a/src/test/java/de/gedoplan/seminar/jpa/exercise/Exercise01Test.java
+++ b/src/test/java/de/gedoplan/seminar/jpa/exercise/Exercise01Test.java
@@ -1,14 +1,16 @@
 package de.gedoplan.seminar.jpa.exercise;
 
 import static org.junit.jupiter.params.provider.Arguments.arguments;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,14 +23,15 @@
 
 import de.gedoplan.seminar.jpa.exercise.domain.Highway;
 
+@TestMethodOrder(MethodOrderer.MethodName.class)
 @AutoConfigureMockMvc
 @SpringBootTest
 public class Exercise01Test {
 
 	// Some test data
-	private Highway testHighwayA1_DO_K = new Highway(4610, "A1", "Dortmund", "Cologne");
-	private Highway testHighwayA2_DO_H = new Highway(4711, "A2", "Dortmund", "Hannover");
-	private Highway testHighwayA33_BI_PB = new Highway(4812, "A33", "Bielefeld", "Paderborn");
+	private static Highway testHighwayA1_DO_K = new Highway(4610, "A1", "Dortmund", "Cologne");
+	private static Highway testHighwayA2_DO_H = new Highway(4711, "A2", "Dortmund", "Hannover");
+	private static Highway testHighwayA33_BI_PB = new Highway(4812, "A33", "Bielefeld", "Paderborn");
 
 	@Autowired
 	MockMvc mockMvc;
@@ -36,30 +39,28 @@
 	@Autowired 
 	private ObjectMapper mapper;
 
-	@Test
-	@Order(1)
+	@ParameterizedTest
 	@MethodSource("getTestHighways")
-	void testInsert() throws Exception {
+	void test01_insert(Highway highway) throws Exception {
 		mockMvc.perform(post("/highways")
 				.contentType(MediaType.APPLICATION_JSON)
-				.content(mapper.writeValueAsString(testHighwayA1_DO_K)))
+				.content(mapper.writeValueAsString(highway)))
 			.andExpect(status().isOk());
 	}
 	
-	@Test
-	@Order(2)
+	@ParameterizedTest
 	@MethodSource("getTestDataFindById")
-	void testFindById(Integer id, String name) throws Exception {
-		mockMvc.perform(post("/highways/{id}",id))
+	void test2_findById(int id, String name) throws Exception {
+		mockMvc.perform(get("/highways/{id}",id))
 			.andExpect(jsonPath("$.name").value(name));
 	}
 	
-	private Stream<Highway> getTestHighways() {
-		return Stream.of(this.testHighwayA1_DO_K, this.testHighwayA2_DO_H,
-				this.testHighwayA33_BI_PB);
+	private static Stream<Highway> getTestHighways() {
+		return Stream.of(testHighwayA1_DO_K, testHighwayA2_DO_H,
+				testHighwayA33_BI_PB);
 	}
 	
-	private Stream<Arguments> getTestDataFindById() {
+	private static Stream<Arguments> getTestDataFindById() {
 		return Stream.of(
 				arguments(4711,"A2"),
 				arguments(4812, "A33"));

--
Gitblit v1.7.1