test + layout

This commit is contained in:
serso 2011-12-08 14:19:57 +04:00
parent fe812c4225
commit ca7d84151b
3 changed files with 5 additions and 5 deletions

View File

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

View File

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

View File

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