diff options
author | Damian Jansen <damian.jansen@nokia.com> | 2011-02-24 14:36:13 +1000 |
---|---|---|
committer | Damian Jansen <damian.jansen@nokia.com> | 2011-02-24 14:36:13 +1000 |
commit | f2498977d4c0be9e8dc294e3467dff5776678928 (patch) | |
tree | 07d30557c1d1eec5cb03c746a11f4d7e51bfae4b | |
parent | e3f9e6ff375685f0f1181532685c0a077d1b8673 (diff) | |
parent | bcf0d8a92b9f1859f949e670d383ba096e860545 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:research/systemtests
-rw-r--r-- | Qt/demos/declarative/calculator/sys_calculator/sys_calculator.qtt | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Qt/demos/declarative/calculator/sys_calculator/sys_calculator.qtt b/Qt/demos/declarative/calculator/sys_calculator/sys_calculator.qtt index b60c81b..17fb7e1 100644 --- a/Qt/demos/declarative/calculator/sys_calculator/sys_calculator.qtt +++ b/Qt/demos/declarative/calculator/sys_calculator/sys_calculator.qtt @@ -58,18 +58,18 @@ testcase = { }, binary_operations_data: { - "operation1": ["0", add, "0", "0"], - "operation2": ["0", sub, "0", "0"], - "operation3": ["0", mul, "0", "0"], - "operation4": ["0", div, "0", "NaN"], - "operation5": ["0", add, "1", "1"], - "operation6": ["0", sub, "1", "-1"], - "operation7": ["0", mul, "1", "0"], - "operation8": ["0", div, "1", "0"], - "operation9": ["0.56789", add, "7453.0145", "7453.58239"], - "operation10": ["0.56789", sub, "7453.0145", "-7452.44661"], - "operation11": ["0.56789", mul, "7453.0145", "4232.492404405"], - "operation12": ["0.56789", div, "7453.0145", "0.00007619601437780645"] + operation1: ["0", add, "0", "0"], + operation2: ["0", sub, "0", "0"], + operation3: ["0", mul, "0", "0"], + operation4: ["0", div, "0", "NaN"], + operation5: ["0", add, "1", "1"], + operation6: ["0", sub, "1", "-1"], + operation7: ["0", mul, "1", "0"], + operation8: ["0", div, "1", "0"], + operation9: ["0.56789", add, "7453.0145", "7453.58239"], + operation10: ["0.56789", sub, "7453.0145", "-7452.44661"], + operation11: ["0.56789", mul, "7453.0145", "4232.492404405"], + operation12: ["0.56789", div, "7453.0145", "0.00007619601437780645"] }, binary_operations: function(FirstOperand, Operator, SecondOperand, ExpectedResult) @@ -87,12 +87,12 @@ testcase = { }, advanced_mode_data: { - "operation1": ["-123", "Abs", "123"], - "operation2": ["3.14159", "Int", "3"], - "operation3": ["65536", "Sqrt", "256"], - "operation4": ["123", "^2", "15129"], - "operation5": ["500", "1/x", "0.002"], - "operation6": ["999", "+/-", "-999"] + operation1: ["-123", "Abs", "123"], + operation2: ["3.14159", "Int", "3"], + operation3: ["65536", "Sqrt", "256"], + operation4: ["123", "^2", "15129"], + operation5: ["500", "1/x", "0.002"], + operation6: ["999", "+/-", "-999"] }, advanced_mode: function(Operand, Operator, ExpectedResult) |