mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
all: change optional to result of io (#16075)
This commit is contained in:
@@ -41,39 +41,39 @@ fn testsuite_end() {
|
||||
}
|
||||
|
||||
fn test_szip_create_temp_files() {
|
||||
os.mkdir(test_path)?
|
||||
os.mkdir(test_path2)?
|
||||
os.write_file(fpath1, 'file one')?
|
||||
os.write_file(fpath2, 'file two')?
|
||||
os.write_file(fpath3, 'file three')?
|
||||
os.mkdir(test_path)!
|
||||
os.mkdir(test_path2)!
|
||||
os.write_file(fpath1, 'file one')!
|
||||
os.write_file(fpath2, 'file two')!
|
||||
os.write_file(fpath3, 'file three')!
|
||||
assert os.exists(fpath1)
|
||||
assert os.exists(fpath2)
|
||||
assert os.exists(fpath3)
|
||||
}
|
||||
|
||||
fn test_zipping_files() {
|
||||
mut files := (os.ls(test_path)?).map(os.join_path(test_path, it))
|
||||
files << (os.ls(test_path2)?).map(os.join_path(test_path2, it))
|
||||
szip.zip_files(files, test_out_zip)?
|
||||
mut files := (os.ls(test_path)!).map(os.join_path(test_path, it))
|
||||
files << (os.ls(test_path2)!).map(os.join_path(test_path2, it))
|
||||
szip.zip_files(files, test_out_zip)!
|
||||
assert os.exists(test_out_zip)
|
||||
os.rm(fpath1)?
|
||||
os.rm(fpath2)?
|
||||
os.rm(fpath3)?
|
||||
os.rm(fpath1)!
|
||||
os.rm(fpath2)!
|
||||
os.rm(fpath3)!
|
||||
}
|
||||
|
||||
fn test_extract_zipped_files() {
|
||||
szip.extract_zip_to_dir(test_out_zip, test_path)?
|
||||
szip.extract_zip_to_dir(test_out_zip, test_path2)?
|
||||
szip.extract_zip_to_dir(test_out_zip, test_path)!
|
||||
szip.extract_zip_to_dir(test_out_zip, test_path2)!
|
||||
assert os.exists(fpath1)
|
||||
assert os.exists(fpath2)
|
||||
assert os.exists(fpath3)
|
||||
assert (os.read_file(fpath1)?) == 'file one'
|
||||
assert (os.read_file(fpath2)?) == 'file two'
|
||||
assert (os.read_file(fpath3)?) == 'file three'
|
||||
assert (os.read_file(fpath1)!) == 'file one'
|
||||
assert (os.read_file(fpath2)!) == 'file two'
|
||||
assert (os.read_file(fpath3)!) == 'file three'
|
||||
cleanup()
|
||||
}
|
||||
|
||||
fn test_reading_zipping_files() ? {
|
||||
fn test_reading_zipping_files() {
|
||||
n_files := 2
|
||||
mut file_name_list := []string{}
|
||||
for i in 0 .. n_files {
|
||||
@@ -81,21 +81,21 @@ fn test_reading_zipping_files() ? {
|
||||
}
|
||||
|
||||
cleanup()
|
||||
os.mkdir(test_path)?
|
||||
os.mkdir(test_path2)?
|
||||
os.write_file(fpath3, 'file three')?
|
||||
os.mkdir(test_path)!
|
||||
os.mkdir(test_path2)!
|
||||
os.write_file(fpath3, 'file three')!
|
||||
for c, f_name in file_name_list {
|
||||
tmp_path := os.join_path(test_path, f_name)
|
||||
os.write_file(tmp_path, 'file ${c:02}')?
|
||||
os.write_file(tmp_path, 'file ${c:02}')!
|
||||
assert os.exists(tmp_path)
|
||||
}
|
||||
files := (os.ls(test_path)?).map(os.join_path(test_path, it))
|
||||
files := (os.ls(test_path)!).map(os.join_path(test_path, it))
|
||||
|
||||
szip.zip_files(files, test_out_zip)?
|
||||
szip.zip_files(files, test_out_zip)!
|
||||
assert os.exists(test_out_zip)
|
||||
|
||||
mut zp := szip.open(test_out_zip, szip.CompressionLevel.no_compression, szip.OpenMode.read_only)?
|
||||
n_entries := zp.total()?
|
||||
mut zp := szip.open(test_out_zip, szip.CompressionLevel.no_compression, szip.OpenMode.read_only)!
|
||||
n_entries := zp.total()!
|
||||
assert n_entries == n_files
|
||||
|
||||
unsafe {
|
||||
@@ -104,11 +104,11 @@ fn test_reading_zipping_files() ? {
|
||||
buf := malloc(data_len * 2)
|
||||
|
||||
for _ in 0 .. n_files {
|
||||
zp.open_entry_by_index(0)?
|
||||
zp.open_entry_by_index(0)!
|
||||
name := zp.name()
|
||||
assert name in file_name_list
|
||||
|
||||
zp.read_entry_buf(buf, buf_size)?
|
||||
zp.read_entry_buf(buf, buf_size)!
|
||||
buf[data_len] = 0
|
||||
tmp_str := tos(buf, data_len)
|
||||
|
||||
@@ -125,50 +125,50 @@ fn test_reading_zipping_files() ? {
|
||||
|
||||
fn test_zip_folder() {
|
||||
cleanup()
|
||||
os.mkdir_all(test_path3_1)?
|
||||
os.mkdir_all(test_path3_2)?
|
||||
os.mkdir_all(test_path3_3)?
|
||||
os.mkdir_all(test_path3_4)?
|
||||
os.write_file(fpath4, '4')?
|
||||
os.write_file(fpath5, '5')?
|
||||
os.write_file(fpath6, '6')?
|
||||
os.mkdir_all(test_path3_1)!
|
||||
os.mkdir_all(test_path3_2)!
|
||||
os.mkdir_all(test_path3_3)!
|
||||
os.mkdir_all(test_path3_4)!
|
||||
os.write_file(fpath4, '4')!
|
||||
os.write_file(fpath5, '5')!
|
||||
os.write_file(fpath6, '6')!
|
||||
|
||||
szip.zip_folder(test_path3, test_dir_zip)?
|
||||
szip.zip_folder(test_path3, test_dir_zip)!
|
||||
assert os.exists(test_dir_zip)
|
||||
|
||||
os.rmdir_all(test_path3)?
|
||||
os.mkdir_all(test_path3)?
|
||||
szip.extract_zip_to_dir(test_dir_zip, test_path3)?
|
||||
os.rmdir_all(test_path3)!
|
||||
os.mkdir_all(test_path3)!
|
||||
szip.extract_zip_to_dir(test_dir_zip, test_path3)!
|
||||
assert os.exists(test_path3_1)
|
||||
assert os.exists(test_path3_2)
|
||||
assert os.exists(test_path3_3) // This is the empty dir
|
||||
assert os.exists(test_path3_4)
|
||||
assert (os.read_file(fpath4)?) == '4'
|
||||
assert (os.read_file(fpath5)?) == '5'
|
||||
assert (os.read_file(fpath6)?) == '6'
|
||||
assert (os.read_file(fpath4)!) == '4'
|
||||
assert (os.read_file(fpath5)!) == '5'
|
||||
assert (os.read_file(fpath6)!) == '6'
|
||||
}
|
||||
|
||||
fn test_zip_folder_omit_empty_directories() {
|
||||
cleanup()
|
||||
os.mkdir_all(test_path3_1)?
|
||||
os.mkdir_all(test_path3_2)?
|
||||
os.mkdir_all(test_path3_3)?
|
||||
os.mkdir_all(test_path3_4)?
|
||||
os.write_file(fpath4, '4')?
|
||||
os.write_file(fpath5, '5')?
|
||||
os.write_file(fpath6, '6')?
|
||||
os.mkdir_all(test_path3_1)!
|
||||
os.mkdir_all(test_path3_2)!
|
||||
os.mkdir_all(test_path3_3)!
|
||||
os.mkdir_all(test_path3_4)!
|
||||
os.write_file(fpath4, '4')!
|
||||
os.write_file(fpath5, '5')!
|
||||
os.write_file(fpath6, '6')!
|
||||
|
||||
szip.zip_folder(test_path3, test_dir_zip, omit_empty_folders: true)?
|
||||
szip.zip_folder(test_path3, test_dir_zip, omit_empty_folders: true)!
|
||||
assert os.exists(test_dir_zip)
|
||||
|
||||
os.rmdir_all(test_path3)?
|
||||
os.mkdir_all(test_path3)?
|
||||
szip.extract_zip_to_dir(test_dir_zip, test_path3)?
|
||||
os.rmdir_all(test_path3)!
|
||||
os.mkdir_all(test_path3)!
|
||||
szip.extract_zip_to_dir(test_dir_zip, test_path3)!
|
||||
assert os.exists(test_path3_1)
|
||||
assert os.exists(test_path3_2)
|
||||
assert !os.exists(test_path3_3) // This is the empty dir, should be omitted with `omit_empty_folders`
|
||||
assert os.exists(test_path3_4)
|
||||
assert (os.read_file(fpath4)?) == '4'
|
||||
assert (os.read_file(fpath5)?) == '5'
|
||||
assert (os.read_file(fpath6)?) == '6'
|
||||
assert (os.read_file(fpath4)!) == '4'
|
||||
assert (os.read_file(fpath5)!) == '5'
|
||||
assert (os.read_file(fpath6)!) == '6'
|
||||
}
|
||||
|
Reference in New Issue
Block a user