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

number formatting

Browse Source
This commit is contained in:
serso
2011-12-15 12:45:15 +04:00
parent 9ab192abaa
commit 30a79b5025
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java
View File

@@ -84,8 +84,8 @@ public class TextHighlighterTest {
Assert.assertEquals("<b>0x:</b>6F", textHighlighter.process("0x:6F.B").toString());
Assert.assertEquals("<b>0x:</b>6F", textHighlighter.process("0x:006F.B").toString());
Assert.assertEquals("<b>0x:</b>0", textHighlighter.process("0x:0").toString());
Assert.assertEquals("<b>0x:</b>FF33233FFE", textHighlighter.process("0x:FF33233FFE").toString());
Assert.assertEquals("<b>0x:</b>FF33233FFE", textHighlighter.process("0x:FF33 233 FFE").toString());
Assert.assertEquals("<b>0x:</b>FF 33 23 3F FE", textHighlighter.process("0x:FF33233FFE").toString());
Assert.assertEquals("<b>0x:</b>FF 33 23 3F FE", textHighlighter.process("0x:FF33 233 FFE").toString());
final MathEngine me = CalculatorEngine.instance.getEngine();
try {
@@ -104,25 +104,25 @@ public class TextHighlighterTest {
me.setNumeralBase(NumeralBase.dec);
}
Assert.assertEquals("<b>0b:</b>110101", textHighlighter.process("0b:110101").toString());
Assert.assertEquals("<b>0b:</b>110101", textHighlighter.process("0b:110101.").toString());
Assert.assertEquals("<b>0b:</b>110101", textHighlighter.process("0b:110101.101").toString());
Assert.assertEquals("<b>0b:</b>11010100", textHighlighter.process("0b:11010100.1").toString());
Assert.assertEquals("<b>0b:</b>110101", textHighlighter.process("0b:110101.0").toString());
Assert.assertEquals("<b>0b:</b>11 0101", textHighlighter.process("0b:110101").toString());
Assert.assertEquals("<b>0b:</b>11 0101", textHighlighter.process("0b:110101.").toString());
Assert.assertEquals("<b>0b:</b>11 0101", textHighlighter.process("0b:110101.101").toString());
Assert.assertEquals("<b>0b:</b>1101 0100", textHighlighter.process("0b:11010100.1").toString());
Assert.assertEquals("<b>0b:</b>11 0101", textHighlighter.process("0b:110101.0").toString());
Assert.assertEquals("<b>0b:</b>0", textHighlighter.process("0b:0").toString());
Assert.assertEquals("<b>0b:</b>1010100101111010101001", textHighlighter.process("0b:1010100101111010101001").toString());
Assert.assertEquals("<b>0b:</b>1010100101111010101001", textHighlighter.process("0b:101 010 01 0 111 1 0 10101001").toString());
Assert.assertEquals("<b>0b:</b>10 1010 0101 1110 1010 1001", textHighlighter.process("0b:1010100101111010101001").toString());
Assert.assertEquals("<b>0b:</b>10 1010 0101 1110 1010 1001", textHighlighter.process("0b:101 010 01 0 111 1 0 10101001").toString());
try {
me.setNumeralBase(NumeralBase.bin);
Assert.assertEquals("110101", textHighlighter.process("110101").toString());
Assert.assertEquals("110101", textHighlighter.process("110101.").toString());
Assert.assertEquals("110101", textHighlighter.process("110101.101").toString());
Assert.assertEquals("11010100", textHighlighter.process("11010100.1").toString());
Assert.assertEquals("110101", textHighlighter.process("110101.0").toString());
Assert.assertEquals("11 0101", textHighlighter.process("110101").toString());
Assert.assertEquals("11 0101", textHighlighter.process("110101.").toString());
Assert.assertEquals("11 0101", textHighlighter.process("110101.101").toString());
Assert.assertEquals("1101 0100", textHighlighter.process("11010100.1").toString());
Assert.assertEquals("11 0101", textHighlighter.process("110101.0").toString());
Assert.assertEquals("0", textHighlighter.process("0").toString());
Assert.assertEquals("1010100101111010101001", textHighlighter.process("1010100101111010101001").toString());
Assert.assertEquals("1010100101111010101001", textHighlighter.process("101 010 01 0 111 1 0 10101001").toString());
Assert.assertEquals("10 1010 0101 1110 1010 1001", textHighlighter.process("1010100101111010101001").toString());
Assert.assertEquals("10 1010 0101 1110 1010 1001", textHighlighter.process("101 010 01 0 111 1 0 10101001").toString());
} finally {
me.setNumeralBase(NumeralBase.dec);
}

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

@@ -388,7 +388,7 @@ public class CalculatorEngineTest {
}
cm.getEngine().setNumeralBase(NumeralBase.hex);
Assert.assertEquals("637B", cm.evaluate(JsclOperation.numeric, "56CE+CAD").getResult());
Assert.assertEquals("63 7B", cm.evaluate(JsclOperation.numeric, "56CE+CAD").getResult());
Assert.assertEquals("E", cm.evaluate(JsclOperation.numeric, "E").getResult());
} finally {
cm.setNumeralBase(defaultNumeralBase);

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

@@ -66,7 +66,7 @@ public class FromJsclSimplifyTextProcessorTest {
Assert.assertEquals("20x", tp.process("20x"));
Assert.assertEquals("2×0x3", tp.process("2*0x3"));
Assert.assertEquals("2×0x:3", tp.process("2*0x:3"));
Assert.assertEquals("0x:3000000", tp.process("0x:3 000 000.00000000000001"));
Assert.assertEquals("0x:3 00 00 00", tp.process("0x:3 000 000.00000000000001"));
}
}