Fix bug 407, test that

NREL-Sienna · Oct 28, 2024 · 9fa405c · 9fa405c
1 parent 627c8dd
commit 9fa405c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 26 deletions.
diff --git a/src/utils/utils.jl b/src/utils/utils.jl
@@ -126,6 +126,8 @@ _fetch_match_fn(::Nothing) = isequivalent
 # Whether to stop recursing and apply the match_fn
 _is_compare_directly(::DataType, ::DataType) = true
 _is_compare_directly(::T, ::U) where {T, U} = true
+# As of 1.11, Arrays have fields we don't want to touch
+_is_compare_directly(::T, ::T) where {T <: AbstractArray} = true
 _is_compare_directly(::T, ::T) where {T} = isempty(fieldnames(T))
 
 """
@@ -161,33 +163,15 @@ function compare_values(match_fn::Union{Function, Nothing}, x::T, y::U;
         field_name in exclude && continue
         val1 = getproperty(x, field_name)
         val2 = getproperty(y, field_name)
-        if !isempty(fieldnames(typeof(val1)))
-            if !compare_values(
-                match_fn,
-                val1,
-                val2;
-                compare_uuids = compare_uuids,
-                exclude = exclude,
-            )
-                @error "values do not match" T field_name val1 val2
-                match = false
-            end
-        elseif val1 isa AbstractArray
-            if !compare_values(
-                match_fn,
-                val1,
-                val2;
-                compare_uuids = compare_uuids,
-                exclude = exclude,
-            )
-                @error "values do not match" T field_name val1 val2
-                match = false
-            end
+        sub_result = if _is_compare_directly(val1, val2)
+            _fetch_match_fn(match_fn)(val1, val2)
         else
-            if !_fetch_match_fn(match_fn)(val1, val2)
-                @error "values do not match" T field_name val1 val2
-                match = false
-            end
+            compare_values(match_fn, val1, val2;
+                compare_uuids = compare_uuids, exclude = exclude)
+        end
+        if !sub_result
+            @error "values do not match" T field_name val1 val2
+            match = false
         end
     end
 

diff --git a/test/test_system_data.jl b/test/test_system_data.jl
@@ -201,6 +201,9 @@ end
         special1,
     ))
     @test IS.compare_values(==, special1, special1)
+
+    # https://github.com/NREL-Sienna/InfrastructureSystems.jl/issues/407
+    @test InfrastructureSystems.compare_values([0 0], [0 0])
 end
 
 @testset "Test compression settings" begin