<field>, <value> reorder due to load/save.

This commit is contained in:
Andrew n marshall
2017-01-09 15:54:04 -08:00
parent 9fca356705
commit 51868a2162

View File

@@ -2,12 +2,12 @@
<block type="unittest_main" x="-4" y="-12">
<statement name="DO">
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">True</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">True</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_boolean">
<field name="BOOL">TRUE</field>
@@ -15,12 +15,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">False</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">False</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_boolean">
<field name="BOOL">FALSE</field>
@@ -28,12 +28,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not true</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not true</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_negate" inline="false">
<value name="BOOL">
@@ -45,12 +45,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not false</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not false</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_negate" inline="false">
<value name="BOOL">
@@ -96,6 +96,7 @@
</block>
<block type="procedures_defnoreturn" x="385" y="-3">
<field name="NAME">test if</field>
<comment pinned="false" h="80" w="160">Describe this function...</comment>
<statement name="STACK">
<block type="controls_if" inline="false">
<value name="IF0">
@@ -105,7 +106,7 @@
</value>
<statement name="DO0">
<block type="unittest_fail">
<field name="MESSAGE">if false</field>
<field name="MESSAGE">if false</field>
</block>
</statement>
<next>
@@ -135,12 +136,12 @@
</statement>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if true</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if true</field>
</block>
</value>
<value name="ACTUAL">
<block type="variables_get">
<field name="VAR">ok</field>
@@ -164,7 +165,7 @@
</value>
<statement name="DO0">
<block type="unittest_fail">
<field name="MESSAGE">if/else false</field>
<field name="MESSAGE">if/else false</field>
</block>
</statement>
<statement name="ELSE">
@@ -179,12 +180,12 @@
</statement>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if/else false</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if/else false</field>
</block>
</value>
<value name="ACTUAL">
<block type="variables_get">
<field name="VAR">ok</field>
@@ -218,17 +219,17 @@
</statement>
<statement name="ELSE">
<block type="unittest_fail">
<field name="MESSAGE">if/else true</field>
<field name="MESSAGE">if/else true</field>
</block>
</statement>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if/else true</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if/else true</field>
</block>
</value>
<value name="ACTUAL">
<block type="variables_get">
<field name="VAR">ok</field>
@@ -252,7 +253,7 @@
</value>
<statement name="DO0">
<block type="unittest_fail">
<field name="MESSAGE">elseif 1</field>
<field name="MESSAGE">elseif 1</field>
</block>
</statement>
<value name="IF1">
@@ -277,22 +278,22 @@
</value>
<statement name="DO2">
<block type="unittest_fail">
<field name="MESSAGE">elseif 2</field>
<field name="MESSAGE">elseif 2</field>
</block>
</statement>
<statement name="ELSE">
<block type="unittest_fail">
<field name="MESSAGE">elseif 3</field>
<field name="MESSAGE">elseif 3</field>
</block>
</statement>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">elseif 4</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">elseif 4</field>
</block>
</value>
<value name="ACTUAL">
<block type="variables_get">
<field name="VAR">ok</field>
@@ -327,14 +328,15 @@
</block>
<block type="procedures_defnoreturn" x="-7" y="384">
<field name="NAME">test equalities</field>
<comment pinned="false" h="80" w="160">Describe this function...</comment>
<statement name="STACK">
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Equal yes</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Equal yes</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">EQ</field>
@@ -352,12 +354,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Equal no</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Equal no</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">EQ</field>
@@ -375,12 +377,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not equal yes</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not equal yes</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">NEQ</field>
@@ -398,12 +400,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not equal no</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Not equal no</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">EQ</field>
@@ -421,12 +423,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller yes</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller yes</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">LT</field>
@@ -444,12 +446,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller no</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller no</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">LT</field>
@@ -467,12 +469,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater yes</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater yes</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">GT</field>
@@ -490,12 +492,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater no</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater no</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">GT</field>
@@ -513,12 +515,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller-equal yes</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller-equal yes</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">LTE</field>
@@ -536,12 +538,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller-equal no</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Smaller-equal no</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">LTE</field>
@@ -559,12 +561,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater-equal yes</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater-equal yes</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">GTE</field>
@@ -582,12 +584,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater-equal no</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Greater-equal no</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_compare">
<field name="OP">GTE</field>
@@ -630,14 +632,15 @@
</block>
<block type="procedures_defnoreturn" x="-5" y="1200">
<field name="NAME">test or</field>
<comment pinned="false" h="80" w="160">Describe this function...</comment>
<statement name="STACK">
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or true/true</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or true/true</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">OR</field>
@@ -655,12 +658,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or false/true</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or false/true</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">OR</field>
@@ -678,12 +681,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or true/false</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or true/false</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">OR</field>
@@ -701,12 +704,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or false/false</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">Or false/false</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">OR</field>
@@ -733,14 +736,15 @@
</block>
<block type="procedures_defnoreturn" x="385" y="1208">
<field name="NAME">test and</field>
<comment pinned="false" h="80" w="160">Describe this function...</comment>
<statement name="STACK">
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And true/true</field>
</block>
</value>
<field name="EXPECTED">TRUE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And true/true</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">AND</field>
@@ -758,12 +762,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And false/true</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And false/true</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">AND</field>
@@ -781,12 +785,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And true/false</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And true/false</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">AND</field>
@@ -804,12 +808,12 @@
</value>
<next>
<block type="unittest_assertvalue" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And false/false</field>
</block>
</value>
<field name="EXPECTED">FALSE</field>
<value name="MESSAGE">
<block type="text">
<field name="TEXT">And false/false</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_operation">
<field name="OP">AND</field>
@@ -836,13 +840,14 @@
</block>
<block type="procedures_defnoreturn" x="3" y="1527">
<field name="NAME">test ternary</field>
<comment pinned="false" h="80" w="160">Describe this function...</comment>
<statement name="STACK">
<block type="unittest_assertequals" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if true</field>
</block>
</value>
<block type="text">
<field name="TEXT">if true</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_ternary" inline="true">
<value name="IF">
@@ -870,10 +875,10 @@
<next>
<block type="unittest_assertequals" inline="false">
<value name="MESSAGE">
<block type="text">
<field name="TEXT">if true</field>
</block>
</value>
<block type="text">
<field name="TEXT">if true</field>
</block>
</value>
<value name="ACTUAL">
<block type="logic_ternary" inline="true">
<value name="IF">
@@ -903,4 +908,4 @@
</block>
</statement>
</block>
</xml>
</xml>