Adapt all other tests...

Author: VEZY

test/test-ancestors.jl

@@ -1,6 +1,6 @@
 @testset "ancestors" begin
     mtg = read_mtg("files/simple_plant.mtg")
-    width_all = [nothing, nothing, nothing, 1.0, 6.0, nothing, 7.0]
+    width_all = [nothing, nothing, nothing, 0.02, 0.1, 0.02, 0.1] # from print(descendants(mtg, :Width, self = true))
 
     # Using a leaf node from the mtg:
     leaf_node = mtg.children[2].children[3].children[4].children[5]
@@ -17,5 +17,5 @@
     @test ancestors(leaf_node, :Width, symbol = ("Leaf", "Internode")) == width_all[[4]]
 
     @test ancestors(leaf_node, :Width, symbol = ("Leaf", "Internode"), self = true) ==
-          width_all[5:-1:4]
+          width_all[end:-1:end-1]
 end

test/test-conversion.jl

@@ -3,12 +3,12 @@ mtg = read_mtg("files/simple_plant.mtg", Dict);
 @testset "DataFrame" begin
     df_mtg = DataFrame(mtg, [:scales, :Length])
     @test df_mtg[1, :scales] == [0, 1, 2, 3, 3]
-    @test df_mtg[7, :Length] == 12.0
+    @test df_mtg[7, :Length] == 0.2
 end
 
 
 @testset "MetaGraph" begin
     meta_mtg = MetaGraph(mtg)
     @test meta_mtg[1][:scales] == [0, 1, 2, 3, 3]
-    @test meta_mtg[7][:Length] == 12.0
+    @test meta_mtg[7][:Length] == 0.2
 end

test/test-delete-prune.jl

@@ -39,19 +39,19 @@ end
     delete_nodes!(mtg, symbol = "Leaf")
     @test length(mtg) === length_start - 2
 
-    # Delete with a function, here we delete all nodes that have a parent with Length < 5:
+    # Delete with a function, here we delete all nodes that have a parent with Length < 0.2:
     mtg = read_mtg(file)
     delete_nodes!(
         mtg,
         filter_fun = function (node)
             if !isroot(node)
-                node.parent[:Length] !== nothing ? node.parent[:Length] < 5 : false
+                node.parent[:Length] !== nothing ? node.parent[:Length] < 0.2 : false
             else
                 false
             end
         end
     )
-    @test length(mtg) === length_start - 2
+    @test length(mtg) === length_start - 3
 end
 
 @testset "prune! a node" begin

test/test-descendants.jl

@@ -1,31 +1,31 @@
 @testset "descendants" begin
-    mtg = read_mtg("files/simple_plant.mtg");
-    width_all = [nothing,nothing,1.0,6.0,nothing,7.0]
-    @test descendants(mtg, :Width; type = Union{Nothing,Float64}) ==  width_all
-    @test descendants(mtg, :Width) ==  width_all
+    mtg = read_mtg("files/simple_plant.mtg")
+    width_all = [nothing, nothing, 0.02, 0.1, 0.02, 0.1]
+    @test descendants(mtg, :Width; type = Union{Nothing,Float64}) == width_all
+    @test descendants(mtg, :Width) == width_all
 
     d = descendants(mtg, :Width, scale = 1)
     @test typeof(d) == Vector{Any}
     @test length(d) == 1
-    @test d[1] == width_all[1]
+    @test d[1] === width_all[1]
     d_typed = descendants(mtg, :Width, type = Union{Nothing,Float64})
-    @test typeof(d_typed) ==  Vector{Union{Nothing,Float64}}
+    @test typeof(d_typed) == Vector{Union{Nothing,Float64}}
     @test descendants(mtg, :Width, symbol = ("Leaf", "Internode")) == width_all[3:end]
 
     mtg2 = mtg[1][1][1][2]
     @test descendants(mtg2, :Width, symbol = "Leaf")[1] == width_all[end]
 
     @test descendants(mtg2, :Width, symbol = ("Leaf", "Internode"), self = true) ==
-        width_all[end - 1:end]
+          width_all[end-1:end]
 
     # Using the mutating version:
     @test descendants!(mtg, :Width) == descendants(mtg, :Width)
     @test descendants!(mtg2, :Width, symbol = ("Leaf", "Internode"), self = true) ==
-        width_all[end - 1:end]
+          width_all[end-1:end]
 
     clean_cache!(mtg)
     # Get the leaves values:
-    @test descendants(mtg, :Width; filter_fun = isleaf) ==  width_all[[end - 2,end]]
+    @test descendants(mtg, :Width; filter_fun = isleaf) == width_all[[end - 2, end]]
 
 
     # descendants!(mtg, :Width, symbol = ("Leaf", "Internode"), self = true)

test/test-insert_node.jl

@@ -59,7 +59,7 @@
     mtg_5 = get_root(mtg_5)
 
     @test mtg_5.MTG == template
-    @test mtg_5[:Total_Length] == 32.0
+    @test mtg_5[:Total_Length] ≈ 0.6
     @test mtg_5[1][:Length] == 1
 end
 
@@ -71,14 +71,14 @@ end
     insert_parents!(
         mtg,
         template,
-        node -> Dict{Symbol,Any}(:Total_Length => sum(descendants(node, :Length, ignore_nothing = true)),),
+        node -> Dict{Symbol,Any}(:Total_Length => round(sum(descendants(node, :Length, ignore_nothing = true)), digits = 1),),
         scale = 2
     )
 
     @test length(mtg) == length_before + 1
     @test mtg[1][1].MTG == template
     @test mtg[1][1].name == "node_8"
-    @test mtg[1][1].attributes == Dict{Symbol,Any}(:Total_Length => 32.0)
+    @test mtg[1][1].attributes == Dict{Symbol,Any}(:Total_Length => 0.6)
 end
 
 

test/test-nodes.jl

@@ -1,18 +1,18 @@
 mtg = read_mtg("files/simple_plant.mtg")
 
 @testset "names" begin
-    @test get_attributes(mtg) == [:scales, :description, :symbols, :FileName, :YY, :ZZ, :XX, :Length, :Width, :XEuler]
+    @test get_attributes(mtg) == [:scales, :description, :symbols, :Length, :Width, :XEuler]
     @test names(mtg) == get_attributes(mtg)
     @test names(DataFrame(mtg))[8:end] == string.(names(mtg))
 end
 
 
 @testset "get attribute value" begin
-    @test mtg[1][:YY] == 0.0
-    @test mtg[1].attributes[:YY] == 0.0
+    @test mtg[1][1][1][:Width] == 0.02
+    @test mtg[1][1][1].attributes[:Width] == 0.02
 end
 
 @testset "set attribute value" begin
-    mtg[1][:YY] = 1.0
-    @test mtg[1][:YY] == 1.0
+    mtg[1][1][1][:Width] = 1.0
+    @test mtg[1][1][1][:Width] == 1.0
 end