diff --git a/tests/generators/golden/generated.js b/tests/generators/golden/generated.js index 01e9bd311a6..ae071459e17 100644 --- a/tests/generators/golden/generated.js +++ b/tests/generators/golden/generated.js @@ -449,6 +449,7 @@ function test_number_properties() { assertEquals(42 % 2 === 0, true, 'even'); assertEquals(42.1 % 2 === 1, false, 'odd'); assertEquals(mathIsPrime(5), true, 'prime 5'); + assertEquals(mathIsPrime((5 + 2)), true, 'prime 5 + 2'); assertEquals(mathIsPrime(25), false, 'prime 25'); assertEquals(mathIsPrime(-31.1), false, 'prime negative'); assertEquals(Math.PI % 1 === 0, false, 'whole'); diff --git a/tests/generators/math.xml b/tests/generators/math.xml index ff079d2e1d6..78e77bfabde 100644 --- a/tests/generators/math.xml +++ b/tests/generators/math.xml @@ -1,44 +1,48 @@ - + + varToChange + rand + + Math - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -67,160 +71,160 @@ - + test single Tests the "single" block. - + - + sqrt - + ROOT - + 25 - + 5 - + - + abs - + ABS - + -25 - + 25 - + - + negate - + NEG - + -25 - + 25 - + - + ln - + LN - + 1 - + 0 - + - + log10 - + LOG10 - + 100 - + 2 - + - + exp - + EXP - + 2 - + 7.38905609893065 - + - + power10 - + POW10 - + 2 - + 100 @@ -239,88 +243,88 @@ - + test arithmetic Tests the "arithmetic" block for all operations and checks parenthesis are properly generated for different orders. - + - + add - + ADD - + 1 - + 2 - + 3 - + - + subtract - + MINUS - + 1 - + 2 - + -1 - + - + subtract order with add - + MINUS - + 1 - + ADD - + 0 - + 2 @@ -329,35 +333,35 @@ - + -1 - + - + subtract order with subtract - + MINUS - + 1 - + MINUS - + 0 - + 2 @@ -366,62 +370,62 @@ - + 3 - + - + multiply - + MULTIPLY - + 4 - + 2.5 - + 10 - + - + multiply order - + MULTIPLY - + 4 - + ADD - + 0 - + 2.5 @@ -430,62 +434,62 @@ - + 10 - + - + divide - + DIVIDE - + 8.2 - + -5 - + -1.64 - + - + divide order - + DIVIDE - + 8.2 - + ADD - + 0 - + -5 @@ -494,62 +498,62 @@ - + -1.64 - + - + power - + POWER - + 10 - + 4 - + 10000 - + - + power order - + POWER - + 10 - + ADD - + 0 - + 4 @@ -558,7 +562,7 @@ - + 10000 @@ -583,138 +587,138 @@ - + test trig Tests the "trig" block. - + - + sin - + SIN - + 90 - + 1 - + - + cos - + COS - + 180 - + -1 - + - + tan - + TAN - + 0 - + 0 - + - + asin - + ASIN - + -1 - + -90 - + - + acos - + ACOS - + 1 - + 0 - + - + atan - + ATAN - + 1 - + 45 @@ -731,29 +735,29 @@ - + test constant Tests the "constant" blocks. - + - + const pi - + ROUNDDOWN - + MULTIPLY - + PI - + 1000 @@ -762,30 +766,30 @@ - + 3141 - + - + const e - + ROUNDDOWN - + MULTIPLY - + E - + 1000 @@ -794,30 +798,30 @@ - + 2718 - + - + const golden - + ROUNDDOWN - + MULTIPLY - + GOLDEN_RATIO - + 1000 @@ -826,30 +830,30 @@ - + 1618 - + - + const sqrt 2 - + ROUNDDOWN - + MULTIPLY - + SQRT2 - + 1000 @@ -858,30 +862,30 @@ - + 1414 - + - + const sqrt 0.5 - + ROUNDDOWN - + MULTIPLY - + SQRT1_2 - + 1000 @@ -890,28 +894,28 @@ - + 707 - + TRUE - + const infinity - + LT - + 9999 - + INFINITY @@ -930,185 +934,216 @@ - + test number properties Tests the "number property" blocks. - + TRUE - + even - + EVEN - + 42 - + FALSE - + odd - + ODD - + 42.1 - + TRUE - + prime 5 - + PRIME - + 5 - - FALSE + + TRUE - - prime 25 + + prime 5 + 2 - + PRIME - - 25 + + ADD + + + 5 + + + + + 2 + + - + FALSE - - prime negative + + prime 25 - + PRIME - - -31.1 + + 25 - + FALSE - - whole + + prime negative - + - WHOLE + PRIME - - PI + + -31.1 - - TRUE + + FALSE - - positive + + whole - + - POSITIVE + WHOLE - - INFINITY + + PI - + TRUE - - negative + + positive - + - NEGATIVE + POSITIVE - - -42 + + INFINITY - + TRUE - - divisible + + negative - - - DIVISIBLE_BY + + + NEGATIVE - - 42 + + -42 - - - 2 + + + + + TRUE + + + divisible + + + + + + DIVISIBLE_BY + + + 42 + + + + + 2 + + - + @@ -1128,72 +1163,72 @@ - + test round Tests the "round" block. - + - + round - + ROUND - + 42.42 - + 42 - + - + round up - + ROUNDUP - + -42.42 - + -42 - + - + round down - + ROUNDDOWN - + 42.42 - + 42 @@ -1204,39 +1239,39 @@ - + test change Tests the "change" block. - - varToChange + + varToChange - + 100 - - varToChange + + varToChange - + 42 - + - + change - - varToChange + + varToChange - + 142 @@ -1247,35 +1282,35 @@ - + test operations on list Tests the "list operation" blocks. - + - + sum - + SUM - + - + 3 - + 4 - + 5 @@ -1284,36 +1319,36 @@ - + 12 - + - + min - + MIN - + - + 3 - + 4 - + 5 @@ -1322,36 +1357,36 @@ - + 3 - + - + max - + MAX - + - + 3 - + 4 - + 5 @@ -1360,36 +1395,36 @@ - + 5 - + - + average - + AVERAGE - + - + 3 - + 4 - + 5 @@ -1398,41 +1433,41 @@ - + 4 - + - + median - + MEDIAN - + - + 3 - + 4 - + 5 - + 1 @@ -1441,36 +1476,36 @@ - + 3.5 - + - + modes - + MODE - + - + 3 - + 4 - + 3 @@ -1479,51 +1514,51 @@ - + - + 3 - + - + modes multiple - + MODE - + - + 3 - + 4 - + 3 - + 1 - + 4 @@ -1532,46 +1567,46 @@ - + - + 3 - + 4 - + - + standard dev - + STD_DEV - + - + 3 - + 3 - + 3 @@ -1580,63 +1615,63 @@ - + 0 - + TRUE - + random - + GT - + FIRST - + - + 3 - + 4 - + 5 - + RANDOM - + - + 3 - + 4 - + 5 @@ -1647,7 +1682,7 @@ - + 0 @@ -1672,131 +1707,131 @@ - + test mod Tests the "mod" block. - + - + mod - + - + 42 - + 5 - + 2 - + test constraint Tests the "constrain" block. - + - + constraint - + - + 100 - + 0 - + 42 - + 42 - + test random integer Tests the "random integer" block. - - rand + + rand - + - + 5 - + 10 - + TRUE - + randRange - + AND - + GTE - - rand + + rand - + 5 - + LTE - - rand + + rand - + 10 @@ -1805,20 +1840,20 @@ - + TRUE - + randInteger - + WHOLE - - rand + + rand @@ -1830,51 +1865,51 @@ - + test random fraction Tests the "random fraction" block. - - rand + + rand - + - + TRUE - + randFloat - + AND - + GTE - - rand + + rand - + 0 - + LTE - - rand + + rand - + 1 @@ -1887,58 +1922,58 @@ - + test atan2 - Describe this function... + Describe this function... - + - + atan2 - + - + -5 - + 5 - + 135 - + - + atan2 - + - + 0 - + -12 - + -90