Fixing tests

Author: GearsAD

src/services/CustomPrinting.jl

@@ -191,9 +191,9 @@ function Base.show(io::IO, dfg::AbstractDFG)
     println(io, "  Description: ", dfg.description)
     println(io, "  Nr variables: ", length(ls(dfg)))
     println(io, "  Nr factors: ",length(lsf(dfg)))
-    println(io, "  User Data: ", keys(dfg.userData))
-    println(io, "  Robot Data: ", keys(dfg.robotData))
-    println(io, "  Session Data: ", keys(dfg.sessionData))
+    println(io, "  User Data: ", keys(getUserData(dfg)))
+    println(io, "  Robot Data: ", keys(getRobotData(dfg)))
+    println(io, "  Session Data: ", keys(getSessionData(dfg)))
 end
 
 Base.show(io::IO, ::MIME"text/plain", dfg::AbstractDFG) = show(io, dfg)

test/CGStructureTests.jl

@@ -15,29 +15,21 @@ createDfgSessionIfNotExist(dfg)
 @test Symbol(dfg.userId) in map(u -> u.id, lsUsers(dfg))
 # Test that we can call it again.
 createDfgSessionIfNotExist(dfg)
-# And nuke it so we can try the longer functions.
-clearUser!!(dfg)
 
 # User, robot, and session
 # TODO: Make easier ways to initialize these.
 user = User(Symbol(dfg.userId), "Bob Zack", "Description", Dict{Symbol, String}())
 robot = Robot(Symbol(dfg.robotId), user.id, "Test robot", "Description", Dict{Symbol, String}())
 session = Session(Symbol(dfg.sessionId), robot.id, user.id, "Test Session", "Description", Dict{Symbol, String}())
 
-# Test errors
-dfgError = deepcopy(dfg)
-# User/robot/session ID's can't start with numbers and can't have spaces.
-dfgError.userId = "1testNope"
-@test_throws Exception createDfgSessionIfNotExist(dfg)
-
 @test getUserData(dfg) == Dict{Symbol, String}()
 @test getRobotData(dfg) == Dict{Symbol, String}()
 @test getSessionData(dfg) == Dict{Symbol, String}()
 
 # User/robot/session data
 user.data = Dict{Symbol, String}(:a => "Hello", :b => "Goodbye")
-robot.data = Dict{Symbol, String}(:c => "Hello", :d => "Goodbye")
-session.data = Dict{Symbol, String}(:e => "Hello", :f => "Goodbye")
+robot.data = Dict{Symbol, String}(:c => "ABC", :d => "Goodbye")
+session.data = Dict{Symbol, String}(:e => "ADG", :f => "Goodbye")
 
 setUserData!(dfg, user.data)
 setRobotData!(dfg, robot.data)
@@ -46,6 +38,9 @@ setSessionData!(dfg, session.data)
 @test getRobotData(dfg) == robot.data
 @test getSessionData(dfg) == session.data
 
+# And nuke it so we can try the addVariable etc. functions to make sure they create the nodes.
+clearUser!!(dfg)
+createDfgSessionIfNotExist(dfg)
 # Add some nodes.
 v1 = addVariable!(dfg, :a, ContinuousScalar, tags = [:POSE])
 v2 = addVariable!(dfg, :b, ContinuousScalar, tags = [:POSE])
@@ -61,3 +56,9 @@ dfgLocal = buildSubgraph(LightDFG, dfg, union(ls(dfg), lsf(dfg)))
 # Confirm that with sentinels we still have the same graph (doesn't pull in the sentinels)
 @test symdiff(ls(dfgLocal), ls(dfg)) == []
 @test symdiff(lsf(dfgLocal), lsf(dfg)) == []
+
+# Test errors
+dfgError = deepcopy(dfg)
+# User/robot/session ID's can't start with numbers and can't have spaces.
+dfgError.userId = "I want to fail"
+@test_throws Exception createDfgSessionIfNotExist(dfgError)

test/iifInterfaceTests.jl

@@ -116,7 +116,7 @@ end
 
     # Accessors
     @test getAddHistory(dfg) == [:a, :b] #, :abf1
-    @test getDescription(dfg) != nothing
+    @test getDescription(dfg) !== nothing
     #TODO Deprecate
     # @test_throws ErrorException getLabelDict(dfg)
     # Existence
@@ -206,7 +206,7 @@ end
     @test getTags(f1) == f1.tags
     @test getSolverData(f1) == f1.solverData
 
-    @test getSolverParams(dfg) != nothing
+    @test getSolverParams(dfg) !== nothing
     @test setSolverParams!(dfg, getSolverParams(dfg)) == getSolverParams(dfg)
 
     #solver data is initialized

test/testBlocks.jl

@@ -172,6 +172,10 @@ function DFGStructureAndAccessors(::Type{T}, solparams::AbstractParams=NoSolverP
     @test getSessionId(fg) == sId
     @test getAddHistory(fg) === fg.addHistory
 
+    # Need to set this for Neo4jDFG
+    @test setUserData!(fg, Dict(ud)) == Dict(ud)
+    @test setRobotData!(fg, Dict(rd)) == Dict(rd)
+    @test setSessionData!(fg, Dict(sd)) == Dict(sd)
     @test getUserData(fg) == Dict(ud)
     @test getRobotData(fg) == Dict(rd)
     @test getSessionData(fg) == Dict(sd)