fix more tests

Author: Affie

src/Deprecated.jl

@@ -151,6 +151,12 @@ end
 
 #TODO is Type correct
 @deprecate getVariableType(args...) getStateType(args...)
+
+function getVariableTypeName(v::VariableSummary)
+    Base.depwarn("getVariableTypeName is deprecated.", :getVariableTypeName)
+    return v.statetype
+end
+
 ## ================================================================================
 ## Deprecated in v0.28
 ##=================================================================================

src/DistributedFactorGraphs.jl

@@ -359,8 +359,6 @@ const unstable_functions::Vector{Symbol} = [
     :findFactorsBetweenNaive,
     :getAgentLabel,
     :getGraphLabel,
-    :getVariableTypeName,
-    :getVariableType,
     :getDescription,
     :getAddHistory,
     :getSolverParams,
@@ -403,7 +401,7 @@ const unstable_functions::Vector{Symbol} = [
     :packState,
     :unpack,
     :unpackDistribution,
-    :unpackVariable,
+    # :unpackVariable,
     # :unpackFactor,
     :unpackBlob,
     :unpackState,
@@ -429,6 +427,8 @@ const unstable_functions::Vector{Symbol} = [
     # no set on these
 
     #deprecated in v0.29
+    :getVariableTypeName,
+    :getVariableType,
     :setTimestamp,
     :setMetadata!, # no set, use add merge
     :setAgentMetadata!,

src/entities/DFGVariable.jl

@@ -216,7 +216,7 @@ The default VariableDFG constructor.
 #IIF like contruction helper for VariableDFG
 function VariableDFG(
     label::Symbol,
-    stateType::Union{T, Type{T}};
+    statetype::Union{T, Type{T}};
     tags::Union{Set{Symbol}, Vector{Symbol}} = Set{Symbol}(),
     timestamp::Union{TimeDateZone, ZonedDateTime} = TimeDateZone(now(localzone())),
     solvable::Union{Int, Base.RefValue{Int}} = Ref(1),
@@ -299,9 +299,9 @@ $(TYPEDFIELDS)
     """Variable tags, e.g [:POSE, :VARIABLE, and :LANDMARK].
     Accessors: [`getTags`](@ref), [`mergeTags!`](@ref), and [`removeTags!`](@ref)"""
     tags::Set{Symbol}
-    """Symbol for the variableType for the underlying variable.
-    Accessor: [`getVariableType`](@ref)"""
-    variableTypeName::Symbol & (json = (name = "variableType",)) # TODO check from StructTypes.names(::Type{VariableSummary}) = ((:variableTypeName, :variableType),)
+    """Symbol for the state type for the underlying variable.
+    Accessor: [`getStateType`](@ref)"""
+    statetype::Symbol
     """Dictionary of large data associated with this variable.
     Accessors: [`addBlobentry!`](@ref), [`getBlobentry`](@ref), [`mergeBlobentry!`](@ref), and [`deleteBlobentry!`](@ref)"""
     blobentries::Blobentries

src/services/DFGVariable.jl

@@ -436,33 +436,10 @@ function emptyMetadata!(dfg::AbstractDFG, label::Symbol)
 end
 
 ##------------------------------------------------------------------------------
-## Data Entries and Blobs
+## Blobentries and Blobs
 ##------------------------------------------------------------------------------
-
 ## see DataEntryBlob Folder
 
-##------------------------------------------------------------------------------
-## variableTypeName
-##------------------------------------------------------------------------------
-## getter in VariableSummary only
-## can be utility function for others
-## TODO this should return the variableType object, or try to. it should be getVariableTypeName for the accessor
-## TODO Consider parameter N in variableType for dims, and storing constructor in variableTypeName
-## TODO or just not having this function at all
-# getVariableType(v::VariableSummary) = v.softypename()
-##------------------------------------------------------------------------------
-
-"""
-    $SIGNATURES
-Retrieve the soft type name symbol for a VariableSummary. ie :Point2, Pose2, etc.
-"""
-getVariableTypeName(v::VariableSummary) = v.variableTypeName::Symbol
-
-function getVariableType(v::VariableSummary)
-    @warn "Looking for type in `Main`. Only use if `variableType` has only one implementation, ie. Pose2. Otherwise use the full variable."
-    return getfield(Main, v.variableTypeName)()
-end
-
 ##==============================================================================
 ## Layer 2 CRUD and SET
 ##==============================================================================

test/GraphsDFGSummaryTypes.jl

@@ -5,9 +5,8 @@
 dfg = GraphsDFG{NoSolverParams, VARTYPE, FACTYPE}()
 function DistributedFactorGraphs.VariableSummary(label::Symbol)
     return VariableSummary(
-        nothing,
         label,
-        DistributedFactorGraphs.now(localzone()),
+        TimeDateZone("2025-11-13T15:21:57.474125421+01:00"),
         Set{Symbol}(),
         :Pose2,
         Dict{Symbol, Blobentry}(),
@@ -16,9 +15,8 @@ end
 
 function DistributedFactorGraphs.VariableSummary(label::Symbol, ::State{T}) where {T}
     return VariableSummary(
-        nothing,
         label,
-        DistributedFactorGraphs.now(localzone()),
+        TimeDateZone("2025-11-13T15:21:57.474125421+01:00"),
         Set{Symbol}(),
         Symbol(T),
         Dict{Symbol, Blobentry}(),
@@ -30,7 +28,7 @@ function DistributedFactorGraphs.VariableSkeleton(label::Symbol, args...)
 end
 
 function DistributedFactorGraphs.VariableSkeleton(label::Symbol, ::State{T}) where {T}
-    return VariableSkeleton(nothing, label, Set{Symbol}())
+    return VariableSkeleton(label, Set{Symbol}())
 end
 
 dfg = GraphsDFG{NoSolverParams, VARTYPE, FACTYPE}()
@@ -105,7 +103,6 @@ end
 
     if VARTYPE == VariableSummary
         @test getTimestamp(v1) == v1.timestamp
-        @test getVariableTypeName(v1) == :Pose2
     end
 end
 

test/iifInterfaceTests.jl

@@ -404,14 +404,8 @@ end
     # Check all fields are equal for all variables
     for v in ls(summaryGraph)
         for field in variableFields
-            if field != :variableTypeName
-                @test getproperty(getVariable(dfg, v), field) ==
-                      getfield(getVariable(summaryGraph, v), field)
-            else
-                # Special case to check the symbol variableType is equal to the full variableType.
-                @test Symbol(typeof(getVariableType(getVariable(dfg, v)))) ==
-                      getVariableTypeName(getVariable(summaryGraph, v))
-            end
+            @test getproperty(getVariable(dfg, v), field) ==
+                  getfield(getVariable(summaryGraph, v), field)
         end
     end
     for f in lsf(summaryGraph)

test/testBlocks.jl

@@ -35,15 +35,15 @@ TestFunctorInferenceType1() = TestFunctorInferenceType1(TestBelief())
 TestFunctorInferenceType2() = TestFunctorInferenceType2(TestBelief())
 TestAbstractPrior() = TestAbstractPrior(TestBelief())
 
-struct PackedNothingDistribution <: AbstractPackedBelief
-    _type::Symbol
-    function PackedNothingDistribution(; _type::String = "PackedNothingDistribution")
-        return new(Symbol(_type))
-    end
-end
+# struct PackedNothingDistribution <: AbstractPackedBelief
+#     _type::Symbol
+#     function PackedNothingDistribution(; _type::String = "PackedNothingDistribution")
+#         return new(Symbol(_type))
+#     end
+# end
 
-DFG.packDistribution(::Nothing) = PackedNothingDistribution()
-DFG.unpackDistribution(::PackedNothingDistribution) = nothing
+# DFG.packDistribution(::Nothing) = PackedNothingDistribution()
+# DFG.unpackDistribution(::PackedNothingDistribution) = nothing
 
 struct TestCCW{T <: AbstractObservation} <: FactorCache
     usrfnc!::T
@@ -1357,16 +1357,8 @@ function Summaries(testDFGAPI)
     # Check all fields are equal for all variables
     for v in ls(summaryGraph)
         for field in variableFields
-            if field != :variableTypeName
-                @test getproperty(getVariable(dfg, v), field) ==
-                      getproperty(getVariable(summaryGraph, v), field)
-            else
-                # Special case to check the symbol variableType is equal to the full variableType.
-                @test Symbol(typeof(getVariableType(getVariable(dfg, v)))) ==
-                      getVariableTypeName(getVariable(summaryGraph, v))
-                @test getVariableType(getVariable(dfg, v)) ==
-                      getVariableType(getVariable(summaryGraph, v))
-            end
+            @test getproperty(getVariable(dfg, v), field) ==
+                  getproperty(getVariable(summaryGraph, v), field)
         end
     end
     for f in lsf(summaryGraph)