calculator: major logic refactor, move up display code & use numerics

[nit.git] / examples / calculator / src / calculator_test.nit

diff --git a/examples/calculator/src/calculator_test.nit b/examples/calculator/src/calculator_test.nit
index 2d47acb..6937751 100644 (file)
--- a/examples/calculator/src/calculator_test.nit
+++ b/examples/calculator/src/calculator_test.nit
@@ -28,8 +28,8 @@ context.push_digit( 3 )
 context.push_op( '*' )
 context.push_digit( 2 )
 context.push_op( '=' )
-var r = context.result.to_precision( 2 )
-assert r == "30.00" else print r
+var r = context.result
+assert r == "30.00" else print r or else "-"
 
 context = new CalculatorContext
 context.push_digit( 1 )
@@ -39,15 +39,15 @@ context.push_digit( 1 )
 context.push_op( '*' )
 context.push_digit( 3 )
 context.push_op( '=' )
-r = context.result.to_precision( 2 )
-assert r == "42.30" else print r
+r = context.result
+assert r == "42.30" else print r or else "-"
 
 context.push_op( '+' )
 context.push_digit( 1 )
 context.push_digit( 1 )
 context.push_op( '=' )
-r = context.result.to_precision( 2 )
-assert r == "53.30" else print r
+r = context.result
+assert r == "53.30" else print r or else "-"
 
 context = new CalculatorContext
 context.push_digit( 4 )
@@ -57,8 +57,8 @@ context.push_digit( 3 )
 context.push_op( '/' )
 context.push_digit( 3 )
 context.push_op( '=' )
-r = context.result.to_precision( 2 )
-assert r == "14.10" else print r
+r = context.result
+assert r == "14.10" else print r or else "-"
 
 #test multiple decimals
 context = new CalculatorContext
@@ -71,8 +71,8 @@ context.push_digit( 3 )
 context.push_op( '+' )
 context.push_digit( 1 )
 context.push_op( '=' )
-r = context.result.to_precision( 3 )
-assert r == "51.123" else print r
+r = context.result
+assert r == "51.123" else print r or else "-"
 
 #test 'C' button
 context = new CalculatorContext
@@ -83,5 +83,5 @@ context.push_digit( 1 )
 context.push_digit( 0 )
 context.push_op( '=' )
 context.push_op( 'C' )
-r = context.result.to_precision( 1 )
-assert r == "0.0" else print r
+r = context.result
+assert r == "0.0" else print r or else "-"