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

test fixes

Browse Source
This commit is contained in:
Sergey Solovyev 2011-12-17 22:03:33 +04:00
parent b1c813e63d
commit 8d6d6bc044
2 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,33 @@ public class CalculatorEngineTest {
CalculatorEngine.instance.setThreadKiller(new CalculatorEngine.ThreadKillerImpl()); CalculatorEngine.instance.setThreadKiller(new CalculatorEngine.ThreadKillerImpl());
} }
@Test
public void testDegrees() throws Exception {
final CalculatorEngine cm = CalculatorEngine.instance;
final AngleUnit defaultAngleUnit = cm.getEngine().getAngleUnits();
try {
cm.getEngine().setAngleUnits(AngleUnit.rad);
cm.setPrecision(3);
try {
Assert.assertEquals("0.017", cm.evaluate(JsclOperation.numeric, "°"));
fail();
} catch (CalculatorParseException e) {
}
Assert.assertEquals("0.017", cm.evaluate(JsclOperation.numeric, "1°").getResult());
Assert.assertEquals("0.349", cm.evaluate(JsclOperation.numeric, "20.0°").getResult());
Assert.assertEquals("0.5", cm.evaluate(JsclOperation.numeric, "sin(30°)").getResult());
Assert.assertEquals("0.524", cm.evaluate(JsclOperation.numeric, "asin(sin(30°))").getResult());
Assert.assertEquals("∂(cos(t), t, t, 1°)", cm.evaluate(JsclOperation.numeric, "∂(cos(t),t,t,1°)").getResult());
Assert.assertEquals("∂(cos(t), t, t, 1°)", cm.evaluate(JsclOperation.simplify, "∂(cos(t),t,t,1°)").getResult());
} finally {
cm.getEngine().setAngleUnits(defaultAngleUnit);
}
}
@Test @Test
public void testLongExecution() throws Exception { public void testLongExecution() throws Exception {
final CalculatorEngine cm = CalculatorEngine.instance; final CalculatorEngine cm = CalculatorEngine.instance;
@ -379,32 +406,4 @@ public class CalculatorEngineTest {
cm.setNumeralBase(defaultNumeralBase); cm.setNumeralBase(defaultNumeralBase);
} }
} }
/* @Test
public void testDegrees() throws Exception {
final CalculatorEngine cm = CalculatorEngine.instance;
final AngleUnit defaultAngleUnit = cm.getEngine().getAngleUnits();
try {
cm.getEngine().setAngleUnits(AngleUnit.rad);
cm.setPrecision(3);
try {
Assert.assertEquals("0.017", cm.evaluate(JsclOperation.numeric, "°"));
fail();
} catch (CalculatorParseException e) {
// ok
}
Assert.assertEquals("0.017", cm.evaluate(JsclOperation.numeric, "1°").getResult());
Assert.assertEquals("0.349", cm.evaluate(JsclOperation.numeric, "20.0°").getResult());
Assert.assertEquals("0.5", cm.evaluate(JsclOperation.numeric, "sin(30°)").getResult());
Assert.assertEquals("0.524", cm.evaluate(JsclOperation.numeric, "asin(sin(30°))").getResult());
Assert.assertEquals("∂(cos(t), t, t, 1°)", cm.evaluate(JsclOperation.numeric, "∂(cos(t),t,t,1°)").getResult());
Assert.assertEquals("∂(cos(t), t, t, 1°)", cm.evaluate(JsclOperation.simplify, "∂(cos(t),t,t,1°)").getResult());
} finally {
cm.getEngine().setAngleUnits(defaultAngleUnit);
}
}*/
} }

18
src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java
View File

@ -58,9 +58,9 @@ public class NumeralBaseTest {
input.add(hex); input.add(hex);
input.add(bin); input.add(bin);
System.out.println("Dec: " + dec); //System.out.println("Dec: " + dec);
System.out.println("Hex: " + hex); //System.out.println("Hex: " + hex);
System.out.println("Bin: " + bin); //System.out.println("Bin: " + bin);
final ExpressionGeneratorWithInput eg = new ExpressionGeneratorWithInput(input, 20); final ExpressionGeneratorWithInput eg = new ExpressionGeneratorWithInput(input, 20);
final List<String> expressions = eg.generate(); final List<String> expressions = eg.generate();
@ -69,18 +69,18 @@ public class NumeralBaseTest {
final String hexExpression = expressions.get(1); final String hexExpression = expressions.get(1);
final String binExpression = expressions.get(2); final String binExpression = expressions.get(2);
System.out.println("Dec expression: " + decExpression); //System.out.println("Dec expression: " + decExpression);
System.out.println("Hex expression: " + hexExpression); //System.out.println("Hex expression: " + hexExpression);
System.out.println("Bin expression: " + binExpression); //System.out.println("Bin expression: " + binExpression);
final String decResult = Expression.valueOf(decExpression).numeric().toString(); final String decResult = Expression.valueOf(decExpression).numeric().toString();
System.out.println("Dec result: " + decResult); //System.out.println("Dec result: " + decResult);
final String hexResult = Expression.valueOf(hexExpression).numeric().toString(); final String hexResult = Expression.valueOf(hexExpression).numeric().toString();
System.out.println("Hex result: " + hexResult); //System.out.println("Hex result: " + hexResult);
final String binResult = Expression.valueOf(binExpression).numeric().toString(); final String binResult = Expression.valueOf(binExpression).numeric().toString();
System.out.println("Bin result: " + binResult); //System.out.println("Bin result: " + binResult);
Assert.assertEquals("dec-hex: " + decExpression + " : " + hexExpression, decResult, hexResult); Assert.assertEquals("dec-hex: " + decExpression + " : " + hexExpression, decResult, hexResult);
Assert.assertEquals("dec-bin: " + decExpression + " : " + binExpression, decResult, binResult); Assert.assertEquals("dec-bin: " + decExpression + " : " + binExpression, decResult, binResult);