Add coverage tests and clean test warnings

Author: mcosovic

test/canonical.jl

@@ -81,7 +81,7 @@ function assertCanonicalMarginalsAccurate(;
     return nothing
 end
 
-function messageSnapshots(messages, edgeIds)
+function canonicalMessageSnapshots(messages, edgeIds)
     return [
         (
             information = copy(messages[edgeId].information),
@@ -91,7 +91,7 @@ function messageSnapshots(messages, edgeIds)
     ]
 end
 
-function assertMessagesUnchanged(messages, edgeIds, snapshots)
+function assertCanonicalMessagesUnchanged(messages, edgeIds, snapshots)
     for (snapshotIndex, edgeId) in pairs(edgeIds)
         @test messages[edgeId].information == snapshots[snapshotIndex].information
         @test messages[edgeId].precision == snapshots[snapshotIndex].precision
@@ -100,7 +100,7 @@ function assertMessagesUnchanged(messages, edgeIds, snapshots)
     return nothing
 end
 
-function assertFreezeFactor(;
+function assertCanonicalFreezeFactor(;
     broadcast::Bool,
     flooding::Bool,
     factor = "factor_x1_x2"
@@ -116,13 +116,13 @@ function assertFreezeFactor(;
 
     factorIdx = factorIndex(graph, factor)
     edgeIds = graph.factorEdges[factorIdx]
-    snapshots = messageSnapshots(inference.factorToVariable, edgeIds)
+    snapshots = canonicalMessageSnapshots(inference.factorToVariable, edgeIds)
 
     freezeFactor!(graph, inference, factor)
     @test isFrozenFactor(graph, inference, factor)
 
     gbp!(graph, inference; iterations = 3, schedule = gbpSchedule(flooding), broadcast = broadcast)
-    assertMessagesUnchanged(inference.factorToVariable, edgeIds, snapshots)
+    assertCanonicalMessagesUnchanged(inference.factorToVariable, edgeIds, snapshots)
 
     unfreezeFactor!(graph, inference, factor)
     @test !isFrozenFactor(graph, inference, factor)
@@ -133,7 +133,7 @@ function assertFreezeFactor(;
     return nothing
 end
 
-function assertFreezeVariable(;
+function assertCanonicalFreezeVariable(;
     broadcast::Bool,
     flooding::Bool,
     variable::VariableRef = :x2
@@ -149,13 +149,13 @@ function assertFreezeVariable(;
 
     variableIdx = variableIndex(graph, variable)
     edgeIds = graph.variableEdges[variableIdx]
-    snapshots = messageSnapshots(inference.variableToFactor, edgeIds)
+    snapshots = canonicalMessageSnapshots(inference.variableToFactor, edgeIds)
 
     freezeVariable!(graph, inference, variable)
     @test isFrozenVariable(graph, inference, variable)
 
     gbp!(graph, inference; iterations = 3, schedule = gbpSchedule(flooding), broadcast = broadcast)
-    assertMessagesUnchanged(inference.variableToFactor, edgeIds, snapshots)
+    assertCanonicalMessagesUnchanged(inference.variableToFactor, edgeIds, snapshots)
 
     unfreezeVariable!(graph, inference, variable)
     @test !isFrozenVariable(graph, inference, variable)
@@ -166,7 +166,7 @@ function assertFreezeVariable(;
     return nothing
 end
 
-function assertFreezeEdge(;
+function assertCanonicalFreezeEdge(;
     broadcast::Bool,
     flooding::Bool,
     variable::VariableRef = :x2,
@@ -182,19 +182,19 @@ function assertFreezeEdge(;
     gbp!(graph, inference; iterations = 2, schedule = gbpSchedule(flooding), broadcast = broadcast)
 
     edgeId = edgeIndex(graph; variable = variable, factor = factor)
-    variableToFactorSnapshot = messageSnapshots(inference.variableToFactor, [edgeId])
-    factorToVariableSnapshot = messageSnapshots(inference.factorToVariable, [edgeId])
+    variableToFactorSnapshot = canonicalMessageSnapshots(inference.variableToFactor, [edgeId])
+    factorToVariableSnapshot = canonicalMessageSnapshots(inference.factorToVariable, [edgeId])
 
     freezeEdge!(graph, inference; variable = variable, factor = factor)
     @test isFrozenEdge(graph, inference; variable = variable, factor = factor)
 
     gbp!(graph, inference; iterations = 3, schedule = gbpSchedule(flooding), broadcast = broadcast)
-    assertMessagesUnchanged(
+    assertCanonicalMessagesUnchanged(
         inference.variableToFactor,
         [edgeId],
         variableToFactorSnapshot
     )
-    assertMessagesUnchanged(
+    assertCanonicalMessagesUnchanged(
         inference.factorToVariable,
         [edgeId],
         factorToVariableSnapshot
@@ -209,7 +209,7 @@ function assertFreezeEdge(;
     return nothing
 end
 
-function assertGlobalDamping(;
+function assertCanonicalGlobalDamping(;
     broadcast::Bool,
     flooding::Bool
 )
@@ -235,7 +235,7 @@ function assertGlobalDamping(;
     return nothing
 end
 
-function assertDampedEdge(;
+function assertCanonicalDampedEdge(;
     broadcast::Bool,
     flooding::Bool,
     variable::VariableRef = :x2,
@@ -315,7 +315,7 @@ end
     @testset "Freeze: factor" begin
         for schedule in SCHEDULE_CASES
             @testset "schedule=$(schedule.name)" begin
-                assertFreezeFactor(
+                assertCanonicalFreezeFactor(
                     broadcast = schedule.broadcast,
                     flooding = schedule.flooding
                 )
@@ -326,7 +326,7 @@ end
     @testset "Freeze: variable" begin
         for schedule in SCHEDULE_CASES
             @testset "schedule=$(schedule.name)" begin
-                assertFreezeVariable(
+                assertCanonicalFreezeVariable(
                     broadcast = schedule.broadcast,
                     flooding = schedule.flooding
                 )
@@ -337,7 +337,7 @@ end
     @testset "Freeze: edge" begin
         for schedule in SCHEDULE_CASES
             @testset "schedule=$(schedule.name)" begin
-                assertFreezeEdge(
+                assertCanonicalFreezeEdge(
                     broadcast = schedule.broadcast,
                     flooding = schedule.flooding
                 )
@@ -348,7 +348,7 @@ end
     @testset "Damping: global" begin
         for schedule in SCHEDULE_CASES
             @testset "schedule=$(schedule.name)" begin
-                assertGlobalDamping(
+                assertCanonicalGlobalDamping(
                     broadcast = schedule.broadcast,
                     flooding = schedule.flooding
                 )
@@ -359,7 +359,7 @@ end
     @testset "Damping: edge" begin
         for schedule in SCHEDULE_CASES
             @testset "schedule=$(schedule.name)" begin
-                assertDampedEdge(
+                assertCanonicalDampedEdge(
                     broadcast = schedule.broadcast,
                     flooding = schedule.flooding
                 )

test/discrete_graph.jl

@@ -160,6 +160,17 @@ include("setup.jl")
         @test_throws ErrorException DiscreteVariable(:x1, 2; states = [:off, :off])
         @test_throws ErrorException DiscreteVariable(:x1, 1; states = [""])
         @test_throws ErrorException DiscreteVariable(:x1, 2; states = [:off])
+        @test_throws ErrorException DiscreteVariable(:x1, 0)
+        @test_throws ErrorException DiscreteVariable(:x1, 2; label = "")
+        @test_throws ErrorException DiscreteVariable(:x1, 2; states = :off)
+        @test_throws ErrorException DiscreteVariable(:x1, 2; states = Symbol[])
+        @test_throws ErrorException DiscreteVariable(:x1, 2; states = [1.0, 2.0])
+        @test_throws ErrorException DiscreteVariable(:x1, 2; probability = [0.5])
+        @test_throws ErrorException DiscreteVariable(:x1, 2; probability = [-0.1, 1.1])
+        @test_throws ErrorException DiscreteVariable(:x1, 2; probability = [0.0, 0.0])
+        @test_throws ErrorException DiscreteFactor()
+        @test_throws ErrorException DiscreteFactor(:x1, [])
+        @test_throws ErrorException DiscreteFactor(:x1, [-0.1, 1.1])
 
         @test_throws ErrorException factorGraph(
             [
@@ -172,6 +183,35 @@ include("setup.jl")
             ]
         )
 
+        @test_throws ErrorException factorGraph(
+            [
+                DiscreteVariable(:x1, 2; label = "x"),
+                DiscreteVariable(:x2, 2; label = "x")
+            ],
+            [
+                DiscreteFactor(:x1, [0.6, 0.4]; label = "prior_x1"),
+                DiscreteFactor(:x2, [0.5, 0.5]; label = "prior_x2")
+            ]
+        )
+        @test_throws ErrorException factorGraph(
+            [
+                DiscreteVariable(:x1, 2; label = "x1"),
+                DiscreteVariable(:x2, 2; label = "x2")
+            ],
+            [
+                DiscreteFactor(:x1, [0.6, 0.4]; label = "prior"),
+                DiscreteFactor(:x2, [0.5, 0.5]; label = "prior")
+            ]
+        )
+        @test_throws ErrorException factorGraph(
+            [DiscreteVariable(:x1, 2; label = "x1")],
+            [DiscreteFactor(:x1, :x1, [0.8 0.2; 0.2 0.8]; label = "duplicate")]
+        )
+        @test_throws ErrorException factorGraph(
+            [DiscreteVariable(:x1, 2; label = "x1")],
+            [DiscreteFactor(:x1, :missing, [0.8 0.2; 0.2 0.8]; label = "missing")]
+        )
+
         graph = factorGraph(
             [DiscreteVariable(:x1, 2; label = "x1")],
             [DiscreteFactor(:x1, [0.6, 0.4]; label = "prior_x1")]
@@ -180,6 +220,12 @@ include("setup.jl")
 
         @test_throws ErrorException updateFactor!(graph; factor = "prior_x1", table = [1.0])
         @test graph.factors[1] === original
+        @test_throws ErrorException factorIndex(graph, "missing")
+        @test_throws ErrorException edgeIndex(graph; variable = :x1, factor = "missing")
+        @test_throws ErrorException edgeIndex(graph; variable = :missing, factor = "prior_x1")
+        @test_throws ErrorException edgeIndices(graph)
+        @test_throws ErrorException stateIndex(graph, :x1, :missing)
+        @test_throws ErrorException stateValue(graph, :x1, 0)
     end
 
     @testset "Constructs tree view" begin

test/graph_figure.jl

@@ -103,14 +103,18 @@ end
             highlight = [
                 (variable = :x2, stroke = "#16a34a", fill = "#dcfce7", strokeWidth = 5),
                 (factor = "link_1_2", stroke = "#2563eb", strokeWidth = 4),
-                (variable = :x1, factor = "link_1_2", stroke = "#7c3aed", strokeWidth = 6)
+                (variable = :x1, factor = "link_1_2", stroke = "#7c3aed", strokeWidth = 6),
+                (edge = 1, stroke = "#0f766e"),
+                (edge = graph.edges[6], stroke = "#be123c")
             ]
         )
 
         @test occursin("stroke: #16a34a", svg)
         @test occursin("fill: #dcfce7", svg)
         @test occursin("stroke: #2563eb", svg)
         @test occursin("stroke: #7c3aed", svg)
+        @test occursin("stroke: #0f766e", svg)
+        @test occursin("stroke: #be123c", svg)
         @test occursin("stroke-width: 6", svg)
         @test count("stroke-width: 5", svg) > 1
     end
@@ -338,6 +342,18 @@ end
         @test_throws ErrorException graphFigure(graph; canvas = (canvasPadding = 16,))
         @test_throws ErrorException graphFigure(graph; layout = (orientation = :diagonal,))
         @test_throws ErrorException graphFigure(graph; label = (labelPlacement = :inside,))
+        @test_throws ErrorException graphFigure(graph; view = (depth = 1,))
+        @test_throws ErrorException graphFigure(graph; view = (variables = Symbol[], factors = String[]))
+        @test_throws ErrorException graphFigure(graph; view = (variables = [:x1, :x1],))
+        @test_throws ErrorException graphFigure(graph; view = (factors = ["prior", "prior"],))
+        @test_throws ErrorException graphFigure(graph; highlight = [(:x1,)])
+        @test_throws ErrorException graphFigure(graph; highlight = [(edge = 1, variable = :x1)])
+        @test_throws ErrorException graphFigure(graph; highlight = [NamedTuple()])
+        @test_throws ErrorException graphFigure(graph; highlight = [(edge = 0,)])
+        @test_throws ErrorException graphFigure(
+            graph;
+            highlight = [(variable = :x1, factor = "link_2_3")]
+        )
         @test_throws MethodError graphFigure(graph; highlightVariables = [:x1])
         @test_throws MethodError graphFigure(graph; highlightFactors = ["link_1_2"])
         @test_throws MethodError graphFigure(graph; highlightEdges = [(:x1, "link_1_2")])