diff --git a/test/00/RESTService.sh b/test/00/RESTService.sh index d45482678..d5340b645 100755 --- a/test/00/RESTService.sh +++ b/test/00/RESTService.sh @@ -9,7 +9,7 @@ EOF if [ $? -ne 0 ]; then fail; fi cat >reference <{"csvDialog":{"backgroundColour":{"a":1,"b":0.80000000000000004,"g":0.80000000000000004,"r":0.80000000000000004},"colWidth":50,"flashNameRow":false,"item":{},"resolutionScaleFactor":1,"spec":{"counter":false,"dataColOffset":0,"dataCols":[],"dataRowOffset":0,"decSeparator":".","dimensionCols":[],"dimensionNames":[],"dimensions":[],"dontFail":false,"duplicateKeyAction":"throwException","escape":"\u0000","headerRow":0,"horizontalDimName":"?","horizontalDimension":{"type":"string","units":""},"maxColumn":1000,"mergeDelimiters":false,"missingValue":NaN,"numCols":0,"quote":"\\"","separator":","},"url":"","wire":{},"xoffs":80},"detailedText":"","godleyOverridden":false,"name":"constant:one","rhs":{},"sliderVisible":false,"tensorInit":{},"tooltip":"","units":[],"unitsCached":false} +/minsky/variableValues/@elem/"constant:one"=>{"csvDialog":{"backgroundColour":{"a":1,"b":0.80000000000000004,"g":0.80000000000000004,"r":0.80000000000000004},"colWidth":50,"flashNameRow":false,"item":{},"resolutionScaleFactor":1,"spec":{"counter":false,"dataColOffset":0,"dataCols":[],"dataRowOffset":0,"decSeparator":".","dimensionCols":[],"dimensionNames":[],"dimensions":[],"dontFail":false,"duplicateKeyAction":"throwException","escape":"\u0000","headerRow":0,"horizontalDimName":"?","horizontalDimension":{"type":"string","units":""},"maxColumn":1000,"mergeDelimiters":false,"missingValue":NaN,"numCols":0,"quote":"\"","separator":","},"url":"","wire":{},"xoffs":80},"detailedText":"","enableSlider":true,"godleyOverridden":false,"name":"constant:one","rhs":{},"sliderBoundsSet":false,"sliderMax":0,"sliderMin":0,"sliderStep":0,"sliderStepRel":false,"sliderVisible":false,"tensorInit":{},"tooltip":"","units":[],"unitsCached":false} EOF diff -q -w output reference diff --git a/test/00/editItems.sh b/test/00/editItems.sh deleted file mode 100755 index f3a4a4f68..000000000 --- a/test/00/editItems.sh +++ /dev/null @@ -1,95 +0,0 @@ -#! /bin/sh - -here=`pwd` -if test $? -ne 0; then exit 2; fi -tmp=/tmp/$$ -mkdir $tmp -if test $? -ne 0; then exit 2; fi -cd $tmp -if test $? -ne 0; then exit 2; fi - -fail() -{ - echo "FAILED" 1>&2 - cd $here - chmod -R u+w $tmp - rm -rf $tmp - exit 1 -} - -pass() -{ - echo "PASSED" 1>&2 - cd $here - chmod -R u+w $tmp - rm -rf $tmp - exit 0 -} - -trap "fail" 1 2 3 15 -cat >input.tcl <=0} "plot" - - minsky.addGodley - assert {[findObject GodleyIcon]} - assert {[lsearch -glob [winfo children .] .godley*]==-1} "godley" - editItem - assert {[lsearch -glob [winfo children .] .godley*]>=0} "godley" - - minsky.addGroup - assert {[findObject Group]} - editItem - assert {[winfo ismapped .wiring.editGroup]} "group" - destroy .wiring.editGroup - - minsky.addNote "hello" - assert {[findObject Item]} - editItem - assert {[winfo ismapped .wiring.note]} "note" - destroy .wiring.note - grab release .wiring.note - - minsky.addSwitch - editItem -# should be do nothing ATM - - tcl_exit -} -EOF - -$here/gui-tk/minsky input.tcl -if [ $? -ne 0 ]; then fail; fi - -pass diff --git a/test/00/t0030a.sh b/test/00/t0030a.sh deleted file mode 100755 index b9ba24e58..000000000 --- a/test/00/t0030a.sh +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh - -here=`pwd` -if test $? -ne 0; then exit 2; fi -tmp=/tmp/$$ -mkdir $tmp -if test $? -ne 0; then exit 2; fi -cd $tmp -if test $? -ne 0; then exit 2; fi - -fail() -{ - echo "FAILED" 1>&2 - cd $here - chmod -R u+w $tmp - rm -rf $tmp - exit 1 -} - -pass() -{ - echo "PASSED" 1>&2 - cd $here - chmod -R u+w $tmp - rm -rf $tmp - exit 0 -} - -trap "fail" 1 2 3 15 - -# insert ecolab script code here -# use \$ in place of $ to refer to variable contents -# exit 0 to indicate pass, and exit 1 to indicate failure -cat >input.tcl <=0} - - # now double click on one of the flow variables - findVariable IntLoan - set var minsky.canvas.item - doubleButton [\$var.x] [\$var.y] - assert {[winfo viewable .wiring.editVar]} - .wiring.editVar.buttonBar.ok invoke - assert {![winfo exists .wiring.editVar]} - - assert {[findVariable Loan]} - editItem - assert {[winfo viewable .wiring.editVar]} {varclick} - .wiring.editVar.buttonBar.ok invoke - assert {![winfo exists .wiring.editVar]} {varclick} - - - tcl_exit -} -EOF - -$here/gui-tk/minsky input.tcl -if test $? -ne 0; then fail; fi - -pass diff --git a/test/00/textInput.sh b/test/00/textInput.sh deleted file mode 100755 index b63dae462..000000000 --- a/test/00/textInput.sh +++ /dev/null @@ -1,98 +0,0 @@ -#! /bin/sh - -here=`pwd` -if test $? -ne 0; then exit 2; fi -tmp=/tmp/$$ -mkdir $tmp -if test $? -ne 0; then exit 2; fi -cd $tmp -if test $? -ne 0; then exit 2; fi - -fail() -{ - echo "FAILED" 1>&2 - cd $here - chmod -R u+w $tmp - rm -rf $tmp - exit 1 -} - -pass() -{ - echo "PASSED" 1>&2 - cd $here - chmod -R u+w $tmp - rm -rf $tmp - exit 0 -} - -trap "fail" 1 2 3 15 - -# exercise item creation -cat >input.tcl < -x 100 -y 100 -assert {[model.items.size]==1} - -addConstant -.wiring.initVar.buttonBar.ok invoke -event generate .wiring.canvas -x 100 -y 100 -assert {[model.items.size]==2} - -addOperationKey add -assert {[model.items.size]==3} - -textInput a -assert {[winfo exists .textInput]} -.textInput.buttonBar.ok invoke -assert {[winfo exists .wiring.editVar]} -.wiring.editVar.buttonBar.ok invoke -assert {[model.items.size]==4} - -textInput f -assert {[winfo exists .textInput]} -.textInput.entry insert 1 "=0.2" -.textInput.buttonBar.ok invoke -assert {![winfo exists .wiring.editVar]} -assert {[model.items.size]==5} -assert {[findVariable f]} {} -assert {[minsky.canvas.item.init]=="0.2"} - -textInput % -.textInput.entry insert 1 "b" -.textInput.buttonBar.ok invoke -assert {[model.items.size]==6} -assert {[findObject Item]} {} -# TODO reenable in python version -#assert {[minsky.canvas.item.detailedText]=="b"} - -textInput s -.textInput.entry insert 1 "in" -.textInput.buttonBar.ok invoke -assert {[model.items.size]==7} -assert {[findObject "Operation:sin"]} - -addGodley -event generate .wiring.canvas -assert {[model.items.size]==8} - -addPlot -event generate .wiring.canvas -assert {[model.items.size]==9} - - -tcl_exit -}} -EOF - -cp $here/test/assert.tcl . -$here/gui-tk/minsky input.tcl -if test $? -ne 0; then fail; fi - -pass