Update push tests for REST API version change

Author: bbirman

libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/NotificationsApiClient.kt

@@ -59,7 +59,7 @@ class NotificationsApiClient(
         val apiVersion = ApiVersionStrings.getVersionNumber(context)
 
         // Submit the request.
-        if (apiVersion < "v64.0") { // TODO: Remove once MSDK default API version is 64 or greater.
+        if (apiVersion < "v64.0") {
             SalesforceSDKLogger.w(TAG, "Cannot request Salesforce push notifications types with API less than v64.0")
             return null
         }
@@ -98,7 +98,7 @@ class NotificationsApiClient(
         val apiVersion = ApiVersionStrings.getVersionNumber(context)
 
         // Submit the request.
-        if (apiVersion < "v64.0") { // TODO: Remove once MSDK default API version is 64 or greater.
+        if (apiVersion < "v64.0") {
             SalesforceSDKLogger.w(TAG, "Cannot submit Salesforce Notifications API action with API less than v64.0")
             return null
         }

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/app/PushMessagingTest.kt

@@ -208,8 +208,6 @@ class PushMessagingTest {
             notificationsTypes = fromJson(NOTIFICATIONS_TYPES_JSON)
         )
 
-        ApiVersionStrings.VERSION_NUMBER_TEST = "v64.0"
-
         // Test once for coverage only with the default REST client.
         assertThrows(SSLPeerUnverifiedException::class.java) {
             salesforceSdkManager.invokeServerNotificationAction(
@@ -273,6 +271,8 @@ class PushMessagingTest {
             notificationsTypes = fromJson(NOTIFICATIONS_TYPES_JSON)
         )
 
+        ApiVersionStrings.VERSION_NUMBER_TEST = "v63.0"
+
         val notificationsActionsResponseBody = salesforceSdkManager.invokeServerNotificationAction(
             notificationId = "test_notification_id",
             actionKey = "test_action_key",
@@ -299,8 +299,6 @@ class PushMessagingTest {
             notificationsTypes = fromJson(NOTIFICATIONS_TYPES_JSON)
         )
 
-        ApiVersionStrings.VERSION_NUMBER_TEST = "v64.0"
-
         assertThrows(NotificationsApiException::class.java) {
             salesforceSdkManager.invokeServerNotificationAction(
                 notificationId = "test_notification_id",
@@ -330,8 +328,6 @@ class PushMessagingTest {
             notificationsTypes = fromJson(NOTIFICATIONS_TYPES_JSON)
         )
 
-        ApiVersionStrings.VERSION_NUMBER_TEST = "v64.0"
-
         assertThrows(NotificationsApiException::class.java) {
             salesforceSdkManager.invokeServerNotificationAction(
                 notificationId = "test_notification_id",
@@ -368,9 +364,6 @@ class PushMessagingTest {
         every { restClient.clientInfo } returns clientInfo
         every { restClient.sendSync(any()) } returns restResponse
 
-        // Setup.
-        ApiVersionStrings.VERSION_NUMBER_TEST = "v64.0"
-
         assertThrows(NotificationsApiException::class.java) {
             salesforceSdkManager.invokeServerNotificationAction(
                 notificationId = "test_notification_id",
@@ -396,9 +389,6 @@ class PushMessagingTest {
         every { restClient.clientInfo } returns clientInfo
         every { restClient.sendSync(any()) } returns restResponse
 
-        // Setup.
-        ApiVersionStrings.VERSION_NUMBER_TEST = "v64.0"
-
         assertThrows(NotificationsApiException::class.java) {
             salesforceSdkManager.invokeServerNotificationAction(
                 notificationId = "test_notification_id",
@@ -431,9 +421,6 @@ class PushMessagingTest {
         every { restClient.clientInfo } returns clientInfo
         every { restClient.sendSync(any()) } returns restResponse
 
-        // Setup.
-        ApiVersionStrings.VERSION_NUMBER_TEST = "v64.0"
-
         assertThrows(NotificationsApiException::class.java) {
             salesforceSdkManager.invokeServerNotificationAction(
                 notificationId = "test_notification_id",