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

test + layout

Browse Source
This commit is contained in:
Sergey Solovyev 2011-12-08 14:19:57 +04:00
parent 174b3ca593
commit 10372842e7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout-port/main_calculator.xml
View File

@ -40,7 +40,7 @@
<include layout="@layout/calc_eight_digit_button"/> <include layout="@layout/calc_eight_digit_button"/>
<include layout="@layout/calc_nine_digit_button"/> <include layout="@layout/calc_nine_digit_button"/>
<include layout="@layout/calc_multiplication_button"/> <include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_erase_button"/> <include layout="@layout/calc_clear_button"/>
</LinearLayout> </LinearLayout>
@ -50,7 +50,7 @@
<include layout="@layout/calc_five_digit_button"/> <include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/> <include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_division_button"/> <include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_clear_button"/> <include layout="@layout/calc_erase_button"/>
</LinearLayout> </LinearLayout>

4
res/layout-port/main_cellphone.xml
View File

@ -34,7 +34,7 @@
<include layout="@layout/calc_two_digit_button"/> <include layout="@layout/calc_two_digit_button"/>
<include layout="@layout/calc_three_digit_button"/> <include layout="@layout/calc_three_digit_button"/>
<include layout="@layout/calc_multiplication_button"/> <include layout="@layout/calc_multiplication_button"/>
<include layout="@layout/calc_erase_button"/> <include layout="@layout/calc_clear_button"/>
</LinearLayout> </LinearLayout>
@ -44,7 +44,7 @@
<include layout="@layout/calc_five_digit_button"/> <include layout="@layout/calc_five_digit_button"/>
<include layout="@layout/calc_six_digit_button"/> <include layout="@layout/calc_six_digit_button"/>
<include layout="@layout/calc_division_button"/> <include layout="@layout/calc_division_button"/>
<include layout="@layout/calc_clear_button"/> <include layout="@layout/calc_erase_button"/>
</LinearLayout> </LinearLayout>

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

@ -366,7 +366,7 @@ public class CalculatorEngineTest {
try { try {
cm.evaluate(JsclOperation.numeric, "10/11"); cm.evaluate(JsclOperation.numeric, "10/11");
fail(); fail();
} catch (CalculatorParseException e) { } catch (CalculatorEvalException e) {
// ok // ok
} }
} finally { } finally {