Fix: Fixed and improved Unit Tests

Signed-off-by: Meddy Menzikoff <m.menzikoff@oneclickflare.fr>
eclipse-keyple · Feb 27, 2020 · fcae6a3 · fcae6a3
1 parent 103a161
commit fcae6a3
Show file tree

Hide file tree

Showing 12 changed files with 498 additions and 783 deletions.
diff --git a/android/keyple-plugin/android-nfc/build.gradle b/android/keyple-plugin/android-nfc/build.gradle
@@ -41,7 +41,10 @@ android {
     }
 
     testOptions {
-        unitTests.returnDefaultValues = true//mock Log Android object
+        unitTests {
+            returnDefaultValues = true//mock Log Android object
+            includeAndroidResources = true
+        }
     }
 
 
@@ -223,16 +226,13 @@ dependencies {
     /*
     Tests
      */
+    /** Test **/
+    testImplementation "junit:junit:4.12"
 
-    testImplementation "junit:junit:${junit_version}"
-
-    /**Power mock**/
-    androidTestImplementation "org.mockito:mockito-android:${mockito_android_version}"
-    androidTestImplementation "org.powermock:powermock-api-mockito:${powermock_version}"
-    androidTestImplementation "org.powermock:powermock-module-junit4:${powermock_version}"
+    /** Mocking for tests **/
+    testImplementation "io.mockk:mockk:1.9"
 
-    testImplementation "org.powermock:powermock-api-mockito:${powermock_version}"
-    testImplementation "org.powermock:powermock-module-junit4:${powermock_version}"
-    /**End of power mock **/
+    /** Allow to use Android SDK in JVM */
+    testImplementation 'org.robolectric:robolectric:4.3.1'
 
 }
diff --git a/...n/android-nfc/src/main/java/org/eclipse/keyple/plugin/android/nfc/AndroidNfcFragment.java b/...n/android-nfc/src/main/java/org/eclipse/keyple/plugin/android/nfc/AndroidNfcFragment.java
diff --git a/...android-nfc/src/main/kotlin/org/eclipse/keyple/plugin/android/nfc/AndroidNfcReaderImpl.kt b/...android-nfc/src/main/kotlin/org/eclipse/keyple/plugin/android/nfc/AndroidNfcReaderImpl.kt
@@ -11,12 +11,10 @@
  ********************************************************************************/
 package org.eclipse.keyple.plugin.android.nfc
 
-import android.annotation.TargetApi
 import android.app.Activity
 import android.content.Intent
 import android.nfc.NfcAdapter
 import android.nfc.Tag
-import android.os.Build
 import android.os.Bundle
 import org.eclipse.keyple.core.seproxy.exception.KeypleChannelControlException
 import org.eclipse.keyple.core.seproxy.exception.KeypleIOReaderException
@@ -204,16 +202,16 @@ internal object AndroidNfcReaderImpl : AbstractObservableLocalReader(AndroidNfcR
         }
     }
 
-    @TargetApi(24)
-    private fun addRemovedListener(tag: Tag?) {
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            nfcAdapter?.ignore(tag, 1000, {
-                Timber.i("Tag Proxy removed")
-                tagProxy = null
-            }, null)
-        }
-    }
+//    @TargetApi(24)
+//    private fun addRemovedListener(tag: Tag?) {
+//
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+//            nfcAdapter?.ignore(tag, 1000, {
+//                Timber.i("Tag Proxy removed")
+//                tagProxy = null
+//            }, null)
+//        }
+//    }
 
     /**
      *

diff --git a/android/keyple-plugin/android-nfc/src/test/assets/logback.xml b/android/keyple-plugin/android-nfc/src/test/assets/logback.xml
diff --git a/...android-nfc/src/test/java/org/eclipse/keyple/plugin/android/nfc/AndroidNfcPluginTest.java b/...android-nfc/src/test/java/org/eclipse/keyple/plugin/android/nfc/AndroidNfcPluginTest.java