Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Smaller optimizations to test cases #195

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Smaller optimizations to test cases #195

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e5673d
make optimizations to test suite.
ReDTerraN Apr 28, 2023
c74c642
reduce amount of rm commands
ReDTerraN Apr 28, 2023
36b2409
fix indentation
ReDTerraN Apr 28, 2023
aadb8c8
Update test/cases_all.sh to suggested change
ReDTerraN May 7, 2023
21bc6dc
Update test/cases_all.sh to suggested change #2
ReDTerraN May 7, 2023
d27690d
Merge branch 'optimizecases' of github.com:ReDTerraN/tmux-xpanes into…
ReDTerraN May 7, 2023
503c35f
apply greymd's changes
ReDTerraN May 7, 2023
789e0c3
Last change
ReDTerraN May 7, 2023
c11d56a
remove unnecessary edit.
ReDTerraN May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 24 additions & 81 deletions test/cases_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ window_layout_dump() {
else
printf "%s\\n" "${WINDOW_LAYOUT_PAYLOAD}" \
| sed -r 's/([0-9]+) ([0-9]+)/| w:\1 h:\2/g' \
| sed 's/^/@/' \
| sed 's/$/@|/' \
| sed -e 's/^/@/' -e 's/$/@|/' \
| awk 'BEGIN {s="@|---@|"; print s} {print}' \
| column -t -s '@' \
| sed '/---/s/ /-/g' \
Expand Down Expand Up @@ -633,10 +632,7 @@ test_normalize_log_directory() {
assertEquals 1 "$(grep -ac 'GEGE_BBBB_' < "${_log_file}")"

close_tmux_session "${_socket_file}"
rm -f "${_tmpdir}"/logs/*
rmdir "${_tmpdir}"/logs
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
ReDTerraN marked this conversation as resolved.
Show resolved Hide resolved

: "In TMUX session" && {
printf "\\n%s\\n" "$ TMUX(${_cmd})"
Expand Down Expand Up @@ -665,11 +661,7 @@ test_normalize_log_directory() {
assertEquals 1 "$( grep -ac 'GEGE_BBBB_' < "${_log_file}" )"

close_tmux_session "${_socket_file}"

rm -f "${_tmpdir}"/logs/*
rmdir "${_tmpdir}"/logs
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/logs "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -822,10 +814,7 @@ test_log_and_empty_arg() {
assertEquals 1 "$( grep -ac 'GEGE_BB_' < "${_log_file}" )"

close_tmux_session "$_socket_file"
rm -f "${_tmpdir}"/logs/*
rmdir "${_tmpdir}"/logs
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin

: "In TMUX session" && {
printf "\\n%s\\n" "$ TMUX(${_cmd})"
Expand Down Expand Up @@ -861,10 +850,7 @@ test_log_and_empty_arg() {

close_tmux_session "$_socket_file"

rm -f "${_tmpdir}"/logs/*
rmdir "${_tmpdir}"/logs
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/logs "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -2262,10 +2248,7 @@ test_log_option() {
assertEquals 1 "$(grep -ac 'GEGE_BBBB_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_tmpdir}"/logs/*
rmdir "${_tmpdir}"/logs
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
ReDTerraN marked this conversation as resolved.
Show resolved Hide resolved

: "In TMUX session" && {
printf "\\nTMUX(%s)\\n" "${_cmd}"
Expand Down Expand Up @@ -2295,10 +2278,7 @@ test_log_option() {

close_tmux_session "$_socket_file"

rm -f "${_tmpdir}"/logs/*
rmdir "${_tmpdir}"/logs
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rm -rf "${_logdir}" "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/{fin,logs}

}
return 0
}
Expand Down Expand Up @@ -2359,10 +2339,7 @@ test_log_format_option() {
assertEquals 1 "$(grep -ac 'GEGE_CCCC_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin

: "In TMUX session" && {
echo $'\n'" $ TMUX($_cmd)"$'\n'
Expand Down Expand Up @@ -2396,10 +2373,7 @@ test_log_format_option() {
assertEquals 1 "$(grep -ac 'GEGE_CCCC_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -2505,10 +2479,7 @@ test_log_format_env_var() {
assertEquals 1 "$(grep -ac 'GEGE_CCCC_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -2607,10 +2578,7 @@ test_log_format_option2() {
assertEquals 1 "$(grep -ac 'GEGE_CCCC_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -2719,10 +2687,7 @@ test_log_format_and_desync_option() {
assertEquals 1 $?

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -2794,10 +2759,7 @@ test_log_format_and_desync_option_pipe() {
assertEquals 1 $?

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -2903,10 +2865,7 @@ test_x_option_with_log() {
assertEquals 1 "$(grep -ac 'GEGE_DDDD_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin

: "In TMUX session" && {
_cmd="TMUX_XPANES_LOG_DIRECTORY=\"${_logdir}\" ${EXEC} --log-format=\"[:ARG:]_%Y_[:ARG:]\" -I@ -dS $_socket_file -c \"echo HOGE_@_ | sed s/HOGE/GEGE/ && touch ${_tmpdir}/fin/@ && ${TMUX_EXEC} detach-client\" AAAA BBBB"
Expand Down Expand Up @@ -2949,10 +2908,7 @@ test_x_option_with_log() {
assertEquals 1 "$(grep -ac 'GEGE_DDDD_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -2989,8 +2945,7 @@ test_x_option_with_pipe() {
assertEquals "CCCC" "$(cat "${_tmpdir}/fin/CCCC")"

close_tmux_session "$_socket_file"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin

: "In TMUX session" && {
_cmd="echo AAAA | ${EXEC} -d -S $_socket_file -c \"echo {} > ${_tmpdir}/fin/{}\""
Expand All @@ -3016,8 +2971,7 @@ test_x_option_with_pipe() {
assertEquals "CCCC" "$(cat "${_tmpdir}/fin/CCCC")"

close_tmux_session "$_socket_file"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Set indentation

Suggested change
rm -rf "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin

}
return 0
}
Expand Down Expand Up @@ -3081,8 +3035,7 @@ test_x_option_with_cols_rows() {
assertEquals "CCCC" "$(cat "${_tmpdir}/fin/CCCC")"

close_tmux_session "$_socket_file"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Set indentation

Suggested change
rm -rf "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin

}
return 0
}
Expand Down Expand Up @@ -3149,8 +3102,7 @@ test_t_and_x_option() {
assertEquals "AAAA@BBBB@CCCC@DDDD@" "$(eval "${TMUX_EXEC} -S ${_socket_file} list-panes -F '#{pane_title}'" | tr '\n' '@')"

close_tmux_session "$_socket_file"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rm -rf "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin

}
return 0
}
Expand Down Expand Up @@ -3184,8 +3136,7 @@ test_t_option_pipe() {
assertEquals "AAAA@BBBB@" "$(eval "${TMUX_EXEC} -S ${_socket_file} list-panes -F '#{pane_title}'" | tr '\n' '@')"

close_tmux_session "$_socket_file"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rm -rf "${_tmpdir}"/fin
rm -rf "${_tmpdir}"/fin

}
return 0
}
Expand Down Expand Up @@ -3321,10 +3272,7 @@ test_s_and_x_and_log() {
assertEquals 1 "$(grep -ac 'GEGE_DDDD_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down Expand Up @@ -3427,10 +3375,8 @@ test_ss_and_x_and_log() {
assertEquals 1 "$(grep -ac 'GEGE_DDDD_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin

}
return 0
}
Expand Down Expand Up @@ -4613,10 +4559,7 @@ test_b_x_log_option () {
assertEquals 1 "$(grep -ac 'GEGE_DDDD_' < "${_log_file}")"

close_tmux_session "$_socket_file"
rm -f "${_logdir}"/*
rmdir "${_logdir}"
rm -f "${_tmpdir}"/fin/*
rmdir "${_tmpdir}"/fin
rm -rf "${_logdir}" "${_tmpdir}"/fin
}
return 0
}
Expand Down
3 changes: 1 addition & 2 deletions test/test_generator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ readonly THIS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-${(%):-%N}}")" && pwd)"
sed "/###:-:-:INSERT_TESTING:-:-:###/r cases.sh" template.sh | awk -v cases="$1" 'NR==2{print "#### THIS FILE IS AUTOMATICALLY GENERATED BY test_generator.sh ###";print "#### $ bash test_generator.sh "cases" > cases_smoke.sh"}{print}'

printf "\\033[32;1m \\n%s\\n%s\\n\\033[0m" "//////// FOLLOWING TEST CASES WILL BE EXECUTED ////////" "$(grep '@case:' -A2 cases.sh)" >&2
rm cases.sh
rm template.sh
rm cases.sh template.sh
)
Loading