test + layout
This commit is contained in:
parent
fe812c4225
commit
ca7d84151b
@ -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>
|
||||
|
||||
|
@ -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>
|
||||
|
||||
|
@ -366,7 +366,7 @@ public class CalculatorEngineTest {
|
||||
try {
|
||||
cm.evaluate(JsclOperation.numeric, "10/11");
|
||||
fail();
|
||||
} catch (CalculatorParseException e) {
|
||||
} catch (CalculatorEvalException e) {
|
||||
// ok
|
||||
}
|
||||
} finally {
|
||||
|
Loading…
Reference in New Issue
Block a user