gametel 0.1 → 0.2

data/.gitignore

@@ -2,6 +2,8 @@
 *.rbc
 *.swp
 *.class
+*.cache
+*.d
 .bundle
 .config
 .yardoc
@@ -20,6 +22,5 @@ tmp
 Test.apk
 results
 ApiDemos/gen
-ApiDemos/bin/classes
-ApiDemos/bin/res
-ApiDemos/bin/classes.dex
+ApiDemos/bin
+test_servers

data/ApiDemos/res/layout/buttons_1.xml

@@ -41,6 +41,12 @@
             android:text="@string/buttons_1_toggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
+        
+        <Button android:id="@+id/button_disabled"
+            android:text="Disabled"
+            android:enabled="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
             
     </LinearLayout>
     

data/ApiDemos/res/layout/controls_1.xml

@@ -47,6 +47,7 @@
         android:layout_height="wrap_content">
 
         <EditText android:id="@+id/edit"
+            android:contentDescription="@string/controls_1_edit_desc"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 

data/ApiDemos/res/values/strings.xml

@@ -968,6 +968,7 @@
     <string name="baseline_7_lean">Slim and slick.</string>
     <string name="baseline_nested_1_label">label</string>
     <string name="controls_1_save">Save</string>
+    <string name="controls_1_edit_desc">Edit Description</string>
     <string name="controls_1_checkbox_1">Checkbox 1</string>
     <string name="controls_1_checkbox_2">Checkbox 2</string>
     <string name="controls_1_radiobutton_1">RadioButton 1</string>

data/ApiDemos/src/com/example/android/apis/accessibility/ClockBackActivity.java

@@ -46,7 +46,6 @@ public class ClockBackActivity extends Activity {
         // Add a shortcut to the accessibility settings.
         ImageButton button = (ImageButton) findViewById(R.id.button);
         button.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 startActivity(sSettingsIntent);
             }

data/ApiDemos/src/com/example/android/apis/accessibility/TaskBackService.java

@@ -168,7 +168,6 @@ public class TaskBackService extends AccessibilityService implements OnInitListe
     /**
      * {@inheritDoc}
      */
-    @Override
     public void onInit(int status) {
         // Set a flag so that the TaskBackService knows that the Text-To-Speech
         // engine has been initialized, and can now handle speaking requests.

data/ApiDemos/src/com/example/android/apis/accessibility/TaskListActivity.java

@@ -50,7 +50,6 @@ public class TaskListActivity extends ListActivity {
         // Add a shortcut to the accessibility settings.
         ImageButton button = (ImageButton) findViewById(R.id.button);
         button.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 startActivity(sSettingsIntent);
             }

data/ApiDemos/src/com/example/android/apis/accessibility/TaskListView.java

@@ -75,7 +75,6 @@ final class TaskAdapter extends BaseAdapter{
         mCheckboxes = checkboxes;
     }
 
-    @Override
     public int getCount() {
         return mLabels.length;
     }
@@ -83,7 +82,6 @@ final class TaskAdapter extends BaseAdapter{
     /** Expands the views for individual list entries, and sets content descriptions for use by the
      *  TaskBackAccessibilityService.
      */
-    @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         if(convertView == null) {
             LayoutInflater inflater = LayoutInflater.from(mContext);
@@ -107,12 +105,10 @@ final class TaskAdapter extends BaseAdapter{
         return convertView;
     }
 
-    @Override
     public Object getItem(int position) {
         return mLabels[position];
     }
 
-    @Override
     public long getItemId(int position) {
         return position;
     }

data/ApiDemos/src/com/example/android/apis/app/ActionBarSettingsActionProviderActivity.java

@@ -90,7 +90,6 @@ public class ActionBarSettingsActionProviderActivity extends Activity {
             ImageButton button = (ImageButton) view.findViewById(R.id.button);
             // Attach a click listener for launching the system settings.
             button.setOnClickListener(new View.OnClickListener() {
-                @Override
                 public void onClick(View v) {
                     mContext.startActivity(sSettingsIntent);
                 }

data/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java

@@ -194,7 +194,6 @@ public class DeviceAdminSample extends PreferenceActivity {
             }
         }
 
-        @Override
         public boolean onPreferenceClick(Preference preference) {
             if (mSetPassword != null && preference == mSetPassword) {
                 Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
@@ -204,7 +203,6 @@ public class DeviceAdminSample extends PreferenceActivity {
             return false;
         }
 
-        @Override
         public boolean onPreferenceChange(Preference preference, Object newValue) {
             if (mResetPassword != null && preference == mResetPassword) {
                 doResetPassword((String)newValue);
@@ -717,7 +715,6 @@ public class DeviceAdminSample extends PreferenceActivity {
             builder.setMessage(R.string.wipe_warning_first);
             builder.setPositiveButton(R.string.wipe_warning_first_ok,
                     new DialogInterface.OnClickListener() {
-                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(activity);
                     if (wipeAllData) {
@@ -727,7 +724,6 @@ public class DeviceAdminSample extends PreferenceActivity {
                     }
                     builder.setPositiveButton(R.string.wipe_warning_second_ok,
                             new DialogInterface.OnClickListener() {
-                        @Override
                         public void onClick(DialogInterface dialog, int which) {
                             boolean stillActive = mActivity.isActiveAdmin();
                             if (stillActive) {

data/ApiDemos/src/com/example/android/apis/app/LoaderCursor.java

@@ -110,7 +110,7 @@ public class LoaderCursor extends Activity {
             return true;
         }
 
-        @Override public boolean onQueryTextSubmit(String query) {
+        public boolean onQueryTextSubmit(String query) {
             // Don't care about this.
             return true;
         }

data/ApiDemos/src/com/example/android/apis/app/LoaderCustom.java

@@ -148,7 +148,6 @@ public class LoaderCustom extends Activity {
      */
     public static final Comparator<AppEntry> ALPHA_COMPARATOR = new Comparator<AppEntry>() {
         private final Collator sCollator = Collator.getInstance();
-        @Override
         public int compare(AppEntry object1, AppEntry object2) {
             return sCollator.compare(object1.getLabel(), object2.getLabel());
         }
@@ -437,7 +436,7 @@ public class LoaderCustom extends Activity {
             item.setActionView(sv);
         }
 
-        @Override public boolean onQueryTextChange(String newText) {
+        public boolean onQueryTextChange(String newText) {
             // Called when the action bar search text has changed.  Since this
             // is a simple array adapter, we can just have it do the filtering.
             mCurFilter = !TextUtils.isEmpty(newText) ? newText : null;
@@ -445,7 +444,7 @@ public class LoaderCustom extends Activity {
             return true;
         }
 
-        @Override public boolean onQueryTextSubmit(String query) {
+        public boolean onQueryTextSubmit(String query) {
             // Don't care about this.
             return true;
         }
@@ -455,13 +454,13 @@ public class LoaderCustom extends Activity {
             Log.i("LoaderCustom", "Item clicked: " + id);
         }
 
-        @Override public Loader<List<AppEntry>> onCreateLoader(int id, Bundle args) {
+        public Loader<List<AppEntry>> onCreateLoader(int id, Bundle args) {
             // This is called when a new Loader needs to be created.  This
             // sample only has one Loader with no arguments, so it is simple.
             return new AppListLoader(getActivity());
         }
 
-        @Override public void onLoadFinished(Loader<List<AppEntry>> loader, List<AppEntry> data) {
+        public void onLoadFinished(Loader<List<AppEntry>> loader, List<AppEntry> data) {
             // Set the new data in the adapter.
             mAdapter.setData(data);
 
@@ -473,7 +472,7 @@ public class LoaderCustom extends Activity {
             }
         }
 
-        @Override public void onLoaderReset(Loader<List<AppEntry>> loader) {
+        public void onLoaderReset(Loader<List<AppEntry>> loader) {
             // Clear the data in the adapter.
             mAdapter.setData(null);
         }

data/ApiDemos/src/com/example/android/apis/app/VoiceRecognition.java

@@ -184,7 +184,6 @@ public class VoiceRecognition extends Activity implements OnClickListener {
 
             if (getResultCode() != Activity.RESULT_OK) {
                 mHandler.post(new Runnable() {
-                    @Override
                     public void run() {
                         showToast("Error code:" + getResultCode());
                     }
@@ -193,7 +192,6 @@ public class VoiceRecognition extends Activity implements OnClickListener {
 
             if (extra == null) {
                 mHandler.post(new Runnable() {
-                    @Override
                     public void run() {
                         showToast("No extra");
                     }
@@ -203,7 +201,6 @@ public class VoiceRecognition extends Activity implements OnClickListener {
             if (extra.containsKey(RecognizerIntent.EXTRA_SUPPORTED_LANGUAGES)) {
                 mHandler.post(new Runnable() {
 
-                    @Override
                     public void run() {
                         updateSupportedLanguages(extra.getStringArrayList(
                                 RecognizerIntent.EXTRA_SUPPORTED_LANGUAGES));
@@ -214,7 +211,6 @@ public class VoiceRecognition extends Activity implements OnClickListener {
             if (extra.containsKey(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE)) {
                 mHandler.post(new Runnable() {
 
-                    @Override
                     public void run() {
                         updateLanguagePreference(
                                 extra.getString(RecognizerIntent.EXTRA_LANGUAGE_PREFERENCE));

data/ApiDemos/src/com/example/android/apis/content/FileProvider.java

@@ -88,7 +88,6 @@ public class FileProvider extends ContentProvider
         }
     }
 
-    @Override
     public void writeDataToPipe(ParcelFileDescriptor output, Uri uri, String mimeType,
             Bundle opts, InputStream args) {
         // Transfer data from the asset to the pipe the client is reading.

data/ApiDemos/src/com/example/android/apis/view/GameControllerInput.java

@@ -16,33 +16,31 @@
 
 package com.example.android.apis.view;
 
-import com.example.android.apis.R;
+import java.util.ArrayList;
+import java.util.List;
 
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 import android.view.InputDevice;
+import android.view.InputDevice.MotionRange;
 import android.view.InputEvent;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.InputDevice.MotionRange;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
+import com.example.android.apis.R;
 
 
 /**
@@ -76,7 +74,6 @@ public class GameControllerInput extends Activity {
         mSummaryList = (ListView) findViewById(R.id.summary);
         mSummaryList.setAdapter(mSummaryAdapter);
         mSummaryList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 mSummaryAdapter.onItemClick(position);
             }
@@ -368,22 +365,18 @@ public class GameControllerInput extends Activity {
             return true;
         }
 
-        @Override
         public int getCount() {
             return mVisibleItems.size();
         }
 
-        @Override
         public Item getItem(int position) {
             return mVisibleItems.get(position);
         }
 
-        @Override
         public long getItemId(int position) {
             return getItem(position).getItemId();
         }
 
-        @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             return getItem(position).getView(convertView, parent);
         }

data/ApiDemos/src/com/example/android/apis/view/Hover.java

@@ -16,24 +16,16 @@
 
 package com.example.android.apis.view;
 
-import com.example.android.apis.R;
-
 import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
 import android.os.Bundle;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import java.util.ArrayList;
+import com.example.android.apis.R;
 
 
 /**
@@ -73,7 +65,6 @@ public class Hover extends Activity {
 
         View container = findViewById(R.id.container);
         container.setOnHoverListener(new View.OnHoverListener() {
-            @Override
             public boolean onHover(View v, MotionEvent event) {
                 switch (event.getAction()) {
                     case MotionEvent.ACTION_HOVER_ENTER:
@@ -97,7 +88,6 @@ public class Hover extends Activity {
         });
 
         mInterceptCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 mInterceptor.setInterceptHover(isChecked);
             }

data/ApiDemos/src/com/example/android/apis/view/Switches.java

@@ -40,7 +40,6 @@ public class Switches extends Activity implements CompoundButton.OnCheckedChange
         }
     }
 
-    @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
        Toast.makeText(this, "Monitored switch is " + (isChecked ? "on" : "off"),
                Toast.LENGTH_SHORT).show();

data/ChangeLog

@@ -1,2 +1,12 @@
+=== Version 0.2 / 2012-8-14
+* Enhancements
+  * Added the enter method to Gametel module to press the enter key on the device
+  * Added generated method to clear a text view
+  * Added generated method to click a view, button, checkbox or radio by id
+  * Added ability to enter and clear text from a text view identified by id
+  * Added :list locator that can be used with :index locator to select the target list
+  * Renamed the :name locator to :content_description for text so it more accurately reflects what it is doing
+	*	Added support for determining if a view is enabled / disabled
+
 === Version 0.1 / 2012-7-17
 Initial release with very basic support for a few controls

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ### Defining your screen object
 ````ruby
-class LoginScreen
+class LoginPage
   include Gametel
 end
 ````
@@ -49,6 +49,19 @@ on(LoginPage) do |screen|
 end
 ````
 
+## Supported Drivers
+
+### Calabash Android
+
+Sample `features/support/env.rb` file.
+
+````ruby
+require 'calabash-android/cucumber'
+require 'gametel'
+require 'gametel/navigation'
+
+World(Gametel::Navigation)
+````
 
 ## Contributing
 

data/cucumber.yml

@@ -1,6 +1,14 @@
 <%
-std_opts = "PACKAGE_NAME=com.example.android.apis TEST_PACKAGE_NAME=com.example.android.apis.test APP_PATH=/Users/cheezy/dev/gametel/ApiDemos/bin/ApiDemos.apk TEST_APP_PATH=features/support/Test.apk TEST_SERVER_PORT=34777  --no-source --color --format pretty"
+begin
+  puts 'Building the calabash test server...'
+  last_test_apk = 'test_servers/' << Dir.entries("test_servers").last
+rescue
+  `calabash-android build ApiDemos/bin/ApiDemos.apk`
+  retry
+end
+
+std_opts = "PACKAGE_NAME=com.example.android.apis TEST_PACKAGE_NAME=com.example.android.apis.test APP_PATH=./ApiDemos/bin/ApiDemos.apk TEST_APP_PATH=#{last_test_apk} TEST_SERVER_PORT=34777  --no-source --color --format pretty"
 %>
 
-default: <%= std_opts %>
+default: <%= std_opts %> --tags ~@ignore
 focus: <%= std_opts %> --tags @focus

data/features/button.feature

@@ -8,6 +8,11 @@ Feature: Interacting with buttons
     Given I'm on the buttons screen
     Then I should be able to click the button by "index"
 
+  Scenario: Should be able to click a button by id
+    Given I'm on the buttons screen
+    When I click the on/off button by "id"
+    Then I should see the text "ON" on the screen
+
   Scenario: Should be able to click a toggle button
     Given I'm on the buttons screen
     When I click the on/off button

data/features/checkbox.feature

@@ -7,3 +7,7 @@ Feature:  Interacting with checkboxes
   Scenario: Clicking on a checkbox by text
     Given I'm on the controls screen
     Then I should be able to click a checkbox by "text"
+
+  Scenario: Clicking a checkbox by id
+    Given I'm on the controls screen
+    Then I should be able to click a checkbox by "id"