Fix tests

Author: felixcremer

test/DAT/xmap.jl

@@ -6,11 +6,11 @@
         a1 = YAXArray((x,y,z), rand(4,5,6))
         a2 = YAXArray((x,z,y), rand(4,6,5))
         a3 = YAXArray((x,y), rand(4,5))
-        r = xmap(a1 ⊘ X, a2 ⊘ X, output = XOutput(dims(a1, X))) do xout, x1, x2
+        r = xmap(a1 ⊘ :X, a2 ⊘ :X, output = XOutput(dims(a1, X))) do xout, x1, x2
             xout .= x1 .+ x2
         end
         @test r.data == a1.data .+ permutedims(a2.data,(1,3,2))
-        r = xmap(a2 ⊘ X, a3 ⊘ X, output=XOutput(dims(a1, X))) do xout, x1, x2
+        r = xmap(a2 ⊘ :X, a3 ⊘ :X, output=XOutput(dims(a1, X))) do xout, x1, x2
             xout .= x1 .+ x2
         end
         @test r.data == a2.data .+ reshape(a3.data,(4,1,5))
@@ -19,16 +19,16 @@
         #end
         @test r.data == a2.data .+ reshape(a3.data,(4,1,5))
     end
-
-    @testitem "set outtype" begin
-        using YAXArrays
-        using DimensionalData
-        using Statistics
-        x,y,z = X(1:4), Y(1:5), Z(1:6)
-        a1 = YAXArray((x,y,z), rand(UInt8, 4,5,6))
-        r = xmap((xout, xin) -> xout .= mean(xin), a1 ⊘ :X, output=XOutput(outtype=Float16))
-        @test r.data == Float16.(mean(a1, dims=1))
-    end
+end
+@testitem "set outtype" begin
+    using YAXArrays
+    using DimensionalData
+    using Statistics
+    x,y,z = X(1:4), Y(1:5), Z(1:6)
+    a1 = YAXArray((x,y,z), rand(UInt8, 4,5,6))
+    r = xmap((xout, xin) -> xout .= mean(xin), a1 ⊘ :X, output=XOutput(outtype=Float16))
+    @test r.data == Float16.(mean(a1, dims=1))
+end
 
 #=
 These should be reenabled once we decided what keyword arguments xmap gets. 
@@ -74,4 +74,3 @@ These should be reenabled once we decided what keyword arguments xmap gets.
         @test_throws CapturedException mapCube((xout, xin) -> xout .= foo(xin), a1; indims, outdims, ispar=true)
     end
 =#
-end

test/runtests.jl

@@ -19,5 +19,6 @@ include("DAT/PickAxisArray.jl")
 include("DAT/MovingWindow.jl")
 include("DAT/tablestats.jl")
 include("DAT/mapcube.jl")
+include("DAT/xmap.jl")
 include("DAT/DAT.jl")
 include("DAT/loopchunks.jl")