Lets try that again with the tests included

Author: GearsAD

Project.toml

@@ -13,6 +13,7 @@ JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MetaGraphs = "626554b9-1ddb-594c-aa3c-2596fe9399a5"
+Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
@@ -22,15 +23,15 @@ Distributions = "≥ 0.18"
 DocStringExtensions = "≥ 0.7"
 Graphs = "≥ 0.10.3"
 MetaGraphs = "≥ 0.6.4"
+Neo4j = "≥ 2.0.0"
 Reexport = "≥ 0.2"
 Requires = "≥ 0.5"
 julia = "0.7, 1"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231"
-Neo4j = "d2adbeaf-5838-5367-8a2f-e46d570981db"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
 [targets]
-test = ["Test", "GraphPlot", "Neo4j", "Pkg"]
+test = ["Test", "GraphPlot", "Pkg"]

src/CloudGraphsDFG/CloudGraphsDFG.jl

@@ -18,7 +18,7 @@ export getAddHistory, getDescription, getLabelDict
 export addVariable!, addFactor!
 export ls, lsf, getVariables, getFactors, getVariableIds, getFactorIds
 export getVariable, getFactor
-export updateVariable!, updateFactor!, mergeUpdateVariableSolverData!
+export updateVariable!, updateFactor!, updateVariableSolverData!
 export deleteVariable!, deleteFactor!
 export getAdjacencyMatrix
 export getNeighbors

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -318,7 +318,7 @@ end
     $(SIGNATURES)
 Update solver and estimate data for a variable (variable can be from another graph).
 """
-function mergeUpdateVariableSolverData!(dfg::CloudGraphsDFG, sourceVariable::DFGVariable)::DFGVariable
+function updateVariableSolverData!(dfg::CloudGraphsDFG, sourceVariable::DFGVariable)::DFGVariable
     if !exists(dfg, sourceVariable)
         error("Source variable '$(sourceVariable.label)' doesn't exist in the graph.")
     end

src/DistributedFactorGraphs.jl

@@ -66,12 +66,9 @@ using .SymbolDFGs
 include("LightDFG/LightDFG.jl")
 @reexport using .LightDFGs
 
-function __init__()
-    @require Neo4j="d2adbeaf-5838-5367-8a2f-e46d570981db" begin
-        # Include the Cloudgraphs API
-        include("CloudGraphsDFG/CloudGraphsDFG.jl")
-    end
+include("CloudGraphsDFG/CloudGraphsDFG.jl")
 
+function __init__()
     @require GraphPlot = "a2cc645c-3eea-5389-862e-a155d0052231" begin
         include("DFGPlots/DFGPlots.jl")
         @reexport using .DFGPlots

test/iifInterfaceTests.jl

@@ -169,65 +169,66 @@ end
 
     # Session, robot, and user small data tests
     # NOTE: CloudGraphDFG isnt supporting this yet.
-    if !(typeof(dfg) <: CloudGraphsDFG)
-        smallUserData = Dict{Symbol, String}(:a => "42", :b => "Hello")
-        smallRobotData = Dict{Symbol, String}(:a => "43", :b => "Hello")
-        smallSessionData = Dict{Symbol, String}(:a => "44", :b => "Hello")
-        setUserData(dfg, deepcopy(smallUserData))
-        setRobotData(dfg, deepcopy(smallRobotData))
-        setSessionData(dfg, deepcopy(smallSessionData))
-        @test getUserData(dfg) == smallUserData
-        @test getRobotData(dfg) == smallRobotData
-        @test getSessionData(dfg) == smallSessionData
-    end
+    # NOTE: Only available in v0.5
+    # if !(typeof(dfg) <: CloudGraphsDFG)
+    #     smallUserData = Dict{Symbol, String}(:a => "42", :b => "Hello")
+    #     smallRobotData = Dict{Symbol, String}(:a => "43", :b => "Hello")
+    #     smallSessionData = Dict{Symbol, String}(:a => "44", :b => "Hello")
+    #     setUserData(dfg, deepcopy(smallUserData))
+    #     setRobotData(dfg, deepcopy(smallRobotData))
+    #     setSessionData(dfg, deepcopy(smallSessionData))
+    #     @test getUserData(dfg) == smallUserData
+    #     @test getRobotData(dfg) == smallRobotData
+    #     @test getSessionData(dfg) == smallSessionData
+    # end
 end
 
-@testset "BigData" begin
-    # NOTE: CloudGraphDFG isnt supporting this yet.
-    if !(typeof(dfg) <: CloudGraphsDFG)
-        oid = zeros(UInt8,12); oid[12] = 0x01
-        de1 = MongodbBigDataEntry(:key1, NTuple{12,UInt8}(oid))
-
-        oid = zeros(UInt8,12); oid[12] = 0x02
-        de2 = MongodbBigDataEntry(:key2, NTuple{12,UInt8}(oid))
-
-        oid = zeros(UInt8,12); oid[12] = 0x03
-        de2_update = MongodbBigDataEntry(:key2, NTuple{12,UInt8}(oid))
-
-        #add
-        v1 = getVariable(dfg, :a)
-        @test addBigDataEntry!(v1, de1)
-        @test addBigDataEntry!(dfg, :a, de2)
-        @test addBigDataEntry!(v1, de1)
-
-        #get
-        @test deepcopy(de1) == getBigDataEntry(v1, :key1)
-        @test deepcopy(de2) == getBigDataEntry(dfg, :a, :key2)
-        @test_throws Any getBigDataEntry(v2, :key1)
-        @test_throws Any getBigDataEntry(dfg, :b, :key1)
-
-        #update
-        @test updateBigDataEntry!(dfg, :a, de2_update)
-        @test deepcopy(de2_update) == getBigDataEntry(dfg, :a, :key2)
-        @test !updateBigDataEntry!(dfg, :b, de2_update)
-
-        #list
-        entries = getBigDataEntries(dfg, :a)
-        @test length(entries) == 2
-        @test symdiff(map(e->e.key, entries), [:key1, :key2]) == Symbol[]
-        @test length(getBigDataEntries(dfg, :b)) == 0
-
-        @test symdiff(getBigDataKeys(dfg, :a), [:key1, :key2]) == Symbol[]
-        @test getBigDataKeys(dfg, :b) == Symbol[]
-
-        #delete
-        @test deepcopy(de1) == deleteBigDataEntry!(v1, :key1)
-        @test getBigDataKeys(v1) == Symbol[:key2]
-        #delete from dfg
-        @test deepcopy(de2_update) == deleteBigDataEntry!(dfg, :a, :key2)
-        @test getBigDataKeys(v1) == Symbol[]
-    end
-end
+# @testset "BigData" begin
+#     # NOTE: CloudGraphDFG isnt supporting this yet.
+#     if !(typeof(dfg) <: CloudGraphsDFG)
+#         oid = zeros(UInt8,12); oid[12] = 0x01
+#         de1 = MongodbBigDataEntry(:key1, NTuple{12,UInt8}(oid))
+#
+#         oid = zeros(UInt8,12); oid[12] = 0x02
+#         de2 = MongodbBigDataEntry(:key2, NTuple{12,UInt8}(oid))
+#
+#         oid = zeros(UInt8,12); oid[12] = 0x03
+#         de2_update = MongodbBigDataEntry(:key2, NTuple{12,UInt8}(oid))
+#
+#         #add
+#         v1 = getVariable(dfg, :a)
+#         @test addBigDataEntry!(v1, de1)
+#         @test addBigDataEntry!(dfg, :a, de2)
+#         @test addBigDataEntry!(v1, de1)
+#
+#         #get
+#         @test deepcopy(de1) == getBigDataEntry(v1, :key1)
+#         @test deepcopy(de2) == getBigDataEntry(dfg, :a, :key2)
+#         @test_throws Any getBigDataEntry(v2, :key1)
+#         @test_throws Any getBigDataEntry(dfg, :b, :key1)
+#
+#         #update
+#         @test updateBigDataEntry!(dfg, :a, de2_update)
+#         @test deepcopy(de2_update) == getBigDataEntry(dfg, :a, :key2)
+#         @test !updateBigDataEntry!(dfg, :b, de2_update)
+#
+#         #list
+#         entries = getBigDataEntries(dfg, :a)
+#         @test length(entries) == 2
+#         @test symdiff(map(e->e.key, entries), [:key1, :key2]) == Symbol[]
+#         @test length(getBigDataEntries(dfg, :b)) == 0
+#
+#         @test symdiff(getBigDataKeys(dfg, :a), [:key1, :key2]) == Symbol[]
+#         @test getBigDataKeys(dfg, :b) == Symbol[]
+#
+#         #delete
+#         @test deepcopy(de1) == deleteBigDataEntry!(v1, :key1)
+#         @test getBigDataKeys(v1) == Symbol[:key2]
+#         #delete from dfg
+#         @test deepcopy(de2_update) == deleteBigDataEntry!(dfg, :a, :key2)
+#         @test getBigDataKeys(v1) == Symbol[]
+#     end
+# end
 
 @testset "Updating Nodes and Estimates" begin
     global dfg
@@ -240,7 +241,7 @@ end
         :mean => VariableEstimate(:default, :mean, [50.0]),
         :modefit => VariableEstimate(:default, :modefit, [75.0]))
     #update
-    mergeUpdateVariableSolverData!(dfg, newvar)
+    updateVariableSolverData!(dfg, newvar)
 
     #Check if variable is updated
     var = getVariable(dfg, :a)
@@ -255,7 +256,7 @@ end
     # Confirm they're different
     @test estimates(newvar) != estimates(var)
     # Persist it.
-    mergeUpdateVariableSolverData!(dfg, newvar)
+    updateVariableSolverData!(dfg, newvar)
     # Get the latest
     var = getVariable(dfg, :a)
     @test symdiff(collect(keys(estimates(var))), [:default, :second]) == Symbol[]
@@ -269,7 +270,7 @@ end
     #confirm delete
     @test symdiff(collect(keys(estimates(newvar))), [:second]) == Symbol[]
     # Persist it.
-    mergeUpdateVariableSolverData!(dfg, newvar)
+    updateVariableSolverData!(dfg, newvar)
 
     # Get the latest and confirm they're the same, :second
     var = getVariable(dfg, :a)

test/runtests.jl

@@ -12,38 +12,38 @@ using Pkg
 
 # Test each interface
 # Still test LightDFG and MetaGraphsDFG for the moment until we remove in 0.4.2
-# apis = [
-#     GraphsDFG,
-#     DistributedFactorGraphs.MetaGraphsDFG,
-#     DistributedFactorGraphs.SymbolDFG,
-#     LightDFG]
-# for api in apis
-#     @testset "Testing Driver: $(api)" begin
-#         @info "Testing Driver: $(api)"
-#         global testDFGAPI = api
-#         include("interfaceTests.jl")
-#     end
-# end
-#
-# # Test that we don't export LightDFG and MetaGraphsDFG
-# @testset "Deprecated Drivers Test" begin
-#     @test_throws UndefVarError SymbolDFG{NoSolverParams}()
-#     @test_throws UndefVarError MetaGraphsDFG{NoSolverParams}()
-# end
-#
-# # Test special cases
-#
-# @testset "Plotting Tests" begin
-#     include("plottingTest.jl")
-# end
-#
-# @testset "SummaryDFG test" begin
-#     @info "Testing LightDFG Variable and Factor Subtypes"
-#     include("LightDFGSummaryTypes.jl")
-# end
+apis = [
+    GraphsDFG,
+    DistributedFactorGraphs.MetaGraphsDFG,
+    DistributedFactorGraphs.SymbolDFG,
+    LightDFG]
+for api in apis
+    @testset "Testing Driver: $(api)" begin
+        @info "Testing Driver: $(api)"
+        global testDFGAPI = api
+        include("interfaceTests.jl")
+    end
+end
+
+# Test that we don't export LightDFG and MetaGraphsDFG
+@testset "Deprecated Drivers Test" begin
+    @test_throws UndefVarError SymbolDFG{NoSolverParams}()
+    @test_throws UndefVarError MetaGraphsDFG{NoSolverParams}()
+end
+
+# Test special cases
+
+@testset "Plotting Tests" begin
+    include("plottingTest.jl")
+end
+
+@testset "SummaryDFG test" begin
+    @info "Testing LightDFG Variable and Factor Subtypes"
+    include("LightDFGSummaryTypes.jl")
+end
 
 
-# if get(ENV, "IIF_TEST", "") == "true"
+if get(ENV, "IIF_TEST", "") == "true"
 
     Pkg.add("IncrementalInference")
     @info "------------------------------------------------------------------------"
@@ -53,8 +53,8 @@ using Pkg
     using IncrementalInference
 
     apis = [
-        # GraphsDFG{NoSolverParams}(),
-        # LightDFG{NoSolverParams}(),
+        GraphsDFG{NoSolverParams}(),
+        LightDFG{NoSolverParams}(),
         # DistributedFactorGraphs.MetaGraphsDFG{NoSolverParams}(),
         # DistributedFactorGraphs.SymbolDFG{NoSolverParams}(),
         CloudGraphsDFG{SolverParams}("localhost", 7474, "neo4j", "test",
@@ -72,6 +72,6 @@ using Pkg
             include("iifInterfaceTests.jl")
         end
     end
-# else
-#     @warn "Skipping IncrementalInference driver tests"
-# end
+else
+    @warn "Skipping IncrementalInference driver tests"
+end