diff --git a/libs/perfecto_libs/android_lib.py b/libs/perfecto_libs/android_lib.py index fff941e33..ee55ad8ca 100644 --- a/libs/perfecto_libs/android_lib.py +++ b/libs/perfecto_libs/android_lib.py @@ -1388,7 +1388,7 @@ def get_ip_address_and(request, WifiName, WifiPass, setup_perfectoMobile, connDa # -----------------To Open Connections page----------------------- try: print("Verifying Connected Wifi Connection") - report.step_start("Click Network & internet") + report.step_start("Click Network & internet in pixel4") connElement = driver.find_element_by_xpath("//*[@text='Network & internet']") connElement.click() @@ -1465,18 +1465,18 @@ def get_ip_address_and(request, WifiName, WifiPass, setup_perfectoMobile, connDa additional_details_element = driver.find_element_by_xpath( "//*[@resource-id='com.android.settings:id/settings_button_no_background']") additional_details_element.click() - try: - check_if_no_internet_popup(driver) - forget_ssid = driver.find_element_by_xpath( - "//*[@resource-id='com.android.settings:id/button1']") - forget_ssid.click() - print("Forget old ssid") - except: - print("Couldn't forget ssid") - closeApp(connData["appPackage-android"], setup_perfectoMobile) - return ip_address_element_text, ssid_with_internet except: print("Couldn't get into additional details") + try: + check_if_no_internet_popup(driver) + forget_ssid = driver.find_element_by_xpath( + "//*[@resource-id='com.android.settings:id/button1']") + forget_ssid.click() + print("Forget old ssid") + except: + print("Couldn't forget ssid") + closeApp(connData["appPackage-android"], setup_perfectoMobile) + return ip_address_element_text, ssid_with_internet except: print("No Connected SSIDS") # ----------------------This is to Forget current connected SSID-------------------------------- @@ -1534,8 +1534,9 @@ def get_ip_address_and(request, WifiName, WifiPass, setup_perfectoMobile, connDa try: check_if_no_internet_popup(driver) report.step_start("Set Wifi Password") + print("Entering password") wifiPasswordElement = driver.find_element_by_xpath( - "//*[@resource-id='com.android.settings:id/edittext']") + "//*[@resource-id='com.android.settings:id/password']") wifiPasswordElement.send_keys(WifiPass) except NoSuchElementException: print("Password Page Not Loaded, password May be cached in the System") @@ -1593,25 +1594,37 @@ def get_ip_address_and(request, WifiName, WifiPass, setup_perfectoMobile, connDa # ------------------------------------------------------- try: print("Into additional details") - time.sleep(2) + time.sleep(5) + report.step_start("Going for ip address") additional_details_element = driver.find_element_by_xpath( "//*[@resource-id='com.android.settings:id/settings_button_no_background']") additional_details_element.click() + print("Entered ssid") try: - time.sleep(2) - advanced_element = driver.find_element_by_xpath( - "//*[@text='Advanced']") - advanced_element.text.click() + time.sleep(10) + print("clicking Advanced") + report.step_start("clicking Advanced") + advanced_element = driver.find_element_by_xpath("//*[@text='Advanced']") + advanced_element.click() + print("clicked Advanced") #print("Device IP address is :", ip_address_element_text) except: try: - time.sleep(2) + time.sleep(5) + print("clicking Advanced2") advanced_element = driver.find_element_by_xpath( - "//*[@resource-id='com.android.settings:id/recycler_view']/android.widget.LinearLayout[5]") - advanced_element.text.click() + "//*[@resource-id='com.android.settings:id/recycler_view']/android.widget.FrameLayout[2]/android.widget.LinearLayout[1]/android.widget.RelativeLayout[1]") + advanced_element.click() #print("Device IP address is :", ip_address_element_text) except: - print("No advanced options") + try: + time.sleep(5) + print("clicking Advanced2") + advanced_element = driver.find_element_by_xpath( + "//*[@resource-id='com.android.settings:id/recycler_view']/android.widget.LinearLayout[5]/android.widget.LinearLayout[1]/android.widget.ImageView[1]") + advanced_element.click() + except: + print("No advanced options") # allure.attach(name= body=str("IP address element not found")) # closeApp(connData["appPackage-android"], setup_perfectoMobile) @@ -1912,7 +1925,7 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): # -----------------To Open Connections page----------------------- try: print("Verifying Connected Wifi Connection") - report.step_start("Click Network & internet") + report.step_start("Click Network & internet in pixel4") connElement = driver.find_element_by_xpath("//*[@text='Network & internet']") connElement.click() @@ -1989,18 +2002,18 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): additional_details_element = driver.find_element_by_xpath( "//*[@resource-id='com.android.settings:id/settings_button_no_background']") additional_details_element.click() - try: - check_if_no_internet_popup(driver) - forget_ssid = driver.find_element_by_xpath( - "//*[@resource-id='com.android.settings:id/button1']") - forget_ssid.click() - print("Forget old ssid") - except: - print("Couldn't forget ssid") - closeApp(connData["appPackage-android"], setup_perfectoMobile) - return ssid_with_internet except: print("Couldn't get into additional details") + try: + check_if_no_internet_popup(driver) + forget_ssid = driver.find_element_by_xpath( + "//*[@resource-id='com.android.settings:id/button1']") + forget_ssid.click() + print("Forget old ssid") + except: + print("Couldn't forget ssid") + closeApp(connData["appPackage-android"], setup_perfectoMobile) + return ssid_with_internet except: print("No Connected SSIDS") # ----------------------This is to Forget current connected SSID-------------------------------- @@ -2059,7 +2072,7 @@ def wifi_connect(request, WifiName, WifiPass, setup_perfectoMobile, connData): check_if_no_internet_popup(driver) report.step_start("Set Wifi Password") wifiPasswordElement = driver.find_element_by_xpath( - "//*[@resource-id='com.android.settings:id/edittext']") + "//*[@resource-id='com.android.settings:id/password']") wifiPasswordElement.send_keys(WifiPass) except NoSuchElementException: print("Password Page Not Loaded, password May be cached in the System") @@ -2258,7 +2271,7 @@ def wifi_disconnect_and_forget(request, WifiName, WifiPass, setup_perfectoMobile except NoSuchElementException: print("Exception: Verify Xpath - Update/check Xpath for Click Connections") # -----------------To Open Connections page--------------------------- - else: + else:#-----------------------Pixel4 code------------------------- report.step_start("Set Wifi Network to " + WifiName) # -----------------To Open Connections page-----------------------