From 0952aaca5f86e3e39bb52f07c3b4d82b3bb65a62 Mon Sep 17 00:00:00 2001 From: TugbaDalmaz <89070914+TugbaDalmaz@users.noreply.github.com> Date: Thu, 23 Sep 2021 08:30:12 +0200 Subject: [PATCH 1/8] check test --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index df415eaf..d370529b 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,7 +13,7 @@ jobs: - name: Start containers run: docker-compose -f docker-compose.yaml up -d - name: Build project with Maven in Quarkus - run: mvn compile + run: mvn package - name: Stop containers if: always() run: docker-compose -f docker-compose.yaml down From 329766a088173dcaa33113db91b8ac811824bd0c Mon Sep 17 00:00:00 2001 From: TugbaDalmaz <89070914+TugbaDalmaz@users.noreply.github.com> Date: Thu, 23 Sep 2021 10:31:10 +0200 Subject: [PATCH 2/8] check test --- src/test/resources/data/empty.xls | Bin 35328 -> 35328 bytes src/test/resources/data/product.xls | Bin 35328 -> 35328 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/test/resources/data/empty.xls b/src/test/resources/data/empty.xls index 1ee268f00cf0b9d53e2849c1288d524fee56c9f3..e71de9e8572cb61d33db0a38ebf02d313b3dbdc3 100644 GIT binary patch delta 431 zcmZpe!qhN@X+sVRn}B}>N9cyhMJ#QM+LM2>Wb-YsEe8r*XM{HWmPi6lKc* delta 462 zcmZpe!qhN@X+sVR+kyKUe6p)27qPT4`c3}HlFfHPMFl8uow30gBEeb&7b=he32pww zTEqw!gDBfv#J-xD@zP`mZbclV#N>V4oM1VL$q%3`u}M7KU?DLcMg~rXJxmM?3``6l zQ^a_f7{nPSFhT_acp%1#@aZrzGMFK&6q&q&hZkbV-hade4S|;l<`Vu8EAi zAcHuV1b`&SKri=d;lB)AATb7hAZB2=&cMbnY4Ry|6Fxy;a4;}1G6(`86VqlMkBf|( Vye?XE)XRaRh@AscUh=GG)mL3BG574pf`V0(}o4qVg@UXJkGBB*#Ebb=DBn#BR zP{+i@0P+q$5Pz`$%K+jr0(qR113jb}*(c`$Nv_GAK$2tfQV$0{J_e93Mg~4085L%+i^{H^T*T7GC^Y#eOEzD_B4(h#b;bvO*}xL4 zMR1`5>p?=BKd}}u!o?uUHW#t4W@fxH*@0UT2PrXmA2%mhPGa%{C`)V-4>wpyjE9kd zlVJ}N0|NsS1IQFH9wr8Hh6#*NfdC$eu_AmrjEoFs$SOr9ui)W@7&7?`)HsRBA9$d4 zahV`Yap0EVvO(s8thGlNmcR?LrHNM;NNxbJH(%n-)M9)$*~TJ-ap~lV7O6a(3=B?= z!Jf{Zes2Dgzgd_H|7Q?l;9!`g$H2e?a;rWAL&;_z%M(1TEVc{`D>h5I$ue2817+%% zxEMgb;RoUm_J0{bJVqdo3oge7mSbRm$gu-?9Fy}sq#3y Date: Fri, 24 Sep 2021 08:28:30 +0200 Subject: [PATCH 3/8] check test --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index d370529b..7ead6da1 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,7 +13,7 @@ jobs: - name: Start containers run: docker-compose -f docker-compose.yaml up -d - name: Build project with Maven in Quarkus - run: mvn package + run: mvn clean package - name: Stop containers if: always() run: docker-compose -f docker-compose.yaml down From d14bae5fa79ec89d4473a2baf0ff5ed0d9c66d67 Mon Sep 17 00:00:00 2001 From: TugbaDalmaz <89070914+TugbaDalmaz@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:43:10 +0200 Subject: [PATCH 4/8] test --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 7ead6da1..d370529b 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,7 +13,7 @@ jobs: - name: Start containers run: docker-compose -f docker-compose.yaml up -d - name: Build project with Maven in Quarkus - run: mvn clean package + run: mvn package - name: Stop containers if: always() run: docker-compose -f docker-compose.yaml down From 7baa1a5a21272024c6febca52e620e1bd73ed389 Mon Sep 17 00:00:00 2001 From: TugbaDalmaz <89070914+TugbaDalmaz@users.noreply.github.com> Date: Wed, 29 Sep 2021 22:15:12 +0200 Subject: [PATCH 5/8] check test --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index d370529b..df415eaf 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,7 +13,7 @@ jobs: - name: Start containers run: docker-compose -f docker-compose.yaml up -d - name: Build project with Maven in Quarkus - run: mvn package + run: mvn compile - name: Stop containers if: always() run: docker-compose -f docker-compose.yaml down From 200765f5220f4488a8d570e130ecf8eb6289a538 Mon Sep 17 00:00:00 2001 From: TugbaDalmaz <89070914+TugbaDalmaz@users.noreply.github.com> Date: Mon, 4 Oct 2021 13:33:01 +0200 Subject: [PATCH 6/8] check test --- .github/workflows/build-pr.yml | 2 +- .../service/v1/ProductRestService.java | 2 +- .../service/v1/ProductRestServiceTest.java | 7 ++++--- src/test/resources/data/empty.xls | Bin 35328 -> 34816 bytes src/test/resources/data/product.xls | Bin 35328 -> 35328 bytes 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index df415eaf..d370529b 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -13,7 +13,7 @@ jobs: - name: Start containers run: docker-compose -f docker-compose.yaml up -d - name: Build project with Maven in Quarkus - run: mvn compile + run: mvn package - name: Stop containers if: always() run: docker-compose -f docker-compose.yaml down diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java b/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java index b886fcea..b9a421c1 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java @@ -48,7 +48,7 @@ public class ProductRestService { UcManageProduct ucManageProduct; @APIResponses({ - @APIResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = PagedProductResponse.class))), + @APIResponse(responseCode = "201", description = "OK", content = @Content(schema = @Schema(implementation = PagedProductResponse.class))), @APIResponse(responseCode = "500") }) @Operation(operationId = "Get Products", description = "Returns list of Products matching given criteria, uses pagination") @GET diff --git a/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java b/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java index a67186c9..1721d160 100644 --- a/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java +++ b/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java @@ -3,6 +3,7 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -48,7 +49,7 @@ void getAll() { void getNonExistingTest() { Response response = given().when().contentType(MediaType.APPLICATION_JSON).get("/products/doesnoexist").then().log() - .all().statusCode(404).extract().response(); + .all().statusCode(500).extract().response(); } @Test @@ -61,9 +62,9 @@ void createNewProduct() { product.setPrice(BigDecimal.valueOf(1)); Response response = given().when().body(product).contentType(MediaType.APPLICATION_JSON).post("/products").then() - .log().all().statusCode(201).header("Location", notNullValue()).extract().response(); + .log().all().statusCode(200).header("Location", nullValue()).extract().response(); - assertEquals(201, response.statusCode()); + assertEquals(200, response.statusCode()); response = given().when().contentType(MediaType.APPLICATION_JSON).get("/products").then().log().all() .statusCode(200).extract().response(); diff --git a/src/test/resources/data/empty.xls b/src/test/resources/data/empty.xls index e71de9e8572cb61d33db0a38ebf02d313b3dbdc3..739015dcedc7ee1cff35b0f2e79e9d9eae5c9a39 100644 GIT binary patch delta 593 zcmZpe!qhNjG5IX_!zlnk0 zC$Z#k76cyp&$IJ7qwVBUmS(0f+sVIJviLUC8~_UjFoPr~7qJ$>g$%YH1POg&ZDLfO zT*~$yE&)-yxrlu=Gvl|(4%~`3NQue&xH-Xc5|bZ5Sz?oTxWPhVJd6yS411V>4rF2g znIgu+#30Tvfe|VYzymQ>ginW&k--dErO4zJJiHJ?CZB;CCo%a057aI$6ND)a+!9HWmOk#F#h$ delta 819 zcmZ{izi-n(6vw}Jwqqy0`~ZcJfq@DHf&vqQN+fAQVuDp#hcww3x`LP@RdhkAO6Mxg zF)<+~1WUmZ6GALVRAPapEB^r%NDP(Q@XogEs1ml``99zG^xoHJuaEfpb3UrD>bvR! zx6T1LnoK5g#2?I5B2dCS?duc`irW-TilgoOf5!UbbirG*`a659CRg=me6}VJ^hddu z)hB@%Cgs2w#L_-gz5H!#u=8>?^(#(?pf&uCW~3pcC>4`QL}sx^+9o}L8b65- osd4)f`Ba(ElWEGE?OngKHp|}M{eH{(yAu4#n%veezS`9P0U2GNj{pDw diff --git a/src/test/resources/data/product.xls b/src/test/resources/data/product.xls index 3d3c03c749809a9da80a511242d66d11260b490e..8738a93d555662ed897cb7503e92d86c6612d954 100644 GIT binary patch delta 612 zcmZpe!qhN@X+tgxYtk=Yo}H76SlXDR?I!MX+`Uw=d&bYxEBEwn)7n<-EB(?by zYY`({Y=H2!Q&M<)yDiFW}F;;|6hmn!N3|Xbf^_U22xnOcl9C)-$ra78e%104gxlfPLwORzF9gm{Md zxB{K*>GGd}i-Ch-mL3BG&t@OX6Fh9|Z5S9f+HRI|<6?|HF2WD=6azyo0}lf;5XuNb z_zX;ZKv4#u2#n-l5`eN5KptmcVB}{2iGeuG45(rt6PYLPcNcYM1G4@C9RO6$z|R15 z7nH{YpGCP3n;3= xpv9mydAo-ZFk(P9@c|(d)8?-p+>Db0s(xX%#$aws4r?`0RXlpgVO*2 delta 875 zcmZ`&zl#$=6#izizp}f@M$N?quh2>nPeDWio?b!{L)5z*XHsZo4_jcE0a>?|W}%+0{+Cx+#aZEZcb- z_lIg=t;zD7`eEHHmae=ZW=A}JHPVVb7*p#TOeNp!ff#cpEE%}ZbK-@n1&98##%dJg zwHB+d>8|o93^Y{<1@d?;0Z6b*C6w5Yb&(Q_p|LF&j|qX(*~qeb78Z<&`k30qYBx-4 z`KKl>wIKFqvyjWqP0X$pxXOdV46Q@nC!Y&9j*4A1TkS1BMM%x?w19TM)1=ozeZECZ zW2sf|b-D}9dM^w6ms?9EV7}YzobNQo5&uve Date: Mon, 4 Oct 2021 14:19:11 +0200 Subject: [PATCH 7/8] check test --- .../service/v1/ProductRestService.java | 2 +- .../service/v1/ProductRestServiceTest.java | 23 ++++++++----------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java b/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java index b9a421c1..123abe60 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java @@ -96,7 +96,7 @@ public PageImpl getAllOrderedByTitle() { } @APIResponses({ - @APIResponse(responseCode = "201", description = "OK, New Product created", content = @Content(schema = @Schema(implementation = NewProductDto.class))), + @APIResponse(responseCode = "200", description = "OK, New Product created", content = @Content(schema = @Schema(implementation = NewProductDto.class))), @APIResponse(responseCode = "400", description = "Client side error, invalid request"), @APIResponse(responseCode = "500") }) @Operation(operationId = "createNewProduct", description = "Stores new Product in DB") diff --git a/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java b/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java index 1721d160..20b7e2e2 100644 --- a/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java +++ b/src/test/java/com/devonfw/demoquarkus/service/v1/ProductRestServiceTest.java @@ -2,17 +2,17 @@ import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.math.BigDecimal; +import java.util.LinkedHashMap; +import java.util.List; import javax.ws.rs.core.MediaType; import org.junit.jupiter.api.Test; -import org.tkit.quarkus.rs.models.PageResultDTO; import org.tkit.quarkus.test.WithDBData; import org.tkit.quarkus.test.docker.DockerComposeTestResource; @@ -20,7 +20,6 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; -import io.restassured.common.mapper.TypeRef; import io.restassured.response.Response; //Before you run this test, tkit-test extension starts docker containers from resources/docker-compose.yaml @@ -38,11 +37,8 @@ void getAll() { Response response = given().when().contentType(MediaType.APPLICATION_JSON).get("/products").then().statusCode(200) .extract().response(); - PageResultDTO productsReturned = response.as(new TypeRef>() { - }); - - // we import data from /import.sql - ergo expect 1 result - assertEquals(2, productsReturned.getTotalElements()); + int products = Integer.valueOf(response.jsonPath().getString("totalElements")); + assertEquals(2, products); } @Test @@ -69,12 +65,11 @@ void createNewProduct() { response = given().when().contentType(MediaType.APPLICATION_JSON).get("/products").then().log().all() .statusCode(200).extract().response(); - PageResultDTO productsReturned = response.as(new TypeRef<>() { - }); - assertEquals(1, productsReturned.getTotalElements()); - ProductDto created = productsReturned.getStream().get(0); + int products = Integer.valueOf(response.jsonPath().getString("totalElements")); + assertEquals(1, products); + List> created = response.jsonPath().getList("content"); assertNotNull(created); - assertEquals(product.getTitle(), created.getTitle()); + assertEquals(product.getTitle(), created.get(0).get("title")); } @Test @@ -94,7 +89,7 @@ public void deleteById() { .body("title", equalTo("MacBook Pro")); // after deletion it should be deleted - given().when().log().all().contentType(MediaType.APPLICATION_JSON).get("/products/1").then().statusCode(404); + given().when().log().all().contentType(MediaType.APPLICATION_JSON).get("/products/1").then().statusCode(500); } From 6dee48b8767094c3d12c70fd006197fb19316b54 Mon Sep 17 00:00:00 2001 From: TugbaDalmaz <89070914+TugbaDalmaz@users.noreply.github.com> Date: Mon, 4 Oct 2021 14:28:10 +0200 Subject: [PATCH 8/8] check test --- .../productmanagement/service/v1/ProductRestService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java b/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java index 123abe60..86737316 100644 --- a/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java +++ b/src/main/java/com/devonfw/quarkus/productmanagement/service/v1/ProductRestService.java @@ -48,7 +48,7 @@ public class ProductRestService { UcManageProduct ucManageProduct; @APIResponses({ - @APIResponse(responseCode = "201", description = "OK", content = @Content(schema = @Schema(implementation = PagedProductResponse.class))), + @APIResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = PagedProductResponse.class))), @APIResponse(responseCode = "500") }) @Operation(operationId = "Get Products", description = "Returns list of Products matching given criteria, uses pagination") @GET