Changeset 0efd21 for tests

Timestamp:

Sep 30, 2016, 3:51:37 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Fix_ParseParticles_split_forward_backward_Actions

Parents:

4d1aef

git-author:

Frederik Heber <heber@…> (09/27/16 14:37:40)

git-committer:

Frederik Heber <heber@…> (09/30/16 15:51:37)

Message:

tempcommit: Rewrote step-world-time into two actions.

Location:

tests

Files:

• Python/AllActions/options.dat (modified) (1 diff)
• regression/Makefile.am (modified) (1 diff)
• regression/WorldTime/StepWorldTime/testsuite-worldtime-step-backward.at (moved) (moved from tests/regression/WorldTime/StepWorldTime/testsuite-worldtime-step-world-time.at ) (1 diff)
• regression/WorldTime/StepWorldTime/testsuite-worldtime-step-forward.at (added)
• regression/WorldTime/testsuite-worldtime.at (modified) (1 diff)

tests/Python/AllActions/options.dat

@@ -225 +225 @@
 skiplines       "2"
 start-step      "0"
-step-world-time "1"
+step-backward   "1"
+step-forward    "1"
 steps   "5"
 store-grids     "0"

tests/regression/Makefile.am

@@ -243 +243 @@
         $(srcdir)/WorldTime/testsuite-worldtime.at \
         $(srcdir)/WorldTime/SetWorldTime/testsuite-worldtime-set-world-time.at \
-        $(srcdir)/WorldTime/StepWorldTime/testsuite-worldtime-step-world-time.at
+        $(srcdir)/WorldTime/StepWorldTime/testsuite-worldtime-step-backward.at \
+        $(srcdir)/WorldTime/StepWorldTime/testsuite-worldtime-step-forward.at
 
 max_jobs = 4

tests/regression/WorldTime/StepWorldTime/testsuite-worldtime-step-backward.at

@@ -18 +18 @@
 ### step through world time
 
-AT_SETUP([Worldtime - stepping])
-AT_KEYWORDS([worldtime step-world-time set-world-time])
+AT_SETUP([Worldtime - stepping backward])
+AT_KEYWORDS([worldtime step-backward set-world-time])
 
-AT_CHECK([../../molecuilder --step-world-time 1], 0, [stdout], [stderr])
-AT_CHECK([fgrep "Current time step is now: 1" stdout], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder --set-world-time 4 --step-world-time -2], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --set-world-time 4 --step-backward 2], 0, [stdout], [stderr])
 AT_CHECK([fgrep "Current time step is now: 2" stdout], 0, [ignore], [ignore])
+# test default
+AT_CHECK([../../molecuilder --set-world-time 1 --step-backward], 0, [stdout], [stderr])
+AT_CHECK([fgrep "Current time step is now: 0" stdout], 0, [ignore], [ignore])
 # stepping back too far fails
-AT_CHECK([../../molecuilder --set-world-time 1 --step-world-time -2], 5, [stdout], [stderr])
+AT_CHECK([../../molecuilder --set-world-time 1 --step-backward 2], 5, [stdout], [stderr])
 
 AT_CLEANUP
 
 
-AT_SETUP([Worldtime - stepping with Undo])
-AT_KEYWORDS([worldtime step-world-time set-world-time undo])
+AT_SETUP([Worldtime - stepping backward with Undo])
+AT_KEYWORDS([worldtime step-backward set-world-time undo])
 
-AT_CHECK([../../molecuilder --set-world-time 2 --step-world-time -1 --undo], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --set-world-time 2 --step-backward 1 --undo], 0, [stdout], [stderr])
 AT_CHECK([fgrep "Current time step is now again: 2" stdout], 0, [ignore], [ignore])
 
 AT_CLEANUP
 
-AT_SETUP([Worldtime - stepping with Redo])
-AT_KEYWORDS([worldtime step-world-time set-world-time undo redo])
+AT_SETUP([Worldtime - stepping backward with Redo])
+AT_KEYWORDS([worldtime step-backward set-world-time undo redo])
 
-AT_CHECK([../../molecuilder --set-world-time 2 --step-world-time -1 --undo --redo], 0, [stdout], [stderr])
+AT_CHECK([../../molecuilder --set-world-time 2 --step-backward 1 --undo --redo], 0, [stdout], [stderr])
 AT_CHECK([fgrep "Current time step is now: 1" stdout], 0, [ignore], [ignore])
 

tests/regression/WorldTime/testsuite-worldtime.at

@@ -22 +22 @@
 
 # stepping
-m4_include([WorldTime/StepWorldTime/testsuite-worldtime-step-world-time.at])
+m4_include([WorldTime/StepWorldTime/testsuite-worldtime-step-forward.at])
+m4_include([WorldTime/StepWorldTime/testsuite-worldtime-step-backward.at])