From e4b9b09f565757457c53e8cd6f29a834258c81b6 Mon Sep 17 00:00:00 2001 From: Roberto Franchini Date: Fri, 24 Jan 2025 19:59:55 +0100 Subject: [PATCH] #1922 fix failing neo4j import test --- .../java/com/arcadedb/console/ConsoleTest.java | 2 +- ...export-mini.jsonl => neo4j-export-mini.neo} | 0 .../exporter/format/JsonlExporterFormat.java | 4 ++-- .../integration/importer/Neo4jImporterIT.java | 18 +++++++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) rename console/src/test/resources/{neo4j-export-mini.jsonl => neo4j-export-mini.neo} (100%) diff --git a/console/src/test/java/com/arcadedb/console/ConsoleTest.java b/console/src/test/java/com/arcadedb/console/ConsoleTest.java index 09355c14e..06c7ca6e1 100644 --- a/console/src/test/java/com/arcadedb/console/ConsoleTest.java +++ b/console/src/test/java/com/arcadedb/console/ConsoleTest.java @@ -263,7 +263,7 @@ public void testImportNeo4jConsoleOK() throws IOException { FileUtils.deleteRecursively(new File("databases/" + DATABASE_PATH)); final Console newConsole = new Console(); - newConsole.parse("create database " + DATABASE_PATH + ";import database file://src/test/resources/neo4j-export-mini.jsonl"); + newConsole.parse("create database " + DATABASE_PATH + ";import database file://src/test/resources/neo4j-export-mini.neo"); newConsole.close(); try (final DatabaseFactory factory = new DatabaseFactory("./target/databases/" + DATABASE_PATH)) { diff --git a/console/src/test/resources/neo4j-export-mini.jsonl b/console/src/test/resources/neo4j-export-mini.neo similarity index 100% rename from console/src/test/resources/neo4j-export-mini.jsonl rename to console/src/test/resources/neo4j-export-mini.neo diff --git a/integration/src/main/java/com/arcadedb/integration/exporter/format/JsonlExporterFormat.java b/integration/src/main/java/com/arcadedb/integration/exporter/format/JsonlExporterFormat.java index e1a785c50..6ec56108f 100644 --- a/integration/src/main/java/com/arcadedb/integration/exporter/format/JsonlExporterFormat.java +++ b/integration/src/main/java/com/arcadedb/integration/exporter/format/JsonlExporterFormat.java @@ -51,11 +51,11 @@ public class JsonlExporterFormat extends AbstractExporterFormat { private OutputStreamWriter writer; private final static int VERSION = 1; -<> final ConsoleLogger logger) { + final ConsoleLogger logger) { super(database, settings, context, logger); } diff --git a/integration/src/test/java/com/arcadedb/integration/importer/Neo4jImporterIT.java b/integration/src/test/java/com/arcadedb/integration/importer/Neo4jImporterIT.java index cd7cab4bf..19eb1e828 100644 --- a/integration/src/test/java/com/arcadedb/integration/importer/Neo4jImporterIT.java +++ b/integration/src/test/java/com/arcadedb/integration/importer/Neo4jImporterIT.java @@ -30,15 +30,19 @@ import com.arcadedb.log.LogManager; import com.arcadedb.schema.DocumentType; import com.arcadedb.utility.FileUtils; - import org.junit.jupiter.api.Test; -import java.io.*; -import java.net.*; -import java.text.*; -import java.util.*; -import java.util.concurrent.atomic.*; -import java.util.logging.*; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.logging.Level; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail;