test fix, KeyError

Author: dehann

NEWS.md

@@ -2,6 +2,7 @@ Listing news on any major breaking changes in DFG.  For regular changes, see int
 
 # v0.20
 
+- Throw `KeyError` if `getBlobEntry` is not found, previously was `ErrorException`.
 - Change return type on `addData!` convenience wrappers to only return new `BlobEntry`.
 - Fix `addBlob!` calls for `FolderStore` and `InMemoryBlobStore` to use `BlobEntry.originId` and not previous bug `entry.id`.
 - Close long running serialization redo (#590) using only JSON3.jl and StructTypes.jl going forward.

src/DataBlobs/services/BlobEntry.jl

@@ -77,13 +77,16 @@ Get data entry
 Also see: [`addBlobEntry`](@ref), [`getBlob`](@ref), [`listBlobEntries`](@ref)
 """
 function getBlobEntry(var::AbstractDFGVariable, key::Symbol)
-    !hasBlobEntry(var, key) && error("No dataEntry label $(key) found in variable $(getLabel(var))")
+    if !hasBlobEntry(var, key)
+        throw(KeyError("No dataEntry label $(key) found in variable $(getLabel(var)). Available keys: $(keys(var.dataDict))"))
+    end
     return var.dataDict[key]
 end
 
 function getBlobEntry(var::AbstractDFGVariable, blobId::UUID)
     for (k,v) in var.dataDict
-        if v.id == blobId
+        # FIXME stop using v.id since that has been repurposed for unique BlobEntry indexing
+        if v.originId == blobId || v.blobId == blobId || v.id == blobId
             return v
         end
     end
@@ -117,15 +120,15 @@ getBlobEntry(dfg::AbstractDFG, label::Symbol, key::Union{Symbol, UUID, <:Abstrac
 Add Data Entry to a DFG variable
 Should be extended if DFG variable is not returned by reference.
 
-Also see: [`getBlobEntry`](@ref), [`addBlob`](@ref), [`mergeBlobEntries!`](@ref)
+Also see: [`getBlobEntry`](@ref), [`addBlob!`](@ref), [`mergeBlobEntries!`](@ref)
 """
 function addBlobEntry!(
     var::AbstractDFGVariable, 
     entry::BlobEntry;
-    # see https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/issues/985
-    blobId::UUID = isnothing(entry.blobId) ? entry.id : entry.blobId ,
-    blobSize::Int = hasfield(DistributedFactorGraphs.BlobEntry, :size) ? entry.size : -1 ,
+    blobId::UUID = (isnothing(entry.blobId) ? entry.id : entry.blobId),
+    blobSize::Int = (hasfield(BlobEntry, :size) ? entry.size : -1)
 )
+    # see https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/issues/985
     haskey(var.dataDict, entry.label) && error("blobEntry $(entry.label) already exists on variable $(getLabel(var))")
     var.dataDict[entry.label] = entry
     return entry

test/testBlocks.jl

@@ -919,8 +919,8 @@ function  DataEntriesTestBlock!(fg, v2)
     #get
     @test deepcopy(de1) == getBlobEntry(v1, :key1)
     @test deepcopy(de2) == getBlobEntry(fg, :a, :key2)
-    @test_throws ErrorException getBlobEntry(v2, :key1)
-    @test_throws ErrorException getBlobEntry(fg, :b, :key1)
+    @test_throws KeyError getBlobEntry(v2, :key1)
+    @test_throws KeyError getBlobEntry(fg, :b, :key1)
 
     #update
     @test updateBlobEntry!(fg, :a, de2_update) == de2_update
@@ -998,8 +998,8 @@ function blobsStoresTestBlock!(fg)
     #get
     @test deepcopy(de1) == getBlobEntry(var1, :label1)
     @test deepcopy(de2) == getBlobEntry(fg, :a, :label2)
-    @test_throws ErrorException getBlobEntry(var2, :label1)
-    @test_throws ErrorException getBlobEntry(fg, :b, :label1)
+    @test_throws KeyError getBlobEntry(var2, :label1)
+    @test_throws KeyError getBlobEntry(fg, :b, :label1)
 
     #update
     @test updateBlobEntry!(fg, :a, de2_update) == de2_update