Some automatic session ids and tests

Author: Affie

src/services/AbstractDFG.jl

@@ -877,8 +877,16 @@ function deepcopyGraph(::Type{T},
                        sourceDFG::AbstractDFG,
                        variableLabels::Vector{Symbol} = ls(sourceDFG),
                        factorLabels::Vector{Symbol} = lsf(sourceDFG);
+                       sessionId::String = "",
                        kwargs...) where T <: AbstractDFG
-    destDFG = T(getDFGInfo(sourceDFG)...)
+
+    ginfo = [getDFGInfo(sourceDFG)...]
+    if sessionId == ""
+        ginfo[4] *= "_copy$(string(uuid4())[1:6])"
+    else
+        ginfo[4] = sessionId
+    end
+    destDFG = T(ginfo...)
     copyGraph!(destDFG, sourceDFG, variableLabels, factorLabels; deepcopyNodes=true, kwargs...)
     return destDFG
 end

test/consolInterfaceDev.jl

@@ -4,7 +4,7 @@ using Neo4j
 using DistributedFactorGraphs
 using Pkg
 using Dates
-
+using UUIDs
 # using IncrementalInference
 
 include("testBlocks.jl")
@@ -15,14 +15,20 @@ testDFGAPI = CloudGraphsDFG
 # TODO maybe move to cloud graphs permanantly as standard easy to use functions
 function DFG.CloudGraphsDFG(; params=NoSolverParams())
     cgfg = CloudGraphsDFG{typeof(params)}("localhost", 7474, "neo4j", "test",
-                                  "testUser", "testRobot", "testSession",
+                                  "testUser", "testRobot", "testSession_$(string(uuid4())[1:6])",
                                   "description",
                                   nothing,
                                   nothing,
-                                  (dfg,f)->f,#IncrementalInference.decodePackedType,#(dfg,f)->f,
-                                  (dfg,f)->f,#ncrementalInference.rebuildFactorMetadata!,#(dfg,f)->f,
+                                  (dfg,f)->f,#IncrementalInference.decodePackedType,
+                                  (dfg,f)->f,#ncrementalInference.rebuildFactorMetadata!,
                                   solverParams=params)
     createDfgSessionIfNotExist(cgfg)
+
+    setUserData!(cgfg, Dict{Symbol, String}())
+    setRobotData!(cgfg, Dict{Symbol, String}())
+    setSessionData!(cgfg, Dict{Symbol, String}())
+    setDescription!(cgfg, cgfg.description)
+
     return cgfg
 end
 
@@ -49,8 +55,8 @@ function DFG.CloudGraphsDFG(description::String,
                                                 description,
                                                 nothing,
                                                 nothing,
-                                                (dfg,f)->f,#IncrementalInference.decodePackedType,#(dfg,f)->f,
-                                                (dfg,f)->f,#IncrementalInference.rebuildFactorMetadata!,#(dfg,f)->f,
+                                                (dfg,f)->f,#IncrementalInference.decodePackedType,
+                                                (dfg,f)->f,#IncrementalInference.rebuildFactorMetadata!,
                                                 solverParams=solverParams)
 
     createDfgSessionIfNotExist(cdfg)
@@ -119,7 +125,7 @@ end
 
 @testset "Adjacency Matrices" begin
     fg = testDFGAPI()
-    clearRobot!!(fg)
+    clearUser!!(fg)
 
     DFGVariable(:a, TestSofttype1())
     addVariable!(fg, var1)
@@ -133,17 +139,23 @@ end
 
 
 @testset "Getting Neighbors" begin
+    fg = testDFGAPI()
+    clearUser!!(fg)
     GettingNeighbors(testDFGAPI)
 end
 
 
 @testset "Getting Subgraphs" begin
+    fg = testDFGAPI()
+    clearUser!!(fg)
     GettingSubgraphs(testDFGAPI)
 end
 
-# @testset "Building Subgraphs" begin
-#     BuildingSubgraphs(testDFGAPI)
-# end
+@testset "Building Subgraphs" begin
+    fg = testDFGAPI()
+    clearUser!!(fg)
+    BuildingSubgraphs(testDFGAPI)
+end
 #
 # #TODO Summaries and Summary Graphs
 # @testset "Summaries and Summary Graphs" begin
@@ -160,11 +172,12 @@ end
 
 
 #
-#
-# fg = fg1
-# v1 = var1
-# v2 = var2
-# v3 = var3
-# f0 = fac0
-# f1 = fac1
-# f2 = fac2
+#=
+fg = fg1
+v1 = var1
+v2 = var2
+v3 = var3
+f0 = fac0
+f1 = fac1
+f2 = fac2
+=#

test/testBlocks.jl

@@ -820,10 +820,10 @@ function testGroup!(fg, v1, v2, f0, f1)
         @test_skip varNearTs[1][1] == [:b]
 
         ## SORT copied from CRUD
-        @test all(getVariables(fg, r"a") .== [v1])
-        @test all(getVariables(fg, solvable=1) .== [v2])
+        @test all(getVariables(fg, r"a") .== [getVariable(fg,v1.label)])
+        @test all(getVariables(fg, solvable=1) .== [getVariable(fg,v2.label)])
         @test getVariables(fg, r"a", solvable=1) == []
-        @test getVariables(fg, tags=[:LANDMARK])[1] == v2
+        @test getVariables(fg, tags=[:LANDMARK])[1] == getVariable(fg, v2.label)
 
         @test getFactors(fg, r"nope") == []
         @test issetequal(getLabel.(getFactors(fg, solvable=1)), [:af1, :abf1])
@@ -980,8 +980,6 @@ function connectivityTestGraph(::Type{T}; VARTYPE=DFGVariable, FACTYPE=DFGFactor
 
     dfg = T()
 
-    isa(dfg, CloudGraphsDFG) && clearUser!!(dfg)
-
     vars = vcat(map(n -> VARTYPE(Symbol("x$n"), VariableNodeData{TestSofttype1}()), 1:numNodesType1),
                 map(n -> VARTYPE(Symbol("x$(numNodesType1+n)"), VariableNodeData{TestSofttype2}()), 1:numNodesType2))