From bee4342a3f4291abaf96ebaa9db98b7145df7d03 Mon Sep 17 00:00:00 2001
From: amimishr <amimishr@visa.com>
Date: Wed, 2 Jun 2021 13:24:09 +0530
Subject: [PATCH] upgrading minSDKVersion and related changes

upgrading minSDKVersion and related changes
---
 build.gradle                                  | 22 +++++++------
 .../acceptsdk/AcceptSDKApiClientTest.java     |  8 +++--
 .../acceptsdk/network/AcceptServiceTest.java  | 32 +++++++++----------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3935c8e..a81cea1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,21 +13,21 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'net.authorize'
     PUBLISH_ARTIFACT_ID = 'accept-android-sdk'
-    PUBLISH_VERSION = '1.0.3'
+    PUBLISH_VERSION = '1.0.4'
     // COMMENT : If publish version changes change "version name" in "defaultconfig" below
 }
 
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0.3"
-        buildConfigField("String", "SDK_VERSION", "\"1.0.3\"")
+        minSdkVersion 26
+        targetSdkVersion 29
+        versionCode 4
+        versionName "1.0.4"
+        buildConfigField("String", "SDK_VERSION", "\"1.0.4\"")
     }
 //  compileOptions {
 //    sourceCompatibility JavaVersion.VERSION_1_7
@@ -57,8 +57,10 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:support-compat:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
 }
 
 apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
diff --git a/src/test/java/net/authorize/acceptsdk/AcceptSDKApiClientTest.java b/src/test/java/net/authorize/acceptsdk/AcceptSDKApiClientTest.java
index 4e84553..582dfe7 100644
--- a/src/test/java/net/authorize/acceptsdk/AcceptSDKApiClientTest.java
+++ b/src/test/java/net/authorize/acceptsdk/AcceptSDKApiClientTest.java
@@ -1,27 +1,29 @@
 package net.authorize.acceptsdk;
 
 import android.content.Context;
-import android.test.mock.MockContext;
 import junit.framework.Assert;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 /**
  * Created by Kiran Bollepalli on 14,July,2016.
  * kbollepa@visa.com
  */
+@RunWith(MockitoJUnitRunner.class)
 public class AcceptSDKApiClientTest {
 
 
   private final String API_LOGIN_ID = "6AB64hcB";
 
   AcceptSDKApiClient apiClient;
+  @Mock
   Context context;
   String apiLoginID;
 
   @Before public void setUp() throws Exception {
-    context = new MockContext();
     apiLoginID = API_LOGIN_ID;
     apiClient =
         new AcceptSDKApiClient.Builder(context, AcceptSDKApiClient.Environment.SANDBOX).build();
diff --git a/src/test/java/net/authorize/acceptsdk/network/AcceptServiceTest.java b/src/test/java/net/authorize/acceptsdk/network/AcceptServiceTest.java
index ea8adeb..07dd48e 100644
--- a/src/test/java/net/authorize/acceptsdk/network/AcceptServiceTest.java
+++ b/src/test/java/net/authorize/acceptsdk/network/AcceptServiceTest.java
@@ -3,18 +3,22 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
-import android.test.ServiceTestCase;
-import android.test.mock.MockContext;
 import net.authorize.acceptsdk.datamodel.merchant.ClientKeyBasedMerchantAuthentication;
 import net.authorize.acceptsdk.datamodel.transaction.CardData;
 import net.authorize.acceptsdk.datamodel.transaction.EncryptTransactionObject;
 import net.authorize.acceptsdk.datamodel.transaction.TransactionType;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
 /**
  * Created by Kiran Bollepalli on 14,July,2016.
  * kbollepa@visa.com
  */
-public class AcceptServiceTest extends ServiceTestCase<AcceptService> {
+@RunWith(MockitoJUnitRunner.class)
+public class AcceptServiceTest {
   private final String CARD_NUMBER = "4111111111111111";
   private final String CARD_EXPIRATION_MONTH = "11";
   private final String CARD_EXPIRATION_YEAR = "2017";
@@ -24,19 +28,11 @@ public class AcceptServiceTest extends ServiceTestCase<AcceptService> {
       "6gSuV295YD86Mq4d86zEsx8C839uMVVjfXm9N4wr6DRuhTHpDU97NFyKtfZncUq8";
   private final String API_LOGIN_ID = "6AB64hcB";
   TransactionResultReceiver mResultReceiver;
-  Context context = new MockContext();
-
-  public AcceptServiceTest() {
-    super(AcceptService.class);
-  }
-
-  public AcceptServiceTest(Class<AcceptService> serviceClass) {
-    super(serviceClass);
-  }
-
-  @Override public void setupService() {
-    super.setupService();
+  @Mock
+  Context context;
 
+  @Before
+  public void initiate() {
     registerResultReceiver();
   }
 
@@ -45,15 +41,17 @@ private void registerResultReceiver() {
     mResultReceiver = new TransactionResultReceiver(new Handler());
   }
 
+  @Test
   public void testStartActionEncrypt() throws Exception {
     AcceptService.startActionEncrypt(context, prepareTransactionObject(), mResultReceiver);
     //assertNotNull(getService());
   }
 
+  @Test
   public void testOnHandleIntent() throws Exception {
-    Intent intent = new Intent(getSystemContext(), AcceptService.class);
+    Intent intent = new Intent(context, AcceptService.class);
     intent.setAction(AcceptService.ACTION_ENCRYPT);
-    startService(intent);
+    context.startService(intent);
     //assertNotNull(getService());
   }