From fd2e45b204da3632dd308549d471f2eb7f6568ff Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Fri, 1 Mar 2019 11:14:21 +0200 Subject: [PATCH] Test against #934 on MySQL --- .../plan/db/DBPatchH2RegressionTest.java | 2 +- .../plan/db/DBPatchMySQLRegressionTest.java | 14 +++++++++++++- .../plan/db/DBPatchSQLiteRegressionTest.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java index 62d94764a..51e450767 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchH2RegressionTest.java @@ -109,7 +109,7 @@ public class DBPatchH2RegressionTest extends DBPatchRegressionTest { } @Test - public void h2PatchTaskWorksWithoutErrors() { + public void h2PatchesAreApplied() { Patch[] patches = underTest.patches(); for (Patch patch : patches) { underTest.executeTransaction(patch); diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java index db7d47b70..fb639ed4e 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchMySQLRegressionTest.java @@ -23,6 +23,7 @@ import com.djrapitops.plan.db.access.queries.containers.ContainerFetchQueries; import com.djrapitops.plan.db.access.transactions.Transaction; import com.djrapitops.plan.db.access.transactions.commands.RemoveEverythingTransaction; import com.djrapitops.plan.db.access.transactions.init.CreateTablesTransaction; +import com.djrapitops.plan.db.patches.KillsOptimizationPatch; import com.djrapitops.plan.db.patches.Patch; import com.djrapitops.plan.system.PlanSystem; import com.djrapitops.plan.system.settings.config.PlanConfig; @@ -37,6 +38,7 @@ import utilities.OptionalAssert; import utilities.RandomData; import utilities.TestConstants; +import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; /** @@ -138,7 +140,7 @@ public class DBPatchMySQLRegressionTest extends DBPatchRegressionTest { } @Test - public void mysqlPatchTaskWorksWithoutErrors() { + public void mysqlPatchesAreApplied() { Patch[] patches = underTest.patches(); for (Patch patch : patches) { underTest.executeTransaction(patch); @@ -153,4 +155,14 @@ public class DBPatchMySQLRegressionTest extends DBPatchRegressionTest { // Make sure no foreign key checks fail on removal underTest.executeTransaction(new RemoveEverythingTransaction()); } + + @Test + public void mysqlDoesNotApplyKillsOptimizationPatchAgain() { + mysqlPatchesAreApplied(); + + KillsOptimizationPatch patch = new KillsOptimizationPatch(); + underTest.executeTransaction(patch); + + assertTrue(patch.hasBeenApplied()); + } } diff --git a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java index f3fe9ec3c..03a50cfeb 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/db/DBPatchSQLiteRegressionTest.java @@ -102,7 +102,7 @@ public class DBPatchSQLiteRegressionTest extends DBPatchRegressionTest { } @Test - public void sqlitePatchTaskWorksWithoutErrors() { + public void sqlitePatchesAreApplied() { Patch[] patches = underTest.patches(); for (Patch patch : patches) { underTest.executeTransaction(patch);