From 21d00b87567a4ac7e40788d1986db9c26285c53a Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 28 Jan 2026 20:56:50 +0100 Subject: [PATCH] Refactored `PackagingPropertiesRepositoryIntegrationTest` --- ...agingPropertiesRepositoryIntegrationTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/test/java/de/avatic/lcc/repositories/packaging/PackagingPropertiesRepositoryIntegrationTest.java b/src/test/java/de/avatic/lcc/repositories/packaging/PackagingPropertiesRepositoryIntegrationTest.java index e613b99..e114a30 100644 --- a/src/test/java/de/avatic/lcc/repositories/packaging/PackagingPropertiesRepositoryIntegrationTest.java +++ b/src/test/java/de/avatic/lcc/repositories/packaging/PackagingPropertiesRepositoryIntegrationTest.java @@ -39,13 +39,14 @@ class PackagingPropertiesRepositoryIntegrationTest extends AbstractRepositoryInt @BeforeEach void setupTestData() { - // Clean up in correct order + // Clean up in correct order (respect FK constraints) jdbcTemplate.update("DELETE FROM packaging_property"); jdbcTemplate.update("DELETE FROM packaging"); jdbcTemplate.update("DELETE FROM packaging_dimension"); jdbcTemplate.update("DELETE FROM material"); jdbcTemplate.update("DELETE FROM node_predecessor_entry"); jdbcTemplate.update("DELETE FROM node_predecessor_chain"); + jdbcTemplate.update("DELETE FROM container_rate"); // Must delete before node due to FK jdbcTemplate.update("DELETE FROM node"); jdbcTemplate.update("DELETE FROM packaging_property_type"); @@ -312,16 +313,21 @@ class PackagingPropertiesRepositoryIntegrationTest extends AbstractRepositoryInt return jdbcTemplate.queryForObject(selectSql, Integer.class); } - private Integer createMaterial(String name, String externalMappingId) { - String sql = "INSERT INTO material (name, external_mapping_id, hs_code) VALUES (?, ?, '123456')"; - executeRawSql(sql, name, externalMappingId); + private Integer createMaterial(String name, String partNumber) { + String sql = String.format( + "INSERT INTO material (name, part_number, normalized_part_number, hs_code, is_deprecated) VALUES (?, ?, ?, '123456', %s)", + dialectProvider.getBooleanFalse()); + executeRawSql(sql, name, partNumber, partNumber.toUpperCase()); String selectSql = isMysql() ? "SELECT LAST_INSERT_ID()" : "SELECT CAST(@@IDENTITY AS INT)"; return jdbcTemplate.queryForObject(selectSql, Integer.class); } private Integer createPackagingDimension() { - String sql = "INSERT INTO packaging_dimension (length, width, height, gross_weight) VALUES (100, 100, 100, 10)"; + String sql = String.format( + "INSERT INTO packaging_dimension (type, length, width, height, weight, content_unit_count, is_deprecated) " + + "VALUES ('HU', 100, 100, 100, 10, 1, %s)", + dialectProvider.getBooleanFalse()); executeRawSql(sql); String selectSql = isMysql() ? "SELECT LAST_INSERT_ID()" : "SELECT CAST(@@IDENTITY AS INT)";