From 19e8f860ee7879257519e861e9d36629eaecf1cd Mon Sep 17 00:00:00 2001 From: "David M. Johnson" Date: Sat, 21 Sep 2024 16:54:21 -0400 Subject: [PATCH] Test fix from Michael Bien and a comment about running tests in IntelliJ. --- .../roller/weblogger/business/MediaFileTest.java | 3 +++ .../weblogger/business/SQLScriptRunnerTest.java | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java index 828735c39..7e8929574 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java @@ -51,6 +51,9 @@ public MediaFileTest() { @BeforeEach public void setUp() throws Exception { TestUtils.setupWeblogger(); + // allow media uploads for this test + Map config = WebloggerFactory.getWeblogger().getPropertiesManager().getProperties(); + config.get("uploads.enabled").setValue("true"); } /** diff --git a/app/src/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java b/app/src/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java index ac074c37d..c643ab277 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/SQLScriptRunnerTest.java @@ -30,8 +30,7 @@ import java.sql.ResultSet; import java.sql.SQLException; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * Test parsing and running of SQL scripts @@ -64,7 +63,7 @@ public void testParseOnly() throws Exception { String scriptPath = System.getProperty("project.build.directory") + "/test-classes/WEB-INF/dbscripts/dummydb/createdb-"+dbname+".sql"; SQLScriptRunner runner = new SQLScriptRunner(scriptPath); - assertTrue(runner.getCommandCount() == 5); + assertEquals(5, runner.getCommandCount()); } @Test @@ -79,10 +78,12 @@ public void testSimpleRun() throws Exception { // but some folks test against MySQL dbname = "mysql"; } - + + // if you are running the tests in IntelliJ, then you will need to add something like this to your VM options: + // -Dproject.build.directory=/Users/dave/src/apache-roller/app/target + // run script to create tables - SQLScriptRunner create = - new SQLScriptRunner(System.getProperty("project.build.directory") + SQLScriptRunner create = new SQLScriptRunner(System.getProperty("project.build.directory") + "/test-classes/WEB-INF/dbscripts/dummydb/createdb-"+dbname+".sql"); create.runScript(con, true);