From 7505683559b9d29600aea86e94877af6c2961409 Mon Sep 17 00:00:00 2001 From: Jonathan Bullock Date: Sun, 18 Sep 2022 01:09:48 +0100 Subject: [PATCH] Fixes #709 Upgraded OrientDB to 3.1.20. Updated tests as OrientDB v3.1.x doesn't allow DB name to be a path. Groovy template test was flaky, so removed override which made it more reliable. --- gradle.properties | 2 +- .../java/org/jbake/app/ContentStoreIntegrationTest.java | 3 ++- jbake-core/src/test/java/org/jbake/app/CrawlerTest.java | 4 ++-- .../template/GroovyMarkupTemplateEngineRenderingTest.java | 8 -------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index e108df7a1..a39392548 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ jade4jVersion = 1.3.2 jsoupVersion = 1.14.3 jgitVersion = 6.0.0.202111291000-r logbackVersion = 1.2.10 -orientDbVersion = 3.0.41 +orientDbVersion = 3.1.20 pebbleVersion = 3.1.5 slf4jVersion = 1.7.32 snakeYamlVersion = 1.30 diff --git a/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java b/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java index a2f2603a0..06e27877d 100644 --- a/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java +++ b/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java @@ -34,7 +34,8 @@ public static void setUpClass() throws Exception { Assert.assertEquals(".html", config.getOutputExtension()); config.setDatabaseStore(storageType.toString()); - String dbPath = folder.newFolder("documents" + System.currentTimeMillis()).getAbsolutePath(); + // OrientDB v3.1.x doesn't allow DB name to be a path even though docs say it's allowed + String dbPath = folder.newFolder("documents" + System.currentTimeMillis()).getName(); // setting the database path with a colon creates an invalid url for OrientDB. // only one colon is expected. there is no documentation about proper url path for windows available :( diff --git a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java index de0aa14b9..326f001a0 100644 --- a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java +++ b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java @@ -74,8 +74,8 @@ public void crawlDataFiles() { Assert.assertFalse(authorsFileContents.isEmpty()); Object authorsList = authorsFileContents.get("authors"); assertThat(authorsList).isNotInstanceOf(OTrackedMap.class); - assertThat(authorsList).isInstanceOf(LinkedHashMap.class); - LinkedHashMap> authors = (LinkedHashMap>) authorsList; + assertThat(authorsList).isInstanceOf(HashMap.class); + HashMap> authors = (HashMap>) authorsList; assertThat(authors.get("Joe Bloggs").get("last_name")).isEqualTo("Bloggs"); } diff --git a/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java b/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java index cbc52455b..c40819a19 100644 --- a/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java +++ b/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java @@ -19,14 +19,6 @@ public class GroovyMarkupTemplateEngineRenderingTest extends AbstractTemplateEngineRenderingTest { - @BeforeClass - public static void setUpTest() { - //switch to PLOCAL mode for this test class as Travis sometimes runs out of memory - db.close(); - config.setDatabaseStore(StorageType.PLOCAL.toString()); - db = DBUtil.createDataStore(config); - } - public GroovyMarkupTemplateEngineRenderingTest() { super("groovyMarkupTemplates", "tpl");