Updating test user and fixing getNeighbors

Author: GearsAD

src/Neo4jDFG/services/Neo4jDFG.jl

@@ -445,7 +445,7 @@ function isConnected(dfg::Neo4jDFG)::Bool
 end
 
 function getNeighbors(dfg::Neo4jDFG, node::T; solvable::Int=0)::Vector{Symbol}  where T <: DFGNode
-    query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(node.label))-[r:FACTORGRAPH]-(node) where (node:VARIABLE or node:FACTOR) and node.solvable >= $solvable"
+    query = "(n:`$(dfg.userId)`:`$(dfg.robotId)`:`$(dfg.sessionId)`:$(node.label))-[r:FACTORGRAPH]-(node) where (node:VARIABLE or node:FACTOR) and node.solvable >= $solvable"
     @debug "[Query] $query"
     neighbors = _getLabelsFromCyphonQuery(dfg.neo4jInstance, query)
     # If factor, need to do variable ordering TODO, Do we? does it matter if we always use _variableOrderSymbols in calculations?
@@ -456,7 +456,7 @@ function getNeighbors(dfg::Neo4jDFG, node::T; solvable::Int=0)::Vector{Symbol}
 end
 
 function getNeighbors(dfg::Neo4jDFG, label::Symbol; solvable::Int=0)::Vector{Symbol}
-    query = "(n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(label))-[r:FACTORGRAPH]-(node) where (node:VARIABLE or node:FACTOR) and node.solvable >= $solvable"
+    query = "(n:`$(dfg.userId)`:`$(dfg.robotId)`:`$(dfg.sessionId)`:$(label))-[r:FACTORGRAPH]-(node) where (node:VARIABLE or node:FACTOR) and node.solvable >= $solvable"
     neighbors = _getLabelsFromCyphonQuery(dfg.neo4jInstance, query)
     # If factor, need to do variable ordering TODO, Do we? does it matter if we always use _variableOrderSymbols in calculations?
     if isFactor(dfg, label)
@@ -473,10 +473,10 @@ function getSubgraphAroundNode(dfg::Neo4jDFG, node::DFGNode, distance::Int64=1,
     # Thank you Neo4j for 0..* awesomeness!!
     neighborList = _getLabelsFromCyphonQuery(dfg.neo4jInstance,
         """
-        (n:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(node.label))-[FACTORGRAPH*0..$distance]-(node:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId))
+        (n:`$(dfg.userId)`:`$(dfg.robotId)`:`$(dfg.sessionId)`:$(node.label))-[FACTORGRAPH*0..$distance]-(node:`$(dfg.userId)`:`$(dfg.robotId)`:`$(dfg.sessionId)`)
         WHERE (n:VARIABLE OR n:FACTOR OR node:VARIABLE OR node:FACTOR)
         and not (node:SESSION)
-        and (node.solvable >= $solvable or node:$(dfg.userId):$(dfg.robotId):$(dfg.sessionId):$(node.label))""" # Always return the root node
+        and (node.solvable >= $solvable or node:`$(dfg.userId)`:`$(dfg.robotId)`:`$(dfg.sessionId)`:$(node.label))""" # Always return the root node
         )
 
     # Copy the section of graph we want

test/CGStructureTests.jl

@@ -1,5 +1,5 @@
 dfg = Neo4jDFG{SolverParams}("localhost", 7474, "neo4j", "test",
-                            "testUser", "testRobot", "testSession",
+                            "[email protected]", "testRobot", "testSession",
                             "Description of test session",
                             solverParams=SolverParams())
 

test/iifInterfaceTests.jl

@@ -46,9 +46,9 @@ end
     T = typeof(dfg)
     if dfg isa Neo4jDFG
         #TODO
-        dfg2 = Neo4jDFG(solverParams=SolverParams(), userId="testUserId")
+        dfg2 = Neo4jDFG(solverParams=SolverParams(), userId="[email protected]")
     else
-        dfg2 = T(solverParams=SolverParams(), userId="testUserId")
+        dfg2 = T(solverParams=SolverParams(), userId="[email protected]")
     end
 
     # Build a new in-memory IIF graph to transfer into the new graph.

test/interfaceTests.jl

@@ -152,7 +152,7 @@ end
 ##
 @testset "Adjacency Matrices" begin
 
-    fg = testDFGAPI(userId="testUserId")
+    fg = testDFGAPI(userId="[email protected]")
     addVariable!(fg, var1)
     setSolvable!(fg, :a, 1)
     addVariable!(fg, var2)
@@ -196,7 +196,7 @@ end
 
 @testset "Copy Functions" begin
     rand(6)
-    fg = testDFGAPI(userId="testUserId")
+    fg = testDFGAPI(userId="[email protected]")
     addVariable!(fg, var1)
     addVariable!(fg, var2)
     addVariable!(fg, var3)
@@ -207,7 +207,7 @@ end
     # @test getVariableOrder(fg,:f1) == getVariableOrder(fgcopy,:f1)
 
     #test copyGraph, deepcopyGraph[!]
-    fgcopy = testDFGAPI(userId="testUserId")
+    fgcopy = testDFGAPI(userId="[email protected]")
     DFG.deepcopyGraph!(fgcopy, fg)
     @test getVariableOrder(fg,:abf1) == getVariableOrder(fgcopy,:abf1)
 

test/runtests.jl

@@ -40,8 +40,8 @@ if get(ENV, "DO_CGDFG_TESTS", "") == "true"
         LightDFG,
         Neo4jDFG,
         ]
-    @warn "TEST: Removing all data for user 'testUserId'!"
-    clearUser!!(Neo4jDFG(userId="testUserId"))
+    @warn "TEST: Removing all data for user '[email protected]'!"
+    clearUser!!(Neo4jDFG(userId="[email protected]"))
 
 else
     apis = [
@@ -90,8 +90,8 @@ if get(ENV, "IIF_TEST", "") == "true"
     using IncrementalInference
 
     apis = Vector{AbstractDFG}()
-    push!(apis, LightDFG(solverParams=SolverParams(), userId="testUserId"))
-    get(ENV, "DO_CGDFG_TESTS", "false") == "true" && push!(apis, Neo4jDFG(solverParams=SolverParams(), userId="testUserId")) 
+    push!(apis, LightDFG(solverParams=SolverParams(), userId="[email protected]"))
+    get(ENV, "DO_CGDFG_TESTS", "false") == "true" && push!(apis, Neo4jDFG(solverParams=SolverParams(), userId="[email protected]")) 
 
     for api in apis
         @testset "Testing Driver: $(typeof(api))" begin
@@ -122,8 +122,8 @@ if get(ENV, "IIF_TEST", "") == "true"
         # This is just to validate we're not going to blow up downstream.
         apis = [
             # GraphsDFG{SolverParams}(),
-            LightDFG(solverParams=SolverParams(), userId="testUserId"),
-            Neo4jDFG(solverParams=SolverParams(), userId="testUserId")
+            LightDFG(solverParams=SolverParams(), userId="[email protected]"),
+            Neo4jDFG(solverParams=SolverParams(), userId="[email protected]")
             ]
         for api in apis
             @info "Running simple solver test: $(typeof(api))"

test/testBlocks.jl

@@ -131,10 +131,10 @@ function DFGStructureAndAccessors(::Type{T}, solparams::AbstractParams=NoSolverP
     # "DFG Structure and Accessors"
     # Constructors
     # Constructors to be implemented
-    fg = T(solverParams=solparams, userId="testUserId")
+    fg = T(solverParams=solparams, userId="[email protected]")
     #TODO test something better
     @test isa(fg, T)
-    @test getUserId(fg)=="testUserId"
+    @test getUserId(fg)=="[email protected]"
     @test getRobotId(fg)=="DefaultRobot"
     @test getSessionId(fg)[1:8] == "Session_"
 
@@ -151,12 +151,12 @@ function DFGStructureAndAccessors(::Type{T}, solparams::AbstractParams=NoSolverP
 
     #NOTE I don't like, so not exporting, and not recommended to use
     #     Technically if you set Ids its a new object
-    @test DistributedFactorGraphs.setUserId!(fg, "testUserId") == "testUserId"
+    @test DistributedFactorGraphs.setUserId!(fg, "[email protected]") == "[email protected]"
     @test DistributedFactorGraphs.setRobotId!(fg, "testRobotId") == "testRobotId"
     @test DistributedFactorGraphs.setSessionId!(fg, "testSessionId") == "testSessionId"
 
     des = "description for runtest"
-    uId = "testUserId"
+    uId = "[email protected]"
     rId = "testRobotId"
     sId = "testSessionId"
     ud = :ud=>"udEntry"
@@ -1211,7 +1211,7 @@ function connectivityTestGraph(::Type{T}; VARTYPE=DFGVariable, FACTYPE=DFGFactor
     numNodesType1 = 5
     numNodesType2 = 5
 
-    dfg = T(userId="testUserId")
+    dfg = T(userId="[email protected]")
 
     vars = vcat(map(n -> VARTYPE(Symbol("x$n"), VariableNodeData{TestVariableType1}()), 1:numNodesType1),
                 map(n -> VARTYPE(Symbol("x$(numNodesType1+n)"), VariableNodeData{TestVariableType2}()), 1:numNodesType2))
@@ -1419,7 +1419,7 @@ function ProducingDotFiles(testDFGAPI,
                            FACTYPE=DFGFactor)
     # "Producing Dot Files"
     # create a simpler graph for dot testing
-    dotdfg = testDFGAPI(userId="testUserId")
+    dotdfg = testDFGAPI(userId="[email protected]")
 
     if v1 == nothing
         v1 = VARTYPE(:a, VariableNodeData{TestVariableType1}())
@@ -1524,7 +1524,7 @@ function CopyFunctionsTest(testDFGAPI; kwargs...)
     dcdfg_part1 = deepcopyGraph(LightDFG, dfg, vlbls1)
     dcdfg_part2 = deepcopyGraph(LightDFG, dfg, vlbls2)
 
-    mergedGraph = testDFGAPI(userId="testUserId")
+    mergedGraph = testDFGAPI(userId="[email protected]")
     mergeGraph!(mergedGraph, dcdfg_part1)
     mergeGraph!(mergedGraph, dcdfg_part2)
 
@@ -1591,7 +1591,7 @@ function FileDFGTestBlock(testDFGAPI; kwargs...)
         # Save and load the graph to test.
         saveDFG(dfg, filename)
 
-        retDFG = testDFGAPI(userId="testUserId")
+        retDFG = testDFGAPI(userId="[email protected]")
         @info "Going to load $filename"
 
         @test_throws AssertionError loadDFG!(retDFG,"badfilename")