From 38b234795d049100353738026787db768123ab6d Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 22 May 2018 13:50:52 -0700 Subject: [PATCH] Modify tests to also use fileio_* version of functions --- test/loadsave.jl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/loadsave.jl b/test/loadsave.jl index cdfd337b..bb7881af 100644 --- a/test/loadsave.jl +++ b/test/loadsave.jl @@ -7,10 +7,13 @@ module TestLoadSave import FileIO: File, @format_str load(file::File{format"PBMText"}) = "PBMText" load(file::File{format"PBMBinary"}) = "PBMBinary" -load(file::File{format"HDF5"}) = "HDF5" load(file::File{format"JLD"}) = "JLD" load(file::File{format"GZIP"}) = "GZIP" end +module TestLoadSave2 +import FileIO: File, @format_str +fileio_load(file::File{format"HDF5"}) = "HDF5" +end sym2loader = copy(FileIO.sym2loader) sym2saver = copy(FileIO.sym2saver) @@ -23,7 +26,7 @@ try add_loader(format"PBMText", :TestLoadSave) add_loader(format"PBMBinary", :TestLoadSave) - add_loader(format"HDF5", :TestLoadSave) + add_loader(format"HDF5", :TestLoadSave2) add_loader(format"JLD", :TestLoadSave) add_loader(format"GZIP", :TestLoadSave) @@ -285,12 +288,12 @@ load(f::File{format"AmbigExt2"}) = open(f) do io read(stream(io), String) end -save(f::File{format"AmbigExt1"}, testdata) = open(f, "w") do io +fileio_save(f::File{format"AmbigExt1"}, testdata) = open(f, "w") do io s = stream(io) print(s, "ambigext1") print(s, testdata) end -save(f::File{format"AmbigExt2"}, testdata) = open(f, "w") do io +fileio_save(f::File{format"AmbigExt2"}, testdata) = open(f, "w") do io s = stream(io) print(s, "ambigext2") print(s, testdata)