From 972de637060160dd70e487dae6095e1a2803f4e5 Mon Sep 17 00:00:00 2001 From: Turiiya <34311583+ttytm@users.noreply.github.com> Date: Sat, 7 Oct 2023 13:29:30 +0200 Subject: [PATCH] update structure --- cmd/tools/vcreate/{ => tests}/new_no_arg.expect | 0 cmd/tools/vcreate/vcreate_test.v | 8 +++++--- 2 files changed, 5 insertions(+), 3 deletions(-) rename cmd/tools/vcreate/{ => tests}/new_no_arg.expect (100%) diff --git a/cmd/tools/vcreate/new_no_arg.expect b/cmd/tools/vcreate/tests/new_no_arg.expect similarity index 100% rename from cmd/tools/vcreate/new_no_arg.expect rename to cmd/tools/vcreate/tests/new_no_arg.expect diff --git a/cmd/tools/vcreate/vcreate_test.v b/cmd/tools/vcreate/vcreate_test.v index 67902c81c4ffdb..4fb39073a66e48 100644 --- a/cmd/tools/vcreate/vcreate_test.v +++ b/cmd/tools/vcreate/vcreate_test.v @@ -145,12 +145,15 @@ fn test_input() { eprintln('Input test for windows are not yet implemented.') return } - expect_path := os.join_path(@VMODROOT, 'cmd', 'tools', 'vcreate') + expect_tests_path := os.join_path(@VMODROOT, 'cmd', 'tools', 'vcreate', 'tests') + + // The expect script will create a new project in the temporary `test_path` directory. project_name := 'my_project' - new_no_arg := os.execute(os.join_path(expect_path, 'new_no_arg.expect ${@VMODROOT} ${project_name}')) + new_no_arg := os.execute('${os.join_path(expect_tests_path, 'new_no_arg.expect')} ${@VMODROOT} ${project_name}') if new_no_arg.exit_code != 0 { assert false, new_no_arg.output } + // Assert mod data set in `new_no_arg.expect`. mod := vmod.decode(os.read_file(os.join_path(test_path, project_name, 'v.mod')) or { assert false, 'Failed reading v.mod of ${project_name}' return @@ -158,7 +161,6 @@ fn test_input() { assert false, err.str() return } - // Assert module data set in ./new_no_arg.expect assert mod.name == 'my_project' assert mod.description == 'My awesome V project.' assert mod.version == '0.1.0'