Merge pull request quarkusio#41574 from yrodiere/incorrect-set-genera…

…ted-value Do not (incorrectly) set the value of @GeneratedValue IDs in tests
gsmet · Jul 1, 2024 · d61c8ce · d61c8ce
2 parents 1df964d + 8e0e1c6
commit d61c8ce
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 23 deletions.
diff --git a/...rnate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/Group.java b/...rnate-orm/deployment/src/test/java/io/quarkus/hibernate/orm/quoting_strategies/Group.java
@@ -2,8 +2,6 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 
@@ -24,7 +22,6 @@ public class Group {
     private String value;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "groupSeq")
     public Long getId() {
         return id;
     }

diff --git a/...a-rest/deployment/src/test/java/io/quarkus/spring/data/rest/CrudAndPagedResourceTest.java b/...a-rest/deployment/src/test/java/io/quarkus/spring/data/rest/CrudAndPagedResourceTest.java
@@ -342,8 +342,8 @@ void shouldCreateHal() {
     void shouldCreateAndUpdate() {
         Response createResponse = given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"101\", \"name\": \"test-update-create\"}")
-                .when().put("/crud-and-paged-records/101")
+                .and().body("{\"name\": \"test-update-create\"}")
+                .when().post("/crud-and-paged-records/")
                 .thenReturn();
         assertThat(createResponse.statusCode()).isEqualTo(201);
 
@@ -370,8 +370,8 @@ void shouldCreateAndUpdate() {
     void shouldCreateAndUpdateHal() {
         Response createResponse = given().accept("application/hal+json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"102\", \"name\": \"test-update-create-hal\"}")
-                .when().put("/crud-and-paged-records/102")
+                .and().body("{\"name\": \"test-update-create-hal\"}")
+                .when().post("/crud-and-paged-records/")
                 .thenReturn();
         assertThat(createResponse.statusCode()).isEqualTo(201);
 

diff --git a/...pring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/JpaResourceTest.java b/...pring-data-rest/deployment/src/test/java/io/quarkus/spring/data/rest/JpaResourceTest.java
@@ -342,8 +342,8 @@ void shouldCreateHal() {
     void shouldCreateAndUpdate() {
         Response createResponse = given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"101\", \"name\": \"test-update-create\"}")
-                .when().put("/jpa-records/101")
+                .and().body("{\"name\": \"test-update-create\"}")
+                .when().post("/jpa-records/")
                 .thenReturn();
         assertThat(createResponse.statusCode()).isEqualTo(201);
 
@@ -370,8 +370,8 @@ void shouldCreateAndUpdate() {
     void shouldCreateAndUpdateHal() {
         Response createResponse = given().accept("application/hal+json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"102\", \"name\": \"test-update-create-hal\"}")
-                .when().put("/jpa-records/102")
+                .and().body("{\"name\": \"test-update-create-hal\"}")
+                .when().post("/jpa-records/")
                 .thenReturn();
         assertThat(createResponse.statusCode()).isEqualTo(201);
 

diff --git a/...st/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java b/...st/deployment/src/test/java/io/quarkus/spring/data/rest/crud/DefaultCrudResourceTest.java
@@ -149,8 +149,8 @@ void shouldCreateHal() {
     void shouldCreateAndUpdate() {
         Response createResponse = given().accept("application/json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"101\", \"name\": \"test-update-create\"}")
-                .when().put("/default-records/101")
+                .and().body("{\"name\": \"test-update-create\"}")
+                .when().post("/default-records/")
                 .thenReturn();
         assertThat(createResponse.statusCode()).isEqualTo(201);
 
@@ -177,8 +177,8 @@ void shouldCreateAndUpdate() {
     void shouldCreateAndUpdateHal() {
         Response createResponse = given().accept("application/hal+json")
                 .and().contentType("application/json")
-                .and().body("{\"id\": \"102\", \"name\": \"test-update-create-hal\"}")
-                .when().put("/default-records/102")
+                .and().body("{\"name\": \"test-update-create-hal\"}")
+                .when().post("/default-records/")
                 .thenReturn();
         assertThat(createResponse.statusCode()).isEqualTo(201);
 

diff --git a/...t/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java b/...t/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java
@@ -268,7 +268,7 @@ void shouldCreateUpdateAndDeleteBook() {
         Response response = given().accept("application/json")
                 .and().contentType("application/json")
                 .and().body(book.toString())
-                .when().put("/books/100")
+                .when().post("/books/")
                 .thenReturn();
         assertThat(response.statusCode()).isEqualTo(201);
         assertThat(response.header("Location")).isNotEmpty();

diff --git a/...ion-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/complex/Parent.java b/...ion-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/complex/Parent.java
@@ -1,14 +1,11 @@
 package io.quarkus.it.spring.data.jpa.complex;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 @Entity
 public class Parent extends ParentBase {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     public Parent(Long id, String name, String detail, int age, float test, TestEnum testEnum) {

diff --git a/...on-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/complex/Parent2.java b/...on-tests/spring-data-jpa/src/main/java/io/quarkus/it/spring/data/jpa/complex/Parent2.java
@@ -1,15 +1,12 @@
 package io.quarkus.it.spring.data.jpa.complex;
 
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 @Entity
 public class Parent2 extends ParentBase {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     public Parent2(String name, String detail, int age, float test, TestEnum testEnum, Long id) {

diff --git a/...sts/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java b/...sts/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java
@@ -218,7 +218,7 @@ void shouldCreateUpdateAndDeleteBook() {
         Response response = given().accept("application/json")
                 .and().contentType("application/json")
                 .and().body(book.toString())
-                .when().put("/books/100")
+                .when().post("/books/")
                 .thenReturn();
         assertThat(response.statusCode()).isEqualTo(201);
         assertThat(response.header("Location")).isNotEmpty();