Add more fixes to get_struct unit tests

Author: charleskawczynski

test/DataLayouts/unit_struct.jl

@@ -15,7 +15,7 @@ function one_to_n(a::Array)
 end
 one_to_n(s::Tuple, ::Type{FT}) where {FT} = one_to_n(zeros(FT, s...))
 ncomponents(::Type{FT}, ::Type{S}) where {FT, S} = div(sizeof(S), sizeof(FT))
-field_dim_to_one(s, dim) = Tuple(map(j-> j == dim ? 1 : s[j], 1:length(s)))
+field_dim_to_one(s, dim) = Tuple(map(j -> j == dim ? 1 : s[j], 1:length(s)))
 CI(s) = CartesianIndices(map(ξ -> Base.OneTo(ξ), s))
 
 struct Foo{T}
@@ -72,8 +72,9 @@ end
 @testset "get_struct - VIJFH indexing" begin
     FT = Float64
     S = Foo{FT}
-    s = (2, 2, 2, 2, 2)
-    a = one_to_n(s, FT)
+    s_array = (2, 2, 2, 2, 2)
+    s = field_dim_to_one(s_array, 4)
+    a = one_to_n(s_array, FT)
     @test ncomponents(FT, S) == 2
 
     @test get_struct(a, S, Val(4), CI(s)[1]) == Foo{FT}(1.0, 9.0)
@@ -84,30 +85,15 @@ end
     @test get_struct(a, S, Val(4), CI(s)[6]) == Foo{FT}(6.0, 14.0)
     @test get_struct(a, S, Val(4), CI(s)[7]) == Foo{FT}(7.0, 15.0)
     @test get_struct(a, S, Val(4), CI(s)[8]) == Foo{FT}(8.0, 16.0)
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[9])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[10])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[11])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[12])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[13])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[14])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[15])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[16])
-    @test get_struct(a, S, Val(4), CI(s)[17]) == Foo{FT}(17.0, 25.0)
-    @test get_struct(a, S, Val(4), CI(s)[18]) == Foo{FT}(18.0, 26.0)
-    @test get_struct(a, S, Val(4), CI(s)[19]) == Foo{FT}(19.0, 27.0)
-    @test get_struct(a, S, Val(4), CI(s)[20]) == Foo{FT}(20.0, 28.0)
-    @test get_struct(a, S, Val(4), CI(s)[21]) == Foo{FT}(21.0, 29.0)
-    @test get_struct(a, S, Val(4), CI(s)[22]) == Foo{FT}(22.0, 30.0)
-    @test get_struct(a, S, Val(4), CI(s)[23]) == Foo{FT}(23.0, 31.0)
-    @test get_struct(a, S, Val(4), CI(s)[24]) == Foo{FT}(24.0, 32.0)
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[25])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[26])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[27])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[28])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[29])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[30])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[31])
-    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[32])
+    @test get_struct(a, S, Val(4), CI(s)[9]) == Foo{FT}(17.0, 25.0)
+    @test get_struct(a, S, Val(4), CI(s)[10]) == Foo{FT}(18.0, 26.0)
+    @test get_struct(a, S, Val(4), CI(s)[11]) == Foo{FT}(19.0, 27.0)
+    @test get_struct(a, S, Val(4), CI(s)[12]) == Foo{FT}(20.0, 28.0)
+    @test get_struct(a, S, Val(4), CI(s)[13]) == Foo{FT}(21.0, 29.0)
+    @test get_struct(a, S, Val(4), CI(s)[14]) == Foo{FT}(22.0, 30.0)
+    @test get_struct(a, S, Val(4), CI(s)[15]) == Foo{FT}(23.0, 31.0)
+    @test get_struct(a, S, Val(4), CI(s)[16]) == Foo{FT}(24.0, 32.0)
+    @test_throws BoundsError get_struct(a, S, Val(4), CI(s)[17])
 end
 
 # TODO: add set_struct!