Changeset 209f4c for tests/GuiChecks/Filling/FillVolume

Timestamp:

Jul 20, 2018, 5:37:39 AM (7 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1

Children:

425516

Parents:

9ac3d3

git-author:

Frederik Heber <frederik.heber@…> (07/20/18 05:35:06)

git-committer:

Frederik Heber <frederik.heber@…> (07/20/18 05:37:39)

Message:

TESTS: Fixed FillSurface and FillVolumne, recreated GuiChecks.

• createGuiChecks.sh cannot decipher when AT_CHECK is on single line or when result code is not connected to last line but on new line. Hence, we had to fold some lines FillSurface and FillVolume back.

Location:

tests/GuiChecks/Filling/FillVolume

Files:

• testsuite-fill-volume-cube.at (modified) (1 diff)
• testsuite-fill-volume-cylinder.at (modified) (3 diffs)
• testsuite-fill-volume-everywhere.at (modified) (1 diff)
• testsuite-fill-volume-nowhere.at (modified) (1 diff)
• testsuite-fill-volume-sphere.at (modified) (1 diff)

tests/GuiChecks/Filling/FillVolume/testsuite-fill-volume-cube.at

@@ -25 +25 @@
 file=water_cube.xyz
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
-AT_CHECK([
-        ../../molecuilder               -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cube"                     --shape-type cube                       --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cube"           --fill-volume                   --count 12], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --dry-run           -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cube"                     --shape-type cube                       --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cube"           --fill-volume                   --count 12 --no-dry-run --store-session session-fill-volume-cube.py --session-type python], 0, [stdout], [stderr])
+AT_CHECK([grep -v "Command.*DryRun" session-fill-volume-cube.py >session-fill-volume-cube_new.py], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilderguitest session-fill-volume-cube_new.py], 0, [stdout], [stderr])
 #AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
 

tests/GuiChecks/Filling/FillVolume/testsuite-fill-volume-cylinder.at

@@ -23 +23 @@
 file=water_cylinder.xyz
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
-AT_CHECK([
-        ../../molecuilder               -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cylinder"                         --shape-type cylinder                   --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cylinder"               --fill-volume                   --count 12], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --dry-run           -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cylinder"                         --shape-type cylinder                   --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cylinder"               --fill-volume                   --count 12 --no-dry-run --store-session session-fill-volume-cylinder.py --session-type python], 0, [stdout], [stderr])
+AT_CHECK([grep -v "Command.*DryRun" session-fill-volume-cylinder.py >session-fill-volume-cylinder_new.py], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilderguitest session-fill-volume-cylinder_new.py], 0, [stdout], [stderr])
 AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
 
@@ -35 +36 @@
 file=water_cylinder.xyz
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
-AT_CHECK([
-        ../../molecuilder               -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cylinder"                         --shape-type cylinder                   --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cylinder"               --fill-volume                   --count 12              --undo], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --dry-run           -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cylinder"                         --shape-type cylinder                   --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cylinder"               --fill-volume                   --count 12              --undo --no-dry-run --store-session session-fill-volume-cylinder.py --session-type python], 0, [stdout], [stderr])
+AT_CHECK([grep -v "Command.*DryRun" session-fill-volume-cylinder.py >session-fill-volume-cylinder_new.py], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilderguitest session-fill-volume-cylinder_new.py], 0, [stdout], [stderr])
 AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/water_undo.xyz], 0, [ignore], [ignore])
 
@@ -47 +49 @@
 file=water_cylinder.xyz
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
-AT_CHECK([
-        ../../molecuilder               -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cylinder"                         --shape-type cylinder                   --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cylinder"               --fill-volume                   --count 12              --undo          --redo], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --dry-run           -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "cylinder"                         --shape-type cylinder                   --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "cylinder"               --fill-volume                   --count 12              --undo          --redo --no-dry-run --store-session session-fill-volume-cylinder.py --session-type python], 0, [stdout], [stderr])
+AT_CHECK([grep -v "Command.*DryRun" session-fill-volume-cylinder.py >session-fill-volume-cylinder_new.py], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilderguitest session-fill-volume-cylinder_new.py], 0, [stdout], [stderr])
 AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
 

tests/GuiChecks/Filling/FillVolume/testsuite-fill-volume-everywhere.at

@@ -24 +24 @@
 file=water_nowhere.xyz
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
-AT_CHECK([
-        ../../molecuilder               -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "everywhere"                       --shape-type everywhere                         --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "everywhere"             --fill-volume                   --count 12], 5, [stdout], [stderr])
+AT_CHECK([../../molecuilder --dry-run           -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "everywhere"                       --shape-type everywhere                         --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "everywhere"             --fill-volume                   --count 12 --no-dry-run --store-session session-fill-volume-everywhere.py --session-type python], 0, [stdout], [stderr])
+AT_CHECK([grep -v "Command.*DryRun" session-fill-volume-everywhere.py >session-fill-volume-everywhere_new.py], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilderguitest session-fill-volume-everywhere_new.py], 5, [stdout], [stderr])
 #AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
 

tests/GuiChecks/Filling/FillVolume/testsuite-fill-volume-nowhere.at

@@ -24 +24 @@
 file=water_nowhere.xyz
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
-AT_CHECK([
-        ../../molecuilder               -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "nowhere"                  --shape-type nowhere                    --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "nowhere"                --fill-volume                   --count 12], 5, [stdout], [stderr])
+AT_CHECK([../../molecuilder --dry-run           -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "nowhere"                  --shape-type nowhere                    --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "nowhere"                --fill-volume                   --count 12 --no-dry-run --store-session session-fill-volume-nowhere.py --session-type python], 0, [stdout], [stderr])
+AT_CHECK([grep -v "Command.*DryRun" session-fill-volume-nowhere.py >session-fill-volume-nowhere_new.py], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilderguitest session-fill-volume-nowhere_new.py], 5, [stdout], [stderr])
 #AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])
 

tests/GuiChecks/Filling/FillVolume/testsuite-fill-volume-sphere.at

@@ -25 +25 @@
 file=water_sphere.xyz
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/regression/Filling/FillVolume/pre/water.xyz water.xyz], 0)
-AT_CHECK([
-        ../../molecuilder               -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "sphere"                   --shape-type sphere                     --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "sphere"                 --fill-volume                   --count 12], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --dry-run           -i $file                -o xyz          -l water.xyz            --select-all-molecules          --create-shape                  --shape-name "sphere"                   --shape-type sphere                     --translation 5,5,5                     --stretch 3,3,3                 --select-shape-by-name "sphere"                 --fill-volume                   --count 12 --no-dry-run --store-session session-fill-volume-sphere.py --session-type python], 0, [stdout], [stderr])
+AT_CHECK([grep -v "Command.*DryRun" session-fill-volume-sphere.py >session-fill-volume-sphere_new.py], 0, [ignore], [ignore])
+AT_CHECK([../../molecuilderguitest session-fill-volume-sphere_new.py], 0, [stdout], [stderr])
 #AT_CHECK([diff -I '.*reated by molecuilder.*' $file ${abs_top_srcdir}/tests/regression/Filling/FillVolume/post/$file], 0, [ignore], [ignore])