put back few more test

Author: Affie

test/consolInterfaceDev.jl

@@ -158,19 +158,41 @@ end
 end
 #
 # #TODO Summaries and Summary Graphs
-# @testset "Summaries and Summary Graphs" begin
-#     Summaries(testDFGAPI)
-# end
-#
-# @testset "Producing Dot Files" begin
-#     ProducingDotFiles(testDFGAPI)
-# end
+@testset "Summaries and Summary Graphs" begin
+    Summaries(testDFGAPI)
+end
+
+@testset "Producing Dot Files" begin
+    ProducingDotFiles(testDFGAPI, var1, var2, fac1)
+end
 #
-# @testset "Connectivity Test" begin
-#      ConnectivityTest(testDFGAPI)
-# end
+@testset "Connectivity Test" begin
+    fg = testDFGAPI()
+    clearUser!!(fg)
+    ConnectivityTest(testDFGAPI)
+end
 
+@testset "Copy Functions" begin
+    fg = testDFGAPI()
+    clearUser!!(fg)
+    fg = testDFGAPI()
+    addVariable!(fg, var1)
+    addVariable!(fg, var2)
+    addVariable!(fg, var3)
+    addFactor!(fg, fac1)
+
+    fgcopy = testDFGAPI()
+    DFG._copyIntoGraph!(fg, fgcopy, union(ls(fg), lsf(fg)))
+    @test getVariableOrder(fg,:abf1) == getVariableOrder(fgcopy,:abf1)
+
+    #test copyGraph, deepcopyGraph[!]
+    fgcopy = testDFGAPI()
+    DFG.deepcopyGraph!(fgcopy, fg)
+    @test getVariableOrder(fg,:abf1) == getVariableOrder(fgcopy,:abf1)
 
+    CopyFunctionsTest(testDFGAPI)
+
+end
 #
 #=
 fg = fg1

test/testBlocks.jl

@@ -1165,22 +1165,21 @@ function  Summaries(testDFGAPI)
     end
 end
 
-function ProducingDotFiles(testDFGAPI; VARTYPE=DFGVariable, FACTYPE=DFGFactor)
+function ProducingDotFiles(testDFGAPI,
+                           v1 = VARTYPE(:a, VariableNodeData{TestSofttype1}()),
+                           v2 = VARTYPE(:b, VariableNodeData{TestSofttype1}()),
+                           f1 = (FACTYPE==DFGFactor) ? DFGFactor{Int, :Symbol}(:abf1) : FACTYPE(:abf1);
+                           VARTYPE=DFGVariable,
+                           FACTYPE=DFGFactor)
     # "Producing Dot Files"
     # create a simpler graph for dot testing
     dotdfg = testDFGAPI()
-    v1 = VARTYPE(:a, VariableNodeData{TestSofttype1}())
-    v2 = VARTYPE(:b, VariableNodeData{TestSofttype1}())
-    if FACTYPE==DFGFactor
-        f1 = DFGFactor{Int, :Symbol}(:abf1)
-    else
-        f1 = FACTYPE(:abf1)
-    end
+
     addVariable!(dotdfg, v1)
     addVariable!(dotdfg, v2)
     addFactor!(dotdfg, [v1, v2], f1)
     #NOTE hardcoded toDot will have different results so test LightGraphs seperately
-    if testDFGAPI <: LightDFG
+    if testDFGAPI <: LightDFG || testDFGAPI <: CloudGraphsDFG
         @test toDot(dotdfg) == "graph G {\na [color=red, shape=ellipse];\nb [color=red, shape=ellipse];\nabf1 [color=blue, shape=box];\na -- abf1\nb -- abf1\n}\n"
     else
         @test toDot(dotdfg) == "graph graphname {\n2 [\"label\"=\"b\",\"shape\"=\"ellipse\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n2 -- 3\n3 [\"label\"=\"abf1\",\"shape\"=\"box\",\"fillcolor\"=\"blue\",\"color\"=\"blue\"]\n1 [\"label\"=\"a\",\"shape\"=\"ellipse\",\"fillcolor\"=\"red\",\"color\"=\"red\"]\n1 -- 3\n}\n"