Browse files

fix tests

  • Loading branch information...
1 parent 4bf64f7 commit 530260ffad2f241e6354b4560b0918063198b554 @Xlythe committed Feb 20, 2013
@@ -198,7 +198,7 @@
<string name="cling_matrix_title">Matrices</string>
<string name="cling_matrix_msg">Tap here to start building and solving matrices.</string>
<string name="cling_hex_title">Change bases</string>
- <string name="cling_hex_msg">Change between decimal (dec), binary (bin), and hexadecimal (hex).\n\nIf you believe Calculator is giving wrong results, make sure decimal is selected.</string>
+ <string name="cling_hex_msg">Switch between decimal (dec), binary (bin), and hexadecimal (hex).\n\nWarning: If you believe you're getting bad results, you're probably in the wrong base. The default is decimal.</string>
<string name="cling_graph_title">Graph</string>
<string name="cling_graph_msg">Graphs will automatically show up here. Go to the advanced panel and build a function using X and Y.</string>
<string name="cling_dismiss">OK</string>
@@ -21,7 +21,7 @@
import android.content.Intent;
import android.content.IntentFilter;
-import android.test.ActivityInstrumentationTestCase;
+import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.util.Log;
import android.view.KeyEvent;
@@ -34,14 +34,14 @@
import com.android2.calculator3.Calculator;
import com.android2.calculator3.R;
-import com.android2.calculator3.CalculatorDisplay;
+import com.android2.calculator3.view.CalculatorDisplay;
* Instrumentation tests for poking some buttons
-public class CalculatorHitSomeButtons extends ActivityInstrumentationTestCase <Calculator>{
+public class CalculatorHitSomeButtons extends ActivityInstrumentationTestCase2 <Calculator>{
public boolean setup = false;
private static final String TAG = "CalculatorTests";
Calculator mActivity = null;
@@ -131,10 +131,7 @@ private String displayVal() {
CalculatorDisplay display = (CalculatorDisplay) mActivity.findViewById(;
- EditText box = (EditText) display.getCurrentView();
- assertNotNull(box);
- return box.getText().toString();
+ return display.getText();

0 comments on commit 530260f

Please sign in to comment.