Skip to content

Commit

Permalink
removed unused imports
Browse files Browse the repository at this point in the history
  • Loading branch information
vga91 committed Jul 13, 2022
1 parent 8d154db commit 741ed0f
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 44 deletions.
2 changes: 0 additions & 2 deletions full/src/main/java/apoc/custom/Signatures.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import apoc.util.JsonUtil;
import org.antlr.v4.runtime.*;
import org.jetbrains.annotations.NotNull;
import org.neo4j.internal.kernel.api.procs.*;
import org.neo4j.procedure.Mode;

Expand All @@ -11,7 +10,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;

Expand Down
79 changes: 37 additions & 42 deletions full/src/test/java/apoc/custom/CypherProceduresTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -780,59 +780,54 @@ public void shouldDeclareProcedureWithDefaultListAndMaps() {

@Test
public void shouldDeclareFunctionWithDefaultListAndMaps() {
db.executeTransactionally("call apoc.custom.declareFunction('funWithFloatList(minScore = [1.1,2.2,3.3] :: LIST OF FLOAT) :: FLOAT',\n" +
" 'return $minScore[0]')");
testCall(db, "RETURN custom.funWithFloatList() AS res",
(row) -> assertEquals(1.1D, (double) row.get("res"), 0.1D));
testCall(db, "RETURN custom.funWithFloatList([9.1, 2.6, 3.1, 4.3, 5.5]) AS res",
(row) -> assertEquals(9.1D, (double) row.get("res"), 0.1D));

db.executeTransactionally("CALL apoc.custom.declareFunction('funWithIntList(minScore = [1,2,3] :: LIST OF INT) :: BOOLEAN',\n" +
" 'return size($minScore) < 4 as res')");
testCall(db, "RETURN custom.funWithIntList() AS res", (row) -> {
assertEquals(true, row.get("res"));
});
testCall(db, "RETURN custom.funWithIntList([9,2,3,4,5]) AS res", (row) -> {
assertEquals(false, row.get("res"));
});
" 'return size($minScore) < 4')");
testCall(db, "RETURN custom.funWithIntList() AS res",
(row) -> assertEquals(true, row.get("res")));
testCall(db, "RETURN custom.funWithIntList([9,2,3,4,5]) AS res",
(row) -> assertEquals(false, row.get("res")));

db.executeTransactionally("CALL apoc.custom.declareFunction('funWithListString(minScore = [\"1\",\"2\",\"3\"] :: LIST OF STRING) :: BOOLEAN',\n" +
" 'return size($minScore) < 4 as res')");
testCall(db, "RETURN custom.funWithListString() AS res", (row) -> {
assertEquals(true, row.get("res"));
});
testCall(db, "RETURN custom.funWithListString(['aaa','bbb','ccc','ddd','eee']) AS res", (row) -> {
assertEquals(false, row.get("res"));
});
" 'return size($minScore) < 4')");
testCall(db, "RETURN custom.funWithListString() AS res",
(row) -> assertEquals(true, row.get("res")));
testCall(db, "RETURN custom.funWithListString(['aaa','bbb','ccc','ddd','eee']) AS res",
(row) -> assertEquals(false, row.get("res")));

db.executeTransactionally("CALL apoc.custom.declareFunction('funWithListStringPlain(minScore = [1, 2, 3] :: LIST OF STRING) :: BOOLEAN',\n" +
" 'return size($minScore) < 4 as res')");
testCall(db, "RETURN custom.funWithListStringPlain() AS res", (row) -> {
assertEquals(true, row.get("res"));
});
testCall(db, "RETURN custom.funWithListStringPlain(['aaa','bbb','ccc','ddd','eee']) AS res", (row) -> {
assertEquals(false, row.get("res"));
});
" 'return size($minScore) < 4')");
testCall(db, "RETURN custom.funWithListStringPlain() AS res",
(row) -> assertEquals(true, row.get("res")));
testCall(db, "RETURN custom.funWithListStringPlain(['aaa','bbb','ccc','ddd','eee']) AS res",
(row) -> assertEquals(false, row.get("res")));

db.executeTransactionally("CALL apoc.custom.declareFunction(\"funWithListStringQuoted(minScore = ['1','2','3'] :: LIST OF STRING) :: BOOLEAN\",\n" +
" 'return size($minScore) < 4 as res')");
testCall(db, "RETURN custom.funWithListStringQuoted() AS res", (row) -> {
assertEquals(true, row.get("res"));
});
testCall(db, "RETURN custom.funWithListStringQuoted(['aaa','bbb','ccc','ddd','eee']) AS res", (row) -> {
assertEquals(false, row.get("res"));
});
" 'return size($minScore) < 4')");
testCall(db, "RETURN custom.funWithListStringQuoted() AS res",
(row) -> assertEquals(true, row.get("res")));
testCall(db, "RETURN custom.funWithListStringQuoted(['aaa','bbb','ccc','ddd','eee']) AS res",
(row) -> assertEquals(false, row.get("res")));

db.executeTransactionally("CALL apoc.custom.declareFunction('funWithListStringVars(minScore = [true,false,null] :: LIST OF STRING) :: BOOLEAN',\n" +
" 'return size($minScore) < 4 as res')");
testCall(db, "RETURN custom.funWithListStringVars() AS res", (row) -> {
assertEquals(true, row.get("res"));
});
testCall(db, "RETURN custom.funWithListStringVars(['aaa','bbb','ccc','ddd','eee']) AS res", (row) -> {
assertEquals(false, row.get("res"));
});
" 'return size($minScore) < 4')");
testCall(db, "RETURN custom.funWithListStringVars() AS res",
(row) -> assertEquals(true, row.get("res")));
testCall(db, "RETURN custom.funWithListStringVars(['aaa','bbb','ccc','ddd','eee']) AS res",
(row) -> assertEquals(false, row.get("res")));

db.executeTransactionally("CALL apoc.custom.declareFunction('funWithMapList(minScore = {aa: 1, bb: \"2\"} :: MAP) :: MAP',\n" +
" 'return $minScore as res')");
testCall(db, "RETURN custom.funWithMapList() AS res", (row) -> {
assertEquals(Map.of("res", Map.of("aa", 1L, "bb", "2")), row.get("res"));
});
testCall(db, "RETURN custom.funWithMapList({c: true}) AS res", (row) -> {
assertEquals(Map.of("res", Map.of("c", true)), row.get("res"));
});
" 'return $minScore AS mapRes')");
testCall(db, "RETURN custom.funWithMapList() AS res",
(row) -> assertEquals(Map.of("mapRes", Map.of("aa", 1L, "bb", "2")), row.get("res")));
testCall(db, "RETURN custom.funWithMapList({c: true}) AS res",
(row) -> assertEquals(Map.of("mapRes", Map.of("c", true)), row.get("res")));
}

@Test
Expand Down

0 comments on commit 741ed0f

Please sign in to comment.