From 56647abde469336b3010b91f84603f2772d680ac Mon Sep 17 00:00:00 2001 From: Catherine Quamme Date: Mon, 5 Feb 2024 08:58:05 -0500 Subject: [PATCH] Fixed broken tests --- .../org/jumpmind/symmetric/test/SimpleIntegrationTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java b/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java index d85f72befd..987b89be1d 100644 --- a/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java +++ b/symmetric-server/src/test/java/org/jumpmind/symmetric/test/SimpleIntegrationTest.java @@ -847,6 +847,9 @@ public void test25TestPurge() throws Exception { public void test25TestPurge2() throws Exception { logTestRunning(); Assertions.assertTimeoutPreemptively(Duration.ofMinutes(5), () -> { + // do an extra push & pull to make sure we have events cleared out + clientPull(); + clientPush(); int totalCount = getServer().getSqlTemplate().queryForInt("select count(*) from sym_data_event"); int batchId = getServer().getSqlTemplate().queryForInt("select min(batch_id) from sym_outgoing_batch"); int purgeCount = getServer().getSqlTemplate().queryForInt("select count(*) from sym_data_event where batch_id = ?", batchId); @@ -858,7 +861,7 @@ public void test25TestPurge2() throws Exception { getServer().purge(); parameterService.saveParameter(ParameterConstants.PURGE_RETENTION_MINUTES, purgeRetentionMinues, "test"); int count = getServer().getSqlTemplate().queryForInt("select count(*) from sym_data_event where batch_id = ?", batchId); - assertEquals(count, 0); + assertEquals(0, count); int newTotalCount = getServer().getSqlTemplate().queryForInt("select count(*) from sym_data_event"); assertEquals(newTotalCount, totalCount - purgeCount); });