Added SingletonFactory to Android app() Services and added self-healing for after test PASS app crash (#69)

* Added SingletonFactory to Android app() Services and added self-healing for  after test PASS app crash

* Removed unused bracket

---------

Co-authored-by: ivaylo.dimitrov <[email protected]>

Author: Ivaylo996

bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/AppLifecyclePlugin.java

@@ -20,6 +20,7 @@
 import solutions.bellatrix.core.plugins.TimeRecord;
 import solutions.bellatrix.core.utilities.DebugInformation;
 import solutions.bellatrix.core.utilities.PathNormalizer;
+import solutions.bellatrix.core.utilities.SingletonFactory;
 import solutions.bellatrix.web.configuration.WebSettings;
 
 import java.lang.reflect.Method;
@@ -87,9 +88,13 @@ public void postAfterTest(TestResult testResult, TimeRecord timeRecord, Method m
             return;
         }
 
-        if (CURRENT_APP_CONFIGURATION.get().getLifecycle() == Lifecycle.RESTART_ON_FAIL && testResult == TestResult.SUCCESS ) {
-            DriverService.getWrappedAndroidDriver().terminateApp(CURRENT_APP_CONFIGURATION.get().getAppPackage());
-            DriverService.getWrappedAndroidDriver().activateApp(CURRENT_APP_CONFIGURATION.get().getAppPackage());
+        if (CURRENT_APP_CONFIGURATION.get().getLifecycle() == Lifecycle.RESTART_ON_FAIL && testResult == TestResult.SUCCESS) {
+            try {
+                DriverService.getWrappedAndroidDriver().executeScript("window.location");
+            } catch (Exception ex) {
+                shutdownApp();
+            }
+
             return;
         }
 
@@ -105,6 +110,7 @@ public void beforeTestFailed(Exception ex) {
 
     private void shutdownApp() {
         DriverService.close();
+        SingletonFactory.clear();
         PREVIOUS_APP_CONFIGURATION.set(null);
     }
 

bellatrix.android/src/main/java/solutions/bellatrix/android/services/App.java

@@ -15,40 +15,41 @@
 
 import solutions.bellatrix.android.infrastructure.DriverService;
 import solutions.bellatrix.core.infrastructure.BellatrixApp;
+import solutions.bellatrix.core.utilities.SingletonFactory;
 
 public class App implements BellatrixApp {
     private boolean disposed = false;
 
     public AppService appService() {
-        return new AppService();
+        return SingletonFactory.getInstance(AppService.class);
     }
 
     public ComponentCreateService create() {
-        return new ComponentCreateService();
+        return SingletonFactory.getInstance(ComponentCreateService.class);
     }
 
     public ComponentWaitService waitFor() {
-        return new ComponentWaitService();
+        return SingletonFactory.getInstance(ComponentWaitService.class);
     }
 
     public DeviceService device() {
-        return new DeviceService();
+        return SingletonFactory.getInstance(DeviceService.class);
     }
 
     public FileSystemService fileSystem() {
-        return new FileSystemService();
+        return SingletonFactory.getInstance(FileSystemService.class);
     }
 
     public KeyboardService keyboard() {
-        return new KeyboardService();
+        return SingletonFactory.getInstance(KeyboardService.class);
     }
 
     public TouchActionsService touch() {
-        return new TouchActionsService();
+        return SingletonFactory.getInstance(TouchActionsService.class);
     }
 
     public WebServiceFacade web() {
-        return new WebServiceFacade();
+        return SingletonFactory.getInstance(WebServiceFacade.class);
     }
 
     @Override