From de79ac30ebdfaa9ca00beb4a5b93689488f6c5a0 Mon Sep 17 00:00:00 2001 From: Giuseppe Villani Date: Thu, 7 Nov 2024 10:08:21 +0100 Subject: [PATCH] Try solving TeamCity errors in 5.26 * Try solving TC errors in 5.25 * fix tests * restored GephiMock --- .../src/test/java/apoc/gephi/GephiMock.java | 9 ++++-- .../src/test/java/apoc/gephi/GephiTest.java | 30 +++++++++++-------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/extended/src/test/java/apoc/gephi/GephiMock.java b/extended/src/test/java/apoc/gephi/GephiMock.java index f3026d536a..b40c91c65f 100644 --- a/extended/src/test/java/apoc/gephi/GephiMock.java +++ b/extended/src/test/java/apoc/gephi/GephiMock.java @@ -3,6 +3,7 @@ import org.mockserver.client.MockServerClient; import org.mockserver.integration.ClientAndServer; import org.mockserver.model.RegexBody; +import org.mockserver.socket.PortFactory; import java.util.Arrays; import java.util.HashSet; @@ -26,9 +27,13 @@ */ public class GephiMock { private final ClientAndServer server; + private final int PORT; + public final String HOST; public GephiMock() { - this.server = ClientAndServer.startClientAndServer(8080); + PORT = PortFactory.findFreePort(); + HOST = "http://localhost:" + PORT; + this.server = ClientAndServer.startClientAndServer(PORT); } public void clearAllExpectations() { @@ -40,7 +45,7 @@ public void shutdown() { } public void mockSuccess(String workspace, GephiEntity... entities) { - new MockServerClient("localhost", 8080) + new MockServerClient("localhost", PORT) .when(request() .withMethod("POST") .withPath("/" + workspace) diff --git a/extended/src/test/java/apoc/gephi/GephiTest.java b/extended/src/test/java/apoc/gephi/GephiTest.java index eb2fa7cf61..87a9d0b13e 100644 --- a/extended/src/test/java/apoc/gephi/GephiTest.java +++ b/extended/src/test/java/apoc/gephi/GephiTest.java @@ -51,8 +51,9 @@ public void testAdd() throws Exception { node(0, "Foo"), node(1, "Bar"), relationship(0, "KNOWS",0, 1)); - testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add(null,$workspace,p) yield nodes, relationships, format return *", - map("workspace", GEPHI_WORKSPACE), + testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add($host,$workspace,p) yield nodes, relationships, format return *", + map("host", gephiMock.HOST, + "workspace", GEPHI_WORKSPACE), r -> { assertEquals(2L, r.get("nodes")); assertEquals(1L, r.get("relationships")); @@ -67,8 +68,9 @@ public void testWeightParameter() throws Exception { node(0, "Foo"), node(1, "Bar"), relationship(0, "KNOWS",0, 1, "7.2")); - testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add(null,$workspace,p,'weight') yield nodes, relationships, format return *", - map("workspace", GEPHI_WORKSPACE), + testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add($host,$workspace,p,'weight') yield nodes, relationships, format return *", + map("host", gephiMock.HOST, + "workspace", GEPHI_WORKSPACE), r -> { assertEquals(2L, r.get("nodes")); assertEquals(1L, r.get("relationships")); @@ -83,8 +85,9 @@ public void testWrongWeightParameter() throws Exception { node(0, "Foo"), node(1, "Bar"), relationship(0, "KNOWS",0, 1)); - testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add(null,$workspace,p,'test') yield nodes, relationships, format return *", - map("workspace", GEPHI_WORKSPACE), + testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add($host,$workspace,p,'test') yield nodes, relationships, format return *", + map("host", gephiMock.HOST, + "workspace", GEPHI_WORKSPACE), r -> { assertEquals(2L, r.get("nodes")); assertEquals(1L, r.get("relationships")); @@ -99,8 +102,9 @@ public void testRightExportParameter() throws Exception { node(0, "Foo"), node(1, "Bar"), relationship(0, "KNOWS",0, 1, "7.2", Set.of("foo"))); - testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add(null,$workspace,p,'weight',['foo']) yield nodes, relationships, format return *", - map("workspace", GEPHI_WORKSPACE), + testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add($host,$workspace,p,'weight',['foo']) yield nodes, relationships, format return *", + map("host", gephiMock.HOST, + "workspace", GEPHI_WORKSPACE), r -> { assertEquals(2L, r.get("nodes")); assertEquals(1L, r.get("relationships")); @@ -115,8 +119,9 @@ public void testWrongExportParameter() throws Exception { node(0, "Foo"), node(1, "Bar"), relationship(0, "KNOWS",0, 1, "7.2")); - testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add(null,$workspace,p,'weight',['faa','fee']) yield nodes, relationships, format return *", - map("workspace", GEPHI_WORKSPACE), + testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add($host,$workspace,p,'weight',['faa','fee']) yield nodes, relationships, format return *", + map("host", gephiMock.HOST, + "workspace", GEPHI_WORKSPACE), r -> { assertEquals(2L, r.get("nodes")); assertEquals(1L, r.get("relationships")); @@ -131,8 +136,9 @@ public void reservedExportParameter() throws Exception { node(0, "Foo"), node(1, "Bar"), relationship(0, "KNOWS",0, 1, "7.2")); - testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add(null,$workspace,p,'weight',['directed','label']) yield nodes, relationships, format return *", - map("workspace", GEPHI_WORKSPACE), + testCall(db, "MATCH p = (:Foo)-->() WITH p CALL apoc.gephi.add($host,$workspace,p,'weight',['directed','label']) yield nodes, relationships, format return *", + map("host", gephiMock.HOST, + "workspace", GEPHI_WORKSPACE), r -> { assertEquals(2L, r.get("nodes")); assertEquals(1L, r.get("relationships"));