almost there

Author: dehann

test/iifInterfaceTests.jl

@@ -283,7 +283,9 @@ end
     getVariablePPEs(newvar)[:default] = MeanMaxPPE(:default, [150.0], [100.0], [50.0])
     #update
     # mergeUpdateVariableSolverData!(dfg, newvar)
-    mergeVariableSolverData!(getVariable(dfg,getLabel(newvar)), newvar)
+    # mergeVariableSolverData!(getVariable(dfg,getLabel(newvar)), newvar)
+    # mergeVariableData!(getVariable(dfg,getLabel(newvar)), newvar)
+    mergeVariableData!(dfg, newvar)
 
     #Check if variable is updated
     var1 = getVariable(dfg, :a)
@@ -296,7 +298,8 @@ end
     @test getVariablePPEs(newvar) != getVariablePPEs(var1)
     # Persist it.
     # mergeUpdateVariableSolverData!(dfg, newvar)
-    mergeVariableSolverData!(getVariable(dfg, getLabel(newvar)), newvar)
+    # mergeVariableSolverData!(getVariable(dfg, getLabel(newvar)), newvar)
+    mergeVariableData!(dfg, newvar)
     # Get the latest
     var1 = getVariable(dfg, :a)
     @test symdiff(collect(keys(getVariablePPEs(var1))), [:default, :second]) == Symbol[]
@@ -309,9 +312,9 @@ end
     delete!(getVariablePPEs(newvar), :default)
     #confirm delete
     @test symdiff(collect(keys(getVariablePPEs(newvar))), [:second]) == Symbol[]
-    # Persist it., and test #357
-    mergeVariableSolverData!(dfg, newvar)
-    # mergeUpdateVariableSolverData!(dfg, newvar)
+    # Persist it., and test
+    mergeVariableData!(dfg, newvar)
+    # mergeUpdateVariableSolverData!(dfg, newvar)  #357 #358
 
     # Get the latest and confirm they're the same, :second
     var1 = getVariable(dfg, :a)