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.

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

Issue 179 2/button hold should generate seperate command #204

Open
wants to merge 62 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
19d9917
broken:wip
SunnyBerlin Mar 22, 2023
ac63052
wip
SunnyBerlin Mar 25, 2023
7a72db4
some log replaying fix
SunnyBerlin Mar 26, 2023
00ab295
wip: fix point select move
SunnyBerlin Mar 26, 2023
8213019
wip: testing in ci
SunnyBerlin Mar 26, 2023
abd73ed
wip: fix codestyle
SunnyBerlin Mar 26, 2023
b18711a
wip: revert duplicate click logging for test
SunnyBerlin Mar 26, 2023
9ee4e62
wip: fixing tests
SunnyBerlin Mar 26, 2023
8f11a2f
wip: tryign fix first test
SunnyBerlin Mar 26, 2023
8aa325e
test fixed: interactive_nice_copy_move
SunnyBerlin Mar 26, 2023
8c385d7
fix test: interactive_complicated_copymove
SunnyBerlin Mar 26, 2023
74c5dbb
wip: fix cursor click rendering
SunnyBerlin Mar 26, 2023
1c0c6a9
wip: logging replying fix
SunnyBerlin Mar 26, 2023
c9a5fc9
wip: fix selection by region and polygon commands issues detected bby…
SunnyBerlin Mar 26, 2023
38d1d34
revert polygon fix for solving in another issue
SunnyBerlin Mar 26, 2023
56389f7
(#184): Add ability to run tests in seperate virtual screens
SunnyBerlin Mar 29, 2023
0de8c4f
(#184): Add ability to run tests in seperate virtual screens
SunnyBerlin Mar 29, 2023
838bb0a
Add video files to expected directory
SunnyBerlin Mar 29, 2023
fecd410
(#183): Accomodate running tests with ability to record and store vid…
SunnyBerlin Mar 29, 2023
0cbe1ca
wip: video files copy
SunnyBerlin Mar 30, 2023
c92b40d
start record mp4 instead, removed mov files and reduce log speed
SunnyBerlin Mar 31, 2023
f3fa279
add golden mp4 videos
SunnyBerlin Mar 31, 2023
7aaf85c
merge from dev
SunnyBerlin Mar 31, 2023
9325406
Update runRegTests.sh
SunnyBerlin Apr 1, 2023
1ed61f3
Update log_reader.cpp
SunnyBerlin Apr 1, 2023
88dde43
Merge branch 'dev' into issue-183/accomodate_video_recording_on_test_…
SunnyBerlin Apr 1, 2023
98bdd74
Update log_reader.cpp
SunnyBerlin Apr 1, 2023
f2aadba
Update test_runner.sh
SunnyBerlin Apr 1, 2023
33977a7
Update config.yml
SunnyBerlin Apr 1, 2023
32866e8
Update config.yml
SunnyBerlin Apr 9, 2023
85746b6
Update config.yml
SunnyBerlin Apr 9, 2023
acc1b59
Update config.yml
SunnyBerlin Apr 9, 2023
ff20236
Update config.yml
SunnyBerlin Apr 9, 2023
9de07b7
Update config.yml
SunnyBerlin Apr 9, 2023
7f6e52f
Update runRegTests.sh
SunnyBerlin Apr 9, 2023
3594f4a
Update config.yml
SunnyBerlin Apr 10, 2023
38151f9
Merge branch 'dev' into issue-183/accomodate_video_recording_on_test_…
SunnyBerlin Apr 10, 2023
eb05a5e
fixed issue with closing ffmpeg
SunnyBerlin Apr 11, 2023
0e08de2
merge dev
SunnyBerlin Apr 11, 2023
0722548
Merge branch 'issue-183/accomodate_video_recording_on_test_runs' into…
SunnyBerlin Apr 11, 2023
3273521
add new debug helper script that allow to run test on different versions
SunnyBerlin Apr 11, 2023
f6a933f
adjusted test runner
SunnyBerlin Apr 11, 2023
baa94c0
improved helper script
SunnyBerlin Apr 11, 2023
71bfce5
improved helper script
SunnyBerlin Apr 11, 2023
234e0a2
improved helper script
SunnyBerlin Apr 11, 2023
7ccaeea
improved helper script
SunnyBerlin Apr 11, 2023
89dbbdb
wip
SunnyBerlin Apr 11, 2023
9a05a1a
wip: tests fix
SunnyBerlin Apr 22, 2023
cd38eb7
-1 fixed test
SunnyBerlin Apr 23, 2023
40dd72f
-1 test
SunnyBerlin Apr 23, 2023
26c4867
Merge branch 'dev' into issue-179-1/button_hold_should_generate_seper…
SunnyBerlin Apr 23, 2023
6263943
add temporary file to delete later
SunnyBerlin Apr 23, 2023
d46100b
delete swp file
SunnyBerlin Apr 23, 2023
a3a670e
fix test runner
SunnyBerlin Apr 23, 2023
9cd59f9
additional for usability
SunnyBerlin Apr 23, 2023
8770904
midway of wip
SunnyBerlin Apr 30, 2023
35d28dd
fix move origin during point-click move
SunnyBerlin Apr 30, 2023
70baf94
regolden failed tests after move fix
SunnyBerlin Apr 30, 2023
56c81ac
Merge branch 'fix_move_origin' into issue-179-2/button_hold_should_ge…
SunnyBerlin Apr 30, 2023
0a97c34
adjusted rendering bindings
SunnyBerlin May 4, 2023
8e7ce41
merged from dev
SunnyBerlin May 12, 2023
732785d
Merge branch 'dev' into issue-179-2/button_hold_should_generate_seper…
SunnyBerlin May 13, 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
51 changes: 51 additions & 0 deletions sqa/bin/helpMeDebug.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#!/bin/sh

set -e
#golden_branch_str="$1"
golden_branch="dev"
debug_branch_str="$1"
debug_branch="$2"
testname_str="$3"
testname="$4"
need_rebuild_str="$5"
need_rebuild="$6"

export PAINTER_QA_XVFB=1
echo
echo "------------------------------------------------"

echo "Building and running on >$golden_branch<"
#if [ "$need_rebuild" != "" ]; then
#git checkout $golden_branch
#cmake .
#make -j8
#cp bin/linux/painter bin/linux/painter.golden
cp bin/linux/painter.golden bin/linux/painter
#fi
cd $testname
export PAINTER_EXE_NAME="painter"
export PAINTER_TEST_OUT_DIRNAME="output"
./run.sh
cd -
rm bin/linux/painter
#exit 0

echo "---------------------------------------------"
echo

echo "Building and running on >$debug_branch<"
if [ "$need_rebuild" != "" ]; then
#echo ""
git checkout $debug_branch
cmake .
make -j8
cp bin/linux/painter bin/linux/painter.tmp
fi
export PAINTER_EXE_NAME="painter.tmp"
export PAINTER_TEST_OUT_DIRNAME="output_debug"
cd $testname
./run.sh
cd -



15 changes: 14 additions & 1 deletion sqa/bin/runRegTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"

cdir=$PWD
failed_test_list_file=$PWD/.failed_tsts
rm $failed_test_list_file -f
#exit 0

options="$@"
BEG=$1
END=$2
Expand Down Expand Up @@ -67,6 +72,7 @@ for i in $TESTLST; do
res=1
crashed=`expr $crashed + 1`
cp output $ARTIFACTS_DIR/$testname -rf
echo "$i" >> $failed_test_list_file
else
echo -e "\e[31mError (code:$r) \e[0m"
echo "************"
Expand All @@ -75,6 +81,7 @@ for i in $TESTLST; do
failed=`expr $failed + 1`
res=1
cp output $ARTIFACTS_DIR/$testname -rf
echo "$i" >> $failed_test_list_file
fi
echo "------------------------------------------------------------------------------------"
cd - &> /dev/null
Expand All @@ -98,7 +105,13 @@ if [ "$PAINTER_QA_TEST_RUN_PARALLEL" == "" ]; then
echo " Failed: $failed"
echo " Passed: $passed"
echo " Crashd: $crashed"
exit 1
echo
echo "*****************************************"
echo
cat $failed_test_list_file
echo
echo "*****************************************"
exit 1
fi
else
if [ "$res" == 0 ]; then
Expand Down
4 changes: 2 additions & 2 deletions sqa/bin/runTestsParallel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ declare -A PIDS

function runAll
{
threads_num=8
threads_num=32
testnum_in_chunk=`expr $file_len / $threads_num`
e=`expr $b + $testnum_in_chunk`
echo "Running tests in parralel"
echo "Threads: $threads_num ( tests running in 1 thread: $testnum_in_chunk )"
echo "Threads: $threads_num ( tests running in each thread: $testnum_in_chunk )"
echo
#echo "file_len: $file_len"
while [[ "$e" -le "$file_len" ]]; do
Expand Down
20 changes: 15 additions & 5 deletions sqa/scripts/test_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@
exit_code=""
need_dbg=""
succ=4
GDIRNAME=expected
GDIRNAME="expected"
ODIRNAME="output"

if [ -z "$PAINTER_EXE_NAME" ]; then
PAINTER_EXE_NAME="painter"
fi

if [ ! -z "$PAINTER_TEST_OUT_DIRNAME" ]; then
ODIRNAME=$PAINTER_TEST_OUT_DIRNAME
fi

testname=`basename $PWD`

export PAINTER_LOGFILE_PREFIX="painter"
Expand Down Expand Up @@ -45,10 +55,10 @@ function prepocess
fi

verbose "prepocess..."
rm -rf output
rm -rf $ODIRNAME
mkdir -p $GDIRNAME
mkdir output
cd output
mkdir $ODIRNAME
cd $ODIRNAME

cp $PAINTER_QA_DIR/etc/webrelated/* . -r

Expand Down Expand Up @@ -231,7 +241,7 @@ function run
local options="$1"
verbose "running..."
platform=linux
toolexe=painter
toolexe=$PAINTER_EXE_NAME
toolpath=$PAINTER_QA_DIR/../bin/$platform
tool=$toolpath/$toolexe
verbose "invocation: $tool "$options" &> painter.out "
Expand Down
8 changes: 8 additions & 0 deletions sqa/tests/broken_copymove/expected/painter.log.golden
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dicmdCanvasMouseClick -point (131,101)
dicmdCanvasMouseClick -point (131,101)
dicmdCanvasMouseClick -point (131,101)
dicmdCanvasMouseRelease -point (131,101)
dicmdCanvasMouseClick -point (131,101)
dicmdCanvasViewportZoomOut -point (131,101)
dicmdCanvasViewportZoomOut -point (131,101)
dicmdCanvasViewportZoomOut -point (131,101)
Expand All @@ -46,9 +47,11 @@ dicmdCanvasViewportZoomOut -point (131,101)
dicmdCanvasViewportZoomOut -point (131,101)
dicmdCanvasViewportZoomOut -point (131,101)
dicmdCanvasMouseRelease -point (131,101)
dicmdCanvasMouseClick -point (131,101)
dicmdCanvasMouseClick -point (122,104)
dicmdCanvasMouseClick -point (122,104)
dicmdCanvasMouseRelease -point (122,104)
dicmdCanvasMouseClick -point (122,104)
dicmdCanvasMouseClick -point (210,116)
dicmdCanvasMouseClick -point (210,116)
dicmdCanvasMouseRelease -point (158,92)
Expand All @@ -58,6 +61,7 @@ dicmdCanvasMouseRelease -point (182,130)
dicmdCanvasMouseClick -point (96,82)
dicmdCanvasMouseClick -point (96,82)
dicmdCanvasMouseRelease -point (96,82)
dicmdCanvasMouseClick -point (96,82)
incmdSelectShapesByRegion
dicmdCanvasMouseClick -point (96,82)
dicmdCanvasMouseClick -point (96,82)
Expand All @@ -71,15 +75,18 @@ dicmdCanvasMouseRelease -point (584,144)
dicmdCanvasMouseClick -point (294,159)
dicmdCanvasMouseClick -point (294,159)
dicmdCanvasMouseRelease -point (294,159)
dicmdCanvasMouseClick -point (294,159)
dicmdCanvasMouseClick -point (178,135)
dicmdCanvasMouseClick -point (178,135)
dicmdCanvasMouseRelease -point (177,134)
dicmdCanvasMouseClick -point (140,123)
dicmdCanvasMouseClick -point (140,123)
dicmdCanvasMouseRelease -point (140,123)
dicmdCanvasMouseClick -point (140,123)
dicmdCanvasMouseClick -point (160,140)
dicmdCanvasMouseClick -point (160,140)
dicmdCanvasMouseRelease -point (160,140)
dicmdCanvasMouseClick -point (160,140)
dicmdCanvasMouseClick -point (152,133)
dicmdCanvasMouseClick -point (152,133)
dicmdCanvasMouseRelease -point (156,140)
Expand All @@ -105,6 +112,7 @@ dicmdAbortActiveCommand
dicmdCanvasMouseClick -point (135,108)
dicmdCanvasMouseClick -point (135,108)
dicmdCanvasMouseRelease -point (135,108)
dicmdCanvasMouseClick -point (135,108)
dicmdQaCompareRuntime
#t --> Test: comparision->Runtime:PASS Runtime_Compare_0.txt Runtime_Compare_0.txt.golden
dicmdQaCompareRuntime
Expand Down
Loading