Merge pull request #2 from doronz88/refactor/rename-sbservices

SpringBoardServices: Rename relay and add tests

pymobiledevice3/services/mobilebackup2.py

@@ -11,7 +11,7 @@
 from pymobiledevice3.afc import AFCClient
 from pymobiledevice3.services.installation_proxy_service import InstallationProxyService
 from pymobiledevice3.services.notification_proxy_service import *
-from pymobiledevice3.services.sbservices_service import SBServicesService
+from pymobiledevice3.services.springboard_services import SpringBoardServicesService
 from pymobiledevice3.lockdown import LockdownClient
 from pymobiledevice3.services.mobilebackup import MobileBackup
 
@@ -333,7 +333,7 @@ def create_info_plist(self):
                 "Last Backup Date": datetime.datetime.now()}
 
         # Starting SpringBoard service to retrieve icons position
-        self.sbs = SBServicesService(self.lockdown)
+        self.sbs = SpringBoardServicesService(self.lockdown)
         installed_apps = []
         apps_data = {}
         for app_entry in apps:

pymobiledevice3/services/sbservices_service.py → pymobiledevice3/services/springboard_services.py

@@ -8,7 +8,7 @@
 SB_LANDSCAPE_HOME_TO_LEFT = 4
 
 
-class SBServicesService(object):
+class SpringBoardServicesService(object):
     SERVICE_NAME = 'com.apple.springboardservices'
 
     def __init__(self, lockdown: LockdownClient):
@@ -57,8 +57,3 @@ def get_wallpaper_pngdata(self):
         if res:
             return res.get("pngData")
         return None
-
-
-if __name__ == "__main__":
-    s = SBServicesService()
-    print(s.get_icon_pngdata("com.apple.weather"))

tests/services/test_springboard_services_relay.py

@@ -0,0 +1,14 @@
+# -*- coding:utf-8 -*-
+from pymobiledevice3.services.springboard_services import SpringBoardServicesService
+
+PNG_HEADER = b'\x89\x50\x4e\x47\x0d\x0a\x1a\x0a'
+
+
+def test_get_icon_png_data(lockdown):
+    """
+    Test that getting icon's data returns a valid PNG.
+    :param pymobiledevice3.lockdown.LockdownClient lockdown: Lockdown client.
+    """
+    springboard = SpringBoardServicesService(lockdown)
+    icon_data = springboard.get_icon_pngdata("com.apple.weather")
+    assert icon_data.startswith(PNG_HEADER)

tests/services/test_syslog_relay.py

@@ -24,8 +24,8 @@ def test_logs_watching_time(lockdown):
     :param pymobiledevice3.lockdown.LockdownClient lockdown: Lockdown client.
     """
     syslog_service = SyslogService(lockdown)
-    first_log = next(syslog_service.watch())
+    first_log = next(syslog_service.watch()).decode()
     time.sleep(2)
     syslog_service = SyslogService(lockdown)
-    second_log = next(syslog_service.watch())
+    second_log = next(syslog_service.watch()).decode()
     assert extract_log_time(first_log) < extract_log_time(second_log)