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

Version update + test fixed

Browse Source
This commit is contained in:
Sergey Solovyev
2012-11-18 01:33:24 +04:00
parent e1727bc23e
commit 5d82657274
5 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/AndroidCalculatorEngineTest.java
View File

@@ -207,10 +207,10 @@ public class AndroidCalculatorEngineTest extends AbstractCalculatorTest {
try {
cm.setNumeralBase(NumeralBase.hex);
CalculatorTestUtils.assertEval("E/F", "0x:E/0x:F");
CalculatorTestUtils.assertEval("E/F", cm.simplify( "0x:E/0x:F"));
CalculatorTestUtils.assertEval("E/F", "E/F");
CalculatorTestUtils.assertEval("E/F", cm.simplify( "E/F"));
CalculatorTestUtils.assertEval("0.EE E", "0x:E/0x:F");
CalculatorTestUtils.assertEval("0.EE E", cm.simplify( "0x:E/0x:F"));
CalculatorTestUtils.assertEval("0.EE E", "E/F");
CalculatorTestUtils.assertEval("0.EE E", cm.simplify( "E/F"));
} finally {
cm.setNumeralBase(NumeralBase.dec);
}
@@ -396,7 +396,7 @@ public class AndroidCalculatorEngineTest extends AbstractCalculatorTest {
try{
cm.setNumeralBase(NumeralBase.bin);
CalculatorTestUtils.assertEval("101", "10+11");
CalculatorTestUtils.assertEval("10/11", "10/11");
CalculatorTestUtils.assertEval("0.101", "10/11");
cm.setNumeralBase(NumeralBase.hex);
CalculatorTestUtils.assertEval("63 7B", "56CE+CAD");

7
calculatorpp-core/src/test/java/org/solovyev/android/calculator/model/FunctionsTest.java
View File

@@ -6,9 +6,11 @@ import org.hamcrest.Description;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.core.Persister;
import org.solovyev.android.calculator.CalculatorTestUtils;
import org.solovyev.common.equals.CollectionEqualizer;
import org.solovyev.common.equals.EqualsUtils;
import org.solovyev.common.text.StringUtils;
@@ -58,6 +60,11 @@ public class FunctionsTest {
" </functions>\n" +
"</functions>";
@Before
public void setUp() throws Exception {
CalculatorTestUtils.staticSetUp();
}
@Test
public void testXml() throws Exception {
final Functions in = new Functions();