revise test scripts, regenerate .ref files of expected test output

Author: jon-jacky

samples/PowerSwitch/fsmpy/PowerSwitchExclude.py

@@ -0,0 +1,2 @@
+msgsizesFSM.py is not included in the distribution because it is so large - 
+more than 11 MB.  You can easily regenerate it by running test_analyze_msgsize.

samples/Socket/fsmpy/msgsizesFSM.py

@@ -3,7 +3,7 @@ sleep(5,)
 sleep(10,)
   0. Success at step 3, no more actions enabled, reached accepting state
 Traceback (most recent call last):
-  File "/Users/jon/PyModel/pymodel/pmt.py", line 117, in RunTest
+  File "/Users/jon/PyModel/pymodel/pmt.py", line 124, in RunTest
     result = stepper.TestAction(aname, args, modelResult)
   File "/Users/jon/PyModel/samples/Timeout/Stepper.py", line 10, in TestAction
     time.sleep(seconds)

samples/Socket/fsmpy/msgsizesFSM.txt

@@ -1,14 +1,14 @@
 13 states, 11 transitions, 2 accepting states, 0 unsafe states
-pma.py --maxTransitions 100 TestIntTwoRuns
-pmg.py --transitionLabels action TestIntTwoRunsFSM
+pma --maxTransitions 100 TestIntTwoRuns
+pmg --transitionLabels action TestIntTwoRunsFSM
 dot -Tsvg -o TestIntTwoRunsFSM.svg TestIntTwoRunsFSM.dot
 9 states, 7 transitions, 2 accepting states, 0 unsafe states
-pma.py --exclude Logout --maxTransitions 100 --output TestIntTwoRuns_NoLogout TestIntTwoRuns
-pmg.py --transitionLabels action TestIntTwoRuns_NoLogout
+pma --exclude Logout --maxTransitions 100 --output TestIntTwoRuns_NoLogout TestIntTwoRuns
+pmg --transitionLabels action TestIntTwoRuns_NoLogout
 dot -Tsvg -o TestIntTwoRuns_NoLogout.svg TestIntTwoRuns_NoLogout.dot
 8 states, 6 transitions, 2 accepting states, 0 unsafe states
-pma.py --action Initialize --action Login --action UpdateInt --maxTransitions 100 --output TestIntTwoRuns_Add TestIntTwoRuns
-pmg.py --transitionLabels action TestIntTwoRuns_Add
+pma --action Initialize --action Login --action UpdateInt --maxTransitions 100 --output TestIntTwoRuns_Add TestIntTwoRuns
+pmg --transitionLabels action TestIntTwoRuns_Add
 dot -Tsvg -o TestIntTwoRuns_Add.svg TestIntTwoRuns_Add.dot
 Test suite with two runs:
 

samples/Timeout/test.ref

@@ -36,8 +36,64 @@ UpdateInt('VinniPuhh', 2)
 Logout('VinniPuhh',)
   2. Finished at step 11, reached accepting state
 Test finished, completed 3 runs
-sh: line 0: type: WebModelTest_n10_c3_s3_r3.py: not found
-Generate a test suite with three runs
+
+# pmt -n 10 -c 3 -s 3 -r 3 WebModel -o WebModelTest_n10_c3_s3_r3
+
+# actions here are just labels, but must be symbols with __name__ attribute
+
+def Initialize(): pass
+def ReadInt(): pass
+def Login(): pass
+def Logout(): pass
+def UpdateInt(): pass
+
+# action symbols
+actions = (Initialize, ReadInt, Login, Logout, UpdateInt)
+
+testSuite = [
+  [
+    (Initialize, ()),
+    (Login, ('OleBrumm', 'Correct'), 'Success'),
+    (Login, ('VinniPuhh', 'Incorrect'), 'Failure'),
+    (Logout, ('OleBrumm',)),
+    (Login, ('OleBrumm', 'Correct'), 'Success'),
+    (UpdateInt, ('OleBrumm', 1)),
+    (UpdateInt, ('OleBrumm', 1)),
+    (UpdateInt, ('OleBrumm', 2)),
+    (Login, ('VinniPuhh', 'Correct'), 'Success'),
+    (UpdateInt, ('OleBrumm', 1)),
+    (Logout, ('OleBrumm',)),
+    (Logout, ('VinniPuhh',)),
+  ],
+#
+  [
+    (Initialize, ()),
+    (Login, ('VinniPuhh', 'Incorrect'), 'Failure'),
+    (Login, ('OleBrumm', 'Correct'), 'Success'),
+    (UpdateInt, ('OleBrumm', 1)),
+    (ReadInt, ('OleBrumm',), 1),
+    (UpdateInt, ('OleBrumm', 2)),
+    (Login, ('VinniPuhh', 'Incorrect'), 'Failure'),
+    (Logout, ('OleBrumm',)),
+    (Login, ('OleBrumm', 'Correct'), 'Success'),
+    (UpdateInt, ('OleBrumm', 1)),
+    (Logout, ('OleBrumm',)),
+  ],
+#
+  [
+    (Initialize, ()),
+    (Login, ('VinniPuhh', 'Incorrect'), 'Failure'),
+    (Login, ('OleBrumm', 'Incorrect'), 'Failure'),
+    (Login, ('VinniPuhh', 'Correct'), 'Success'),
+    (ReadInt, ('VinniPuhh',), 0),
+    (Login, ('OleBrumm', 'Incorrect'), 'Failure'),
+    (UpdateInt, ('VinniPuhh', 1)),
+    (Login, ('OleBrumm', 'Incorrect'), 'Failure'),
+    (UpdateInt, ('VinniPuhh', 1)),
+    (UpdateInt, ('VinniPuhh', 2)),
+    (Logout, ('VinniPuhh',)),
+  ],
+]Generate a test suite with three runs
 
 Show the generated test suite