fixes

mshima · Feb 6, 2024 · 07aedc6 · 07aedc6
1 parent b2c805b
commit 07aedc6
Showing 1 changed file with 33 additions and 25 deletions.
diff --git a/...mplates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs b/...mplates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs
@@ -18,6 +18,10 @@
 -%>
 package <%= entityAbsolutePackage %>.web.rest;
 
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.hamcrest.Matchers.comparesEqualTo;
+
 <%_
 var filterTestableRelationships = (reactive ? reactiveEagerRelations : relationships).filter(rel => rel.persistableRelationship && !rel.otherEntity.hasCyclicRequiredRelationship);
 const fieldsToTest = fields.filter(field => !field.id && !field.autoGenerate && !field.transient);
@@ -690,7 +694,7 @@ _%>
   <%_ } _%>
         <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(<%= entityInstance %>List.size() - 1);
 
-        assertInsertedEquals(<%= persistInstance %>, test<%= entityClass %>);
+        assertInserted<%- persistClass %>Equals(<%= persistInstance %>, test<%= entityClass %>);
   <%_ if (isUsingMapsId) { _%>
 
         // Validate the id for MapsId, the ids must be same
@@ -894,7 +898,7 @@ _%>
         assertThat(<%= entityInstance %>List).hasSize(1);
         <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(0);
 
-        assertInsertedEquals(<%= persistInstance %>, test<%= entityClass %>);
+        assertInserted<%- persistClass %>Equals(<%= persistInstance %>, test<%= entityClass %>);
     }
 <%_ } _%>
 
@@ -1435,7 +1439,7 @@ _%>
         assertThat(<%= entityInstance %>List).hasSize(databaseSizeBeforeUpdate);
         <%= persistClass %> test<%= entityClass %> = <%= entityInstance %>List.get(<%= entityInstance %>List.size() - 1);
 
-        assertUpdatedEquals(test<%= entityClass %>, updated<%= persistClass %>);
+        assertUpdated<%- persistClass %>Equals(test<%= entityClass %>, updated<%= persistClass %>);
 
   <%_ if (searchEngineElasticsearch) { _%>
         await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
@@ -1444,7 +1448,7 @@ _%>
             List<<%= persistClass %>> <%= entityInstance %>SearchList = IterableUtils.toList(<%= entityInstance %>SearchRepository.findAll()<%= callListBlock %>);
             <%= persistClass %> test<%= entityClass %>Search = <%= entityInstance %>SearchList.get(searchDatabaseSizeAfter - 1);
 
-            assertUpdatedEquals(test<%= entityClass %>Search, updated<%= persistClass %>);
+            assertUpdated<%- persistClass %>Equals(test<%= entityClass %>Search, updated<%= persistClass %>);
       });
   <%_ } _%>
     }
@@ -1823,33 +1827,37 @@ _%>
     }
 <%_ } _%>
 
-    public static void assertUpdatedEquals(<%- persistClass %> <%- persistInstance %>1, <%- persistClass %> <%- persistInstance %>2) {
+    public static void assertUpdated<%- persistClass %>Equals(<%- persistClass %> <%- persistInstance %>1, <%- persistClass %> <%- persistInstance %>2) {
+        assertAll("Verify properties",
 <%_ for (const field of fields.filter(field => !field.transient && field.autoGenerate)) { _%>
-        assertThat(<%- persistInstance %>1.get<%- field.fieldInJavaBeanMethod %>()).isEqualTo(<%- persistInstance %>2.get<%- field.fieldInJavaBeanMethod %>());
-<%_ } _%>
-<%_ for (const relationship of relationships.filter(relationship => relationship.autoGenerate)) { _%>
-        assertThat(<%- persistInstance %>1.get<%- relationship.propertyJavaBeanName %>()).isEqualTo(<%- persistInstance %>2.get<%- relationship.propertyJavaBeanName %>());
-<%_ } _%>
-        assertInsertedEquals(<%- persistInstance %>1, <%- persistInstance %>2);
-    }
-
-    public static void assertInsertedEquals(<%- persistClass %> <%- persistInstance %>1, <%- persistClass %> <%- persistInstance %>2) {
-        assertInsertedFieldsEquals(<%- persistInstance %>1, <%- persistInstance %>2);
-        assertInsertedRelationshipsEquals(<%- persistInstance %>1, <%- persistInstance %>2);
-    }
-
-    public static void assertInsertedFieldsEquals(<%- persistClass %> <%- persistInstance %>1, <%- persistClass %> <%- persistInstance %>2) {
-<%_ for (const field of fields.filter(field => !field.transient && !field.autoGenerate)) { _%>
-        assertThat(<%- persistInstance %>1.get<%- field.fieldInJavaBeanMethod %>()).isEqualTo(<%- persistInstance %>2.get<%- field.fieldInJavaBeanMethod %>());
+            () -> assertEquals(<%- persistInstance %>1.get<%- field.fieldInJavaBeanMethod %>(), <%- persistInstance %>2.get<%- field.fieldInJavaBeanMethod %>()),
   <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
-        assertThat(<%= persistInstance %>1.get<%= field.fieldInJavaBeanMethod %>ContentType()).isEqualTo(<%= persistInstance %>2.get<%= field.fieldInJavaBeanMethod %>ContentType());
+            () -> assertEquals(<%- persistInstance %>1.get<%- field.fieldInJavaBeanMethod %>ContentType(), <%- persistInstance %>2.get<%- field.fieldInJavaBeanMethod %>ContentType()),
+  <%_ } _%>
+  <%_ for (const relationship of relationships.filter(relationship => relationship.autoGenerate && !relationship.otherEntity.builtInUser)) { _%>
+            () -> assertEquals(<%- persistInstance %>1.get<%- relationship.propertyJavaBeanName %>(), <%- persistInstance %>2.get<%- relationship.propertyJavaBeanName %>()),
   <%_ } _%>
 <%_ } _%>
+            () -> {}
+        );
+        assertInserted<%- persistClass %>Equals(<%- persistInstance %>1, <%- persistInstance %>2);
     }
 
-    public static void assertInsertedRelationshipsEquals(<%- persistClass %> <%- persistInstance %>1, <%- persistClass %> <%- persistInstance %>2) {
-<%_ for (const relationship of relationships.filter(relationship => !relationship.autoGenerate)) { _%>
-        assertThat(<%- persistInstance %>1.get<%- relationship.propertyJavaBeanName %>()).isEqualTo(<%- persistInstance %>2.get<%- relationship.propertyJavaBeanName %>());
+    public static void assertInserted<%- persistClass %>Equals(<%- persistClass %> <%- persistInstance %>1, <%- persistClass %> <%- persistInstance %>2) {
+        assertAll("Verify properties",
+<%_ for (const field of fields.filter(field => !field.transient && !field.autoGenerate)) { _%>
+  <%_ if (field.fieldTypeBigDecimal) { _%>
+            () -> assertEquals(<%- persistInstance %>1.get<%- field.fieldInJavaBeanMethod %>(), comparesEqualTo(<%- persistInstance %>2.get<%- field.fieldInJavaBeanMethod %>())),
+  <%_ } else { _%>
+    <%_ if (field.fieldTypeBinary && !field.blobContentTypeText) { _%>
+            () -> assertEquals(<%- persistInstance %>1.get<%- field.fieldInJavaBeanMethod %>ContentType(), <%- persistInstance %>2.get<%- field.fieldInJavaBeanMethod %>ContentType()),
+    <%_ } _%>
+  <%_ } _%>
+  <%_ for (const relationship of relationships.filter(relationship => !relationship.autoGenerate && !relationship.otherEntity.builtInUser)) { _%>
+            () -> assertEquals(<%- persistInstance %>1.get<%- relationship.propertyJavaBeanName %>(), <%- persistInstance %>2.get<%- relationship.propertyJavaBeanName %>()),
+  <%_ } _%>
 <%_ } _%>
+            () -> {}
+        );
     }
 }