refactored library, no setup needed

Author: Severi Haverila

example/src/test/java/AndroidSample.java

@@ -33,7 +33,6 @@ public AndroidSample() throws Exception {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        ImageRecognition.setUp();
         driver = getAndroidDriver();
     }
 

example/src/test/java/iOSSample.java

@@ -30,7 +30,6 @@ public iOSSample() throws Exception {
 
     @BeforeClass
     public static void setUp() throws Exception {
-        ImageRecognition.setUp();
         driver = getIOSDriver();
     }
 
@@ -56,7 +55,7 @@ public void mainPageTest() throws Exception {
         }
 
         findAndCropImage("test.png");
-        //        waitForImageToDisappearFromScreen("bitbar_logo.png");
         log("Success.");
     }
+    
 }

library/src/main/java/imagerecognition/AkazeImageFinder.java

@@ -377,16 +377,13 @@ private String runAkazeMatch(String object_filename, String scene_filename) thro
     }
 
     protected static void setupOpenCVEnv() {
-        String platformName = System.getProperty("os.name");
-        logger.info(platformName);
-        if (platformName.toLowerCase().contains("mac")) {
-            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/mac/opencv");
-        } else if (platformName.toLowerCase().contains("win")) {
-            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/win/opencv");
-        } else {
-            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/linux/opencv/java7");
-        }
+        addOpenCvToJavaLibraryPath();
+        setSysPathAccessible();
+        logger.info("java.library.path: " + System.getProperty("java.library.path"));
+        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+    }
 
+    private static void setSysPathAccessible() {
         Field fieldSysPath = null;
         try {
             fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
@@ -398,8 +395,18 @@ protected static void setupOpenCVEnv() {
             fieldSysPath.set(null, null);
         } catch (IllegalAccessException e) {
         }
-        logger.info("java.library.path: " + System.getProperty("java.library.path"));
-        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+    }
+
+    private static void addOpenCvToJavaLibraryPath() {
+        String platformName = System.getProperty("os.name");
+        logger.info(platformName);
+        if (platformName.toLowerCase().contains("mac")) {
+            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/mac/opencv");
+        } else if (platformName.toLowerCase().contains("win")) {
+            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/win/opencv");
+        } else {
+            System.setProperty("java.library.path", System.getProperty("java.library.path") + File.pathSeparator + System.getProperty("user.dir") + "/lib/linux/opencv/java7");
+        }
     }
 
     private JSONObject getJsonObject(String filename) {

library/src/main/java/imagerecognition/ImageRecognition.java

@@ -26,7 +26,7 @@ private static void log(String message) {
         logger.info(message);
     }
 
-    public static void setUp(){
+    static {
         AkazeImageFinder.setupOpenCVEnv();
     }