add pma etc. in bin directory, run pma.py etc. in pymodel

revise test*.py in all samples to use pma etc. not pma.py etc.
remove bin/tpath and tpath.bat, now included in pymodel_paths

Author: jon-jacky

bin/pma

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is pma command in bin directory, runs pma.py module in pymodel directory
+"""
+
+import pma  # find pma.py anywhere on Python path
+
+pma.main()

bin/pmg

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is pmg command in bin directory, runs pmg.py module in pymodel directory
+"""
+
+import pmg  # find pmg.py anywhere on Python path
+
+pmg.main()

bin/pmv

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is pmv command in bin directory, runs pmv.py module in pymodel directory
+"""
+
+import pmv  # find pmv.py anywhere on Python path
+
+pmv.main()

bin/tpath

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+import sys
+import os
+
+# argv[1] is name of module containing test cases
+# dir containing this module must be on PYTHONPATH
+
+test = __import__(sys.argv[1])
+
+# Test cases are in 'cases', a list of pairs of strings, descrip. and commmand:
+# cases = [
+#  ('Test PowerOn, PowerOff alternate due to enabling conditions',
+#   'pct.py -n 10 PowerSwitch'),
+#  ... ]
+
+for (description, cmd) in test.cases: 
+  print description
+  os.system(cmd)
+  print

bin/tpath.bat

@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+"""
+This is wsgirunner command in bin directory, runs wsgirunner.py module in pymodel directory
+"""
+
+import wsgirunner  # find wsgirunner.py anywhere on Python path
+
+wsgirunner.main()

bin/trun

@@ -32,12 +32,16 @@ def command(cmd):
     if status:
         print 'Failed: %s' % cmd  # status 0 means success
 
-(options, args) = ViewerOptions.parse_args()
-basename = options.__dict__['output'] if options.__dict__['output'] else '%sFSM' % args[0]
-pma = 'pma.py ' + make_opts(pma_keys, options) + ' ' + ' '.join(args)
-command(pma)
-pmg = 'pmg.py ' + make_opts(pmg_keys, options) + ' %s' % basename
-command(pmg)
-dot = 'dot -T%(type)s -o %(name)s.%(type)s %(name)s.dot' % \
-    {'type': options.__dict__['fileType'], 'name': basename}
-command(dot)
+def main():
+    (options, args) = ViewerOptions.parse_args()
+    basename = options.__dict__['output'] if options.__dict__['output'] else '%sFSM' % args[0]
+    pma = 'pma ' + make_opts(pma_keys, options) + ' ' + ' '.join(args)
+    command(pma)
+    pmg = 'pmg ' + make_opts(pmg_keys, options) + ' %s' % basename
+    command(pmg)
+    dot = 'dot -T%(type)s -o %(name)s.%(type)s %(name)s.dot' % \
+        {'type': options.__dict__['fileType'], 'name': basename}
+    command(dot)
+
+if __name__ == ' __main__':
+    main()

bin/wsgirunner

@@ -1,14 +1,33 @@
-"""
-SpeedControl defined by FSM, no shared actions with PowerSwitch
-"""
+
+# pma --maxTransitions 100 --output SpeedControl SpeedControl
+# 3 states, 3 transitions, 1 accepting states, 0 unsafe states, 0 finished and 0 deadend states
+
+# actions here are just labels, but must be symbols with __name__ attribute
 
 def IncrementSpeed(): pass
 
-cleanup = (IncrementSpeed,)
+# states, key of each state here is its number in graph etc. below
+
+states = {
+  0 : {'SpeedControl': 0},
+  1 : {'SpeedControl': 1},
+  2 : {'SpeedControl': 2},
+}
+
+# initial state, accepting states, unsafe states, frontier states, deadend states
 
 initial = 0
-accepting = (0,)
+accepting = [0]
+unsafe = []
+frontier = []
+finished = []
+deadend = []
+runstarts = [0]
+
+# finite state machine, list of tuples: (current, (action, args, result), next)
 
-graph = ((0, (IncrementSpeed, (), None), 1),
-         (1, (IncrementSpeed, (), None), 2),
-         (2, (IncrementSpeed, (), None), 0))
+graph = (
+  (0, (IncrementSpeed, (), None), 1),
+  (1, (IncrementSpeed, (), None), 2),
+  (2, (IncrementSpeed, (), None), 0),
+)

pymodel/pmv.py

@@ -4,25 +4,25 @@
 
 cases = [
     ('Generate FSM from PowerSwitch model program',
-     'pma.py PowerSwitch'),
+     'pma PowerSwitch'),
 
     ('Generate dot graphics commands from generated PowerSwitchFSM',
-     'pmg.py PowerSwitchFSM'),
+     'pmg PowerSwitchFSM'),
 
     ('Generate SVG file from dot commands',
      'dotsvg PowerSwitchFSM'),
 
     ('Generate dot commands from SpeedControl FSM',
-     'pmg.py SpeedControl'),
+     'pmg SpeedControl'),
 
     ('Generate SVG file from dot commands',
      'dotsvg SpeedControl'),
 
     ('Generate FSM from composition of PowerSwitch and SpeedControl, show interleaving',
-     'pma.py SpeedControl PowerSwitch -o PowerSpeed'),
+     'pma SpeedControl PowerSwitch -o PowerSpeed'),
 
     ('Generate dot commands from composed FSM',
-     'pmg.py PowerSpeed'),
+     'pmg PowerSpeed'),
 
     ('Generate SVG from dot',
      'dotsvg PowerSpeed')

samples/PowerSwitch/SpeedControl.py

@@ -1,13 +1,13 @@
 cases = [
     ('Scenarios module with four runs, by itself',
-     'pmt.py Scenarios'),
+     'pmt Scenarios'),
 
     ('Scenarios module, compose with PowerSwitch model, last two runs not allowed',
-     'pmt.py Scenarios PowerSwitch'),
+     'pmt Scenarios PowerSwitch'),
 
     ('SpeedControl module, by itself',
-     'pmt.py -n 2 -c 3 SpeedControl'),
+     'pmt -n 2 -c 3 SpeedControl'),
 
     ('PowerSwitch module, compose with SpeedControl, no shared actions',
-     'pmt.py -s 3 -n 10  -c 3 SpeedControl PowerSwitch')
+     'pmt -s 3 -n 10  -c 3 SpeedControl PowerSwitch')
     ]

samples/PowerSwitch/test_graphics.py

@@ -4,25 +4,25 @@
 
 cases = [
     ('Generate FSM with first 12 transitions',
-     'pma.py Stack -m 12'),
+     'pma Stack -m 12'),
 
     ('Generate dot commands',
-     'pmg.py StackFSM'),
+     'pmg StackFSM'),
 
     ('Generate SVG file',
      'dotsvg StackFSM'),
 
     ('Generate dot commands for scenario FSM',
-     'pmg.py StackOneScenario'),
+     'pmg StackOneScenario'),
 
     ('Generate SVG',
      'dotsvg StackOneScenario'),
 
     ('Explore composition of model with scenario machine, show synchronization',
-     'pma.py Stack StackOneScenario StackDepthThree -m 6 -o StackSynchronized'),
+     'pma Stack StackOneScenario StackDepthThree -m 6 -o StackSynchronized'),
 
     ('Generate dot',
-     'pmg.py StackSynchronized'),
+     'pmg StackSynchronized'),
 
     ('Generate SVG',
      'dotsvg StackSynchronized')

samples/PowerSwitch/test_scenarios.py

@@ -1,10 +1,10 @@
 cases = [
     ('Push is observable here so no actions are enabled in the initial state',
-     'pmt.py -n 10 -s 1 Stack Observables'),
+     'pmt -n 10 -s 1 Stack Observables'),
 
     ('Accepts Push(3) but not Pop(3) because here Push is observable, Pop controllable',
-     'pmt.py -n 10 -s 1 Stack Observables Scenarios'),
+     'pmt -n 10 -s 1 Stack Observables Scenarios'),
 
     ('Accepts both Push(3) and Pop(3) because here both are observable, still doesnt accept out-of-order Pop.',
-     'pmt.py -n 10 -s 1 Stack AllObservables Scenarios'),
+     'pmt -n 10 -s 1 Stack AllObservables Scenarios'),
     ]

samples/Stack/test_graphics.py

@@ -1,21 +1,21 @@
 cases = [
     ('Scenarios module with three runs, by itself',
-     'pma.py Scenarios'),
-    ('Generate Dot', 'pmg.py ScenariosFSM'),
+     'pma Scenarios'),
+    ('Generate Dot', 'pmg ScenariosFSM'),
     ('Generate SVG', 'dotsvg ScenariosFSM'),
 
     ('Scenarios module, compose with Stack model, last three runs not allowed',
-     'pma.py -o ValidateScenarios Scenarios Stack'),
-    ('Generate Dot', 'pmg.py ValidateScenarios'),
+     'pma -o ValidateScenarios Scenarios Stack'),
+    ('Generate Dot', 'pmg ValidateScenarios'),
     ('Generate SVG', 'dotsvg ValidateScenarios'),
 
     ('Scenarios, compose with Stack, Push is observable',
-     'pma.py -o ValidateObservables Scenarios Stack Observables'),
-    ('Generate Dot', 'pmg.py ValidateObservables'),
+     'pma -o ValidateObservables Scenarios Stack Observables'),
+    ('Generate Dot', 'pmg ValidateObservables'),
     ('Generate SVG', 'dotsvg ValidateObservables'),
 
     ('Scenarios, compose with Stack, Push and Pop are observable',
-     'pma.py -o ValidateAllObservables Scenarios Stack AllObservables'),
-    ('Generate Dot', 'pmg.py ValidateAllObservables'),
+     'pma -o ValidateAllObservables Scenarios Stack AllObservables'),
+    ('Generate Dot', 'pmg ValidateAllObservables'),
     ('Generate SVG', 'dotsvg ValidateAllObservables')
     ]

samples/Stack/test_observables.py

@@ -1,13 +1,13 @@
 cases = [
     ('Scenarios module with four runs, by itself',
-     'pmt.py Scenarios'),
+     'pmt Scenarios'),
 
     ('Scenarios module, compose with Stack model, last two runs not allowed',
-     'pmt.py Scenarios Stack'),
+     'pmt Scenarios Stack'),
 
     ('Scenarios, compose with Stack, Push is observable, get args from scenario',
-     'pmt.py Scenarios Stack Observables'),
+     'pmt Scenarios Stack Observables'),
 
     ('Scenarios, compose with Stack, Push and Pop are observable, get args from scenario',
-     'pmt.py Scenarios Stack AllObservables')
+     'pmt Scenarios Stack AllObservables')
     ]

samples/Stack/test_scenario_graphics.py

@@ -4,11 +4,11 @@
 
 cases = [
   ('Default random strategy, actions repeat',
-   'pmt.py -n 10 -s 1 Stack'),
+   'pmt -n 10 -s 1 Stack'),
 
   ('ActionNameCoverage, Push and Pop alternate', 
-   'pmt.py -n 10 -s 1 Stack -g ActionNameCoverage'),
+   'pmt -n 10 -s 1 Stack -g ActionNameCoverage'),
 
   ('StateCoverage, repeat Push',
-   'pmt.py -n 10 -s 1 Stack StackDepthTen -g StateCoverage')
+   'pmt -n 10 -s 1 Stack StackDepthTen -g StateCoverage')
 ]

samples/Stack/test_scenarios.py

@@ -4,28 +4,28 @@
 
 cases = [
     ('Generate FSM with first 12 transitions',
-     'pma.py Stack -m 12'),
+     'pma Stack -m 12'),
 
     ('Generate dot commands',
-     'pmg.py StackFSM'),
+     'pmg StackFSM'),
 
     ('Generate SVG file',
      'dotsvg StackFSM'),
 
     ('Generate dot commands for scenario FSM',
-     'pmg.py StackOneScenario'),
+     'pmg StackOneScenario'),
 
     ('Generate dot commands for scenario FSM',
-     'pmg.py StackOneScenario'),
+     'pmg StackOneScenario'),
 
     ('Generate SVG',
      'dotsvg StackOneScenario'),
 
     ('Explore composition of model with scenario machine, show synchronization',
-     'pma.py Stack StackOneScenario -m 6 -o StackSynchronized'),
+     'pma Stack StackOneScenario -m 6 -o StackSynchronized'),
 
     ('Generate dot',
-     'pmg.py StackSynchronized'),
+     'pmg StackSynchronized'),
 
     ('Generate SVG',
      'dotsvg StackSynchronized'),
@@ -34,10 +34,10 @@
     # in browser
 
     ('Generate FSM with state filter',
-     'pma.py -o Stack3FSM Stack Filter3'),
+     'pma -o Stack3FSM Stack Filter3'),
 
     ('Generate dot commands',
-     'pmg.py Stack3FSM'),
+     'pmg Stack3FSM'),
 
     ('Generate SVG file',
      'dotsvg Stack3FSM'),

samples/StackResult/test.py

@@ -4,32 +4,32 @@
 
 cases = [
  ('WebModel -a option includes only Initialize Action',
-  'pmt.py -n 10 -a Initialize WebModel'),
+  'pmt -n 10 -a Initialize WebModel'),
 
  ('WebModel -e option excludes Login, Logout actions',
-  'pmt.py -n 10 -e Login -e Logout WebModel'),
+  'pmt -n 10 -e Login -e Logout WebModel'),
 
  ('WebModel TestIntSuccess offline test suite',
-  'pmt.py TestIntSuccess'),
+  'pmt TestIntSuccess'),
 
  ('WebModel on-the-fly with all actions, default random strategy, shows repeated calls to same action',
-  'pmt.py -n 10 -s 2 WebModel'),
+  'pmt -n 10 -s 2 WebModel'),
 
  ('WebModel on-the-fly with all actions, ActionNameCoverage strategy, shows the same (enabled) action is not repeated more than 2x',
-  'pmt.py -n 10 -s 2 WebModel -g ActionNameCoverage'),
+  'pmt -n 10 -s 2 WebModel -g ActionNameCoverage'),
 
  ('WebModel on-the-fly with all actions, StateCoverage strategy, shows Login and UpdateInt actions repeat but with different arguments',
-  'pmt.py -n 10 -s 2 WebModel -g StateCoverage'),
+  'pmt -n 10 -s 2 WebModel -g StateCoverage'),
 
  ('WebModel, no -c option, ends in non-accepting state with users logged in',
-  'pmt.py -n 10 -s 2 WebModel'),
+  'pmt -n 10 -s 2 WebModel'),
 
  ('WebModel, with -c option for cleanup, logs off users to reach accepting state',
-  'pmt.py -n 10 -s 2 -c 3 WebModel'),
+  'pmt -n 10 -s 2 -c 3 WebModel'),
 
  ('WebModel, with -r --runs option, in each run Initialize is enabled again',
-  'pmt.py -n 5 -s 3 -r 3 WebModel'),
+  'pmt -n 5 -s 3 -r 3 WebModel'),
 
  ('WebModel TestIntTwoRuns offline test suite with two runs',
-  'pmt.py TestIntTwoRuns'),
+  'pmt TestIntTwoRuns'),
 ]