Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jonbullock committed Sep 18, 2022
1 parent 2e5a20b commit 7505683
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 :(
Expand Down
4 changes: 2 additions & 2 deletions jbake-core/src/test/java/org/jbake/app/CrawlerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Map<String, Object>> authors = (LinkedHashMap<String, Map<String, Object>>) authorsList;
assertThat(authorsList).isInstanceOf(HashMap.class);
HashMap<String, Map<String, Object>> authors = (HashMap<String, Map<String, Object>>) authorsList;
assertThat(authors.get("Joe Bloggs").get("last_name")).isEqualTo("Bloggs");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down

0 comments on commit 7505683

Please sign in to comment.