Skip to content

revert _fix_android_native_source and instance counting #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
KazuCocoa merged 1 commit into from
May 6, 2017
Merged

revert _fix_android_native_source and instance counting #571

KazuCocoa merged 1 commit into from
May 6, 2017

Conversation

@KazuCocoa
Copy link
Member

@KazuCocoa KazuCocoa commented May 6, 2017

ref: Revert xml rewriting now that it's fixed in the server #259

I checked:

  • get_source
  • the following command from 9c4672b
find_element(:uiautomator, 'new UiSelector().className("android.widget.TextView").instance(7)').text # NFC
  • scroll_to since the command use .instance

After reverting with get_source

<?xml version="1.0" encoding="UTF-8"?>
<hierarchy rotation="0">
  <android.widget.FrameLayout index="0" text="" class="android.widget.FrameLayout" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,0][720,1280]" resource-id="" instance="0">
    <android.view.ViewGroup index="0" text="" class="android.view.ViewGroup" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,0][720,1280]" resource-id="android:id/decor_content_parent" instance="0">
      <android.widget.FrameLayout index="0" text="" class="android.widget.FrameLayout" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,48][720,160]" resource-id="android:id/action_bar_container" instance="1">
        <android.view.ViewGroup index="0" text="" class="android.view.ViewGroup" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,48][720,160]" resource-id="android:id/action_bar" instance="1">
          <android.widget.TextView index="0" text="API Demos" class="android.widget.TextView" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[32,77][232,131]" resource-id="" instance="0"/>
        </android.view.ViewGroup>
      </android.widget.FrameLayout>
      <android.widget.FrameLayout index="1" text="" class="android.widget.FrameLayout" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,160][720,1280]" resource-id="android:id/content" instance="2">
        <android.widget.ListView index="0" text="" class="android.widget.ListView" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="true" scrollable="true" long-clickable="false" password="false" selected="false" bounds="[0,160][720,1280]" resource-id="android:id/list" instance="0">
          <android.widget.TextView index="0" text="Access'ibility" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Access'ibility" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,160][720,256]" resource-id="android:id/text1" instance="1"/>
          <android.widget.TextView index="1" text="Accessibility" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Accessibility" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,258][720,354]" resource-id="android:id/text1" instance="2"/>
          <android.widget.TextView index="2" text="Animation" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Animation" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,356][720,452]" resource-id="android:id/text1" instance="3"/>
          <android.widget.TextView index="3" text="App" class="android.widget.TextView" package="io.appium.android.apis" content-desc="App" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,454][720,550]" resource-id="android:id/text1" instance="4"/>
          <android.widget.TextView index="4" text="Content" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Content" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,552][720,648]" resource-id="android:id/text1" instance="5"/>
          <android.widget.TextView index="5" text="Graphics" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Graphics" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,650][720,746]" resource-id="android:id/text1" instance="6"/>
          <android.widget.TextView index="6" text="Media" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Media" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,748][720,844]" resource-id="android:id/text1" instance="7"/>
          <android.widget.TextView index="7" text="NFC" class="android.widget.TextView" package="io.appium.android.apis" content-desc="NFC" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,846][720,942]" resource-id="android:id/text1" instance="8"/>
          <android.widget.TextView index="8" text="OS" class="android.widget.TextView" package="io.appium.android.apis" content-desc="OS" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,944][720,1040]" resource-id="android:id/text1" instance="9"/>
          <android.widget.TextView index="9" text="Preference" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Preference" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,1042][720,1138]" resource-id="android:id/text1" instance="10"/>
          <android.widget.TextView index="10" text="Text" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Text" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,1140][720,1236]" resource-id="android:id/text1" instance="11"/>
          <android.widget.TextView index="11" text="Views" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Views" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,1238][720,1280]" resource-id="android:id/text1" instance="12"/>
        </android.widget.ListView>
      </android.widget.FrameLayout>
    </android.view.ViewGroup>
  </android.widget.FrameLayout>
</hierarchy>

Before reverting with get_source

<?xml version="1.0" encoding="UTF-8"?>
<hierarchy rotation="0">
  <android.widget.FrameLayout index="0" text="" class="android.widget.FrameLayout" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,0][720,1280]" resource-id="" instance="0">
    <android.view.ViewGroup index="0" text="" class="android.view.ViewGroup" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,0][720,1280]" resource-id="android:id/decor_content_parent" instance="0">
      <android.widget.FrameLayout index="0" text="" class="android.widget.FrameLayout" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,48][720,160]" resource-id="android:id/action_bar_container" instance="1">
        <android.view.ViewGroup index="0" text="" class="android.view.ViewGroup" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,48][720,160]" resource-id="android:id/action_bar" instance="1">
          <android.widget.TextView index="0" text="API Demos" class="android.widget.TextView" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[32,77][232,131]" resource-id="" instance="0"/>
        </android.view.ViewGroup>
      </android.widget.FrameLayout>
      <android.widget.FrameLayout index="1" text="" class="android.widget.FrameLayout" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,160][720,1280]" resource-id="android:id/content" instance="2">
        <android.widget.ListView index="0" text="" class="android.widget.ListView" package="io.appium.android.apis" content-desc="" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="true" scrollable="true" long-clickable="false" password="false" selected="false" bounds="[0,160][720,1280]" resource-id="android:id/list" instance="0">
          <android.widget.TextView index="0" text="Access'ibility" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Access'ibility" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,160][720,256]" resource-id="android:id/text1" instance="1"/>
          <android.widget.TextView index="1" text="Accessibility" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Accessibility" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,258][720,354]" resource-id="android:id/text1" instance="2"/>
          <android.widget.TextView index="2" text="Animation" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Animation" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,356][720,452]" resource-id="android:id/text1" instance="3"/>
          <android.widget.TextView index="3" text="App" class="android.widget.TextView" package="io.appium.android.apis" content-desc="App" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,454][720,550]" resource-id="android:id/text1" instance="4"/>
          <android.widget.TextView index="4" text="Content" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Content" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,552][720,648]" resource-id="android:id/text1" instance="5"/>
          <android.widget.TextView index="5" text="Graphics" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Graphics" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,650][720,746]" resource-id="android:id/text1" instance="6"/>
          <android.widget.TextView index="6" text="Media" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Media" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,748][720,844]" resource-id="android:id/text1" instance="7"/>
          <android.widget.TextView index="7" text="NFC" class="android.widget.TextView" package="io.appium.android.apis" content-desc="NFC" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,846][720,942]" resource-id="android:id/text1" instance="8"/>
          <android.widget.TextView index="8" text="OS" class="android.widget.TextView" package="io.appium.android.apis" content-desc="OS" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,944][720,1040]" resource-id="android:id/text1" instance="9"/>
          <android.widget.TextView index="9" text="Preference" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Preference" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,1042][720,1138]" resource-id="android:id/text1" instance="10"/>
          <android.widget.TextView index="10" text="Text" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Text" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,1140][720,1236]" resource-id="android:id/text1" instance="11"/>
          <android.widget.TextView index="11" text="Views" class="android.widget.TextView" package="io.appium.android.apis" content-desc="Views" checkable="false" checked="false" clickable="true" enabled="true" focusable="false" focused="false" scrollable="false" long-clickable="false" password="false" selected="false" bounds="[0,1238][720,1280]" resource-id="android:id/text1" instance="12"/>
        </android.widget.ListView>
      </android.widget.FrameLayout>
    </android.view.ViewGroup>
  </android.widget.FrameLayout>
</hierarchy>

@KazuCocoa
Copy link
Member Author

KazuCocoa commented May 6, 2017

get_android_inspect also works fine.

=> "\nandroid.view.ViewGroup\n id: android:id/decor_content_parent\n\nandroid.widget.FrameLayout\n id: android:id/action_bar_container\n\nandroid.view.ViewGroup\n id: android:id/action_bar\n\nandroid.widget.TextView\n text: API Demos\n strings.xml: activity_sample_code\n\nandroid.widget.FrameLayout\n id: android:id/content\n\nandroid.widget.ListView\n id: android:id/list\n\nandroid.widget.TextView\n text, desc: Access'ibility\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: Accessibility\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: Animation\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: App\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: Content\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: Graphics\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: Media\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: NFC\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: OS\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: Preference\n id: android:id/text1\n\nandroid.widget.TextView\n text, desc: Text\n id: android:id/text1\n strings.xml: autocomplete_3_button_7\n\nandroid.widget.TextView\n text, desc: Views\n id: android:id/text1\n"

@KazuCocoa KazuCocoa merged commit 27e10f8 into appium:master May 6, 2017
@KazuCocoa KazuCocoa deleted the revert_xml_rewriting branch May 6, 2017 08:27
@KazuCocoa KazuCocoa mentioned this pull request May 13, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@KazuCocoa