TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jscl without bsh

Browse Source
This commit is contained in:
serso
2011-10-27 18:38:45 +04:00
parent be44ae8e80
commit 274192d4bd
6 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
View File

@@ -5,7 +5,6 @@
package org.solovyev.android.calculator.model;
import bsh.EvalError;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -35,22 +34,19 @@ public class CalculatorEngineTest {
try {
cm.evaluate(JsclOperation.numeric, "3^10^10^10");
Assert.fail();
} catch (EvalError evalError) {
Assert.fail();
} catch (ParseException e) {
if (e.getMessage().startsWith("Too long calculation")) {
if (e.getCause().getMessage().startsWith("Too big")) {
} else {
System.out.print(e.getCause().getMessage());
Assert.fail();
}
}
final long start = System.currentTimeMillis();
/*final long start = System.currentTimeMillis();
try {
cm.evaluate(JsclOperation.numeric, "3^10^10^10");
Assert.fail();
} catch (EvalError evalError) {
Assert.fail();
} catch (ParseException e) {
if (e.getMessage().startsWith("Too long calculation")) {
final long end = System.currentTimeMillis();
@@ -58,7 +54,7 @@ public class CalculatorEngineTest {
} else {
Assert.fail();
}
}
}*/
}
@@ -140,10 +136,11 @@ public class CalculatorEngineTest {
CalculatorEngine.instance.getVarsRegister().addVar(null, new Var.Builder("si", 5d));
Assert.assertEquals("5", cm.evaluate(JsclOperation.numeric, "si").getResult());
try {
cm.evaluate(JsclOperation.numeric, "sin");
Assert.fail();
} catch (EvalError e) {
} catch (ParseException e) {
}
}