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

rename

Browse Source
This commit is contained in:
serso
2011-10-17 23:53:50 +04:00
parent 14f8abab81
commit 5d0833e35f
10 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/solovyev/android/calculator/math/MathTypeTest.java
View File

@@ -9,7 +9,7 @@ package org.solovyev.android.calculator.math;
import junit.framework.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.solovyev.android.calculator.model.CalculatorModel;
import org.solovyev.android.calculator.model.CalculatorEngine;
/**
* User: serso
@@ -20,7 +20,7 @@ public class MathTypeTest {
@BeforeClass
public static void setUp() throws Exception {
CalculatorModel.instance.init(null, null);
CalculatorEngine.instance.init(null, null);
}
@Test

14
src/test/java/org/solovyev/android/calculator/model/CalculatorModelTest.java → src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
View File

@@ -17,16 +17,16 @@ import org.solovyev.android.calculator.JsclOperation;
* Date: 9/17/11
* Time: 9:47 PM
*/
public class CalculatorModelTest {
public class CalculatorEngineTest {
@BeforeClass
public static void setUp() throws Exception {
CalculatorModel.instance.init(null, null);
CalculatorEngine.instance.init(null, null);
}
@Test
public void testEvaluate() throws Exception {
final CalculatorModel cm = CalculatorModel.instance;
final CalculatorEngine cm = CalculatorEngine.instance;
Assert.assertEquals("4.0", cm.evaluate(JsclOperation.numeric, "2+2"));
Assert.assertEquals("-0.7568", cm.evaluate(JsclOperation.numeric, "sin(4)"));
@@ -62,7 +62,7 @@ public class CalculatorModelTest {
}
Assert.assertEquals("0.73909", cm.evaluate(JsclOperation.numeric, "cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(1))))))))))))))))))))))))))))))))))))"));
CalculatorModel.instance.getVarsRegister().addVar(null, new Var.Builder("si", 5d));
CalculatorEngine.instance.getVarsRegister().addVar(null, new Var.Builder("si", 5d));
Assert.assertEquals("5.0", cm.evaluate(JsclOperation.numeric, "si"));
try {
cm.evaluate(JsclOperation.numeric, "sin");
@@ -75,11 +75,11 @@ public class CalculatorModelTest {
Assert.assertEquals("-23.97311", cm.evaluate(JsclOperation.numeric, "si*sin(5)si"));
Assert.assertEquals("-3.30879", cm.evaluate(JsclOperation.numeric, "sisin(5si)si"));
CalculatorModel.instance.getVarsRegister().addVar(null, new Var.Builder("s", 1d));
CalculatorEngine.instance.getVarsRegister().addVar(null, new Var.Builder("s", 1d));
Assert.assertEquals("5.0", cm.evaluate(JsclOperation.numeric, "si"));
CalculatorModel.instance.getVarsRegister().addVar(null, new Var.Builder("k", 3.5d));
CalculatorModel.instance.getVarsRegister().addVar(null, new Var.Builder("k1", 4d));
CalculatorEngine.instance.getVarsRegister().addVar(null, new Var.Builder("k", 3.5d));
CalculatorEngine.instance.getVarsRegister().addVar(null, new Var.Builder("k1", 4d));
Assert.assertEquals("4.0", cm.evaluate(JsclOperation.numeric, "k11"));
}

2
src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java
View File

@@ -19,7 +19,7 @@ public class ToJsclTextProcessorTest {
@BeforeClass
public static void setUp() throws Exception {
CalculatorModel.instance.init(null, null);
CalculatorEngine.instance.init(null, null);
}
@Test