fix tests

JuliaHEP · Nov 15, 2024 · 623fc0f · 623fc0f
1 parent 006b7f7
commit 623fc0f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 30 deletions.
diff --git a/src/RNTuple/Writing/constants.jl b/src/RNTuple/Writing/constants.jl
diff --git a/src/RNTuple/constants.jl b/src/RNTuple/constants.jl
@@ -51,20 +51,20 @@ RNTuple_ColumnType(type = 0x1B, nbits = 64, name = :SplitIndex64, jltype = Index
 
 # for each Julia type, we pick just one canonical representation for writing
 const RNTUPLE_WRITE_TYPE_IDX_DICT = Dict(
-    Index64 => (0x0E, sizeof(Index64) * 8),
-    Index32 => (0x0F, sizeof(Index32) * 8),
+    Index64 => (0x0F, sizeof(Index64) * 8),
+    Index32 => (0x0E, sizeof(Index32) * 8),
     Char => (0x02, 8),
     Bool => (0x00, 1),
-    Float64 => (0x19, sizeof(UInt64) * 8),
-    Float32 => (0x18, sizeof(UInt32) * 8),
-    Float16 => (0x17, sizeof(UInt16) * 8),
+    Float64 => (0x0D, sizeof(Float64) * 8),
+    Float32 => (0x0C, sizeof(Float32) * 8),
+    Float16 => (0x0B, sizeof(Float16) * 8),
     UInt64 => (0x0A, sizeof(UInt64) * 8),
     UInt32 => (0x08, sizeof(UInt32) * 8),
     UInt16 => (0x06, sizeof(UInt16) * 8),
     UInt8 => (0x04, sizeof(UInt8) * 8),
-    Int64 => (0x15, sizeof(Int64) * 8),
-    Int32 => (0x13, sizeof(Int32) * 8),
-    Int16 => (0x11, sizeof(Int16) * 8),
+    Int64 => (0x09, sizeof(Int64) * 8),
+    Int32 => (0x07, sizeof(Int32) * 8),
+    Int16 => (0x05, sizeof(Int16) * 8),
     Int8 => (0x03, sizeof(Int8) * 8),
 )
 

diff --git a/src/UnROOT.jl b/src/UnROOT.jl
@@ -65,7 +65,6 @@ include("RNTuple/highlevel.jl")
 include("RNTuple/fieldcolumn_reading.jl")
 include("RNTuple/displays.jl")
 
-include("RNTuple/Writing/constants.jl")
 include("RNTuple/Writing/page_writing.jl")
 include("RNTuple/Writing/TFileWriter.jl")
 include("RNTuple/Writing/Stubs.jl")

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -4,30 +4,30 @@ using UnROOT
 nthreads = UnROOT._maxthreadid()
 nthreads == 1 && @warn "Running on a single thread. Please re-run the test suite with at least two threads (`julia --threads 2 ...`)"
 
-# @testset "UnROOT tests" verbose = true begin
-    # include("Aqua.jl")
-    # include("bootstrapping.jl")
-    # include("compressions.jl")
-    # include("jagged.jl")
-    # include("lazy.jl")
-    # include("histograms.jl")
-    # include("views.jl")
-    # include("multithreading.jl")
-    # include("remote.jl")
-    # include("displays.jl")
-    # include("type_stability.jl")
-    # include("utils.jl")
-    # include("misc.jl")
+@testset "UnROOT tests" verbose = true begin
+    include("Aqua.jl")
+    include("bootstrapping.jl")
+    include("compressions.jl")
+    include("jagged.jl")
+    include("lazy.jl")
+    include("histograms.jl")
+    include("views.jl")
+    include("multithreading.jl")
+    include("remote.jl")
+    include("displays.jl")
+    include("type_stability.jl")
+    include("utils.jl")
+    include("misc.jl")
 
-    # include("type_support.jl")
-    # include("custom_bootstrapping.jl")
-    # include("lorentzvectors.jl")
-    # include("NanoAOD.jl")
+    include("type_support.jl")
+    include("custom_bootstrapping.jl")
+    include("lorentzvectors.jl")
+    include("NanoAOD.jl")
 
-    # include("issues.jl")
+    include("issues.jl")
 
     if VERSION >= v"1.9"
-        # include("rntuple.jl")
+        include("rntuple.jl")
         include("./RNTupleWriting/lowlevel.jl")
     end
-# end
+end