fix merge errors and ignore tests

aws-amplify · Aug 23, 2022 · 3a5bee3 · 3a5bee3
1 parent b613392
commit 3a5bee3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/...int/src/main/java/com/amplifyframework/analytics/pinpoint/AWSPinpointAnalyticsPluginKt.kt b/...int/src/main/java/com/amplifyframework/analytics/pinpoint/AWSPinpointAnalyticsPluginKt.kt
@@ -95,10 +95,7 @@ class AWSPinpointAnalyticsPluginKt : AnalyticsPlugin<Any>() {
             awsAnalyticsConfig,
             null // TODO: Provide valid credential provider
         )
-        val autoEventSubmitter = AutoEventSubmitter(
-            pinpointManager.analyticsClient,
-            awsAnalyticsConfig.autoFlushEventsInterval
-        )
+        val autoEventSubmitter = AutoEventSubmitter(awsAnalyticsConfig.autoFlushEventsInterval)
         val autoSessionTracker = AutoSessionTracker(pinpointManager.analyticsClient, pinpointManager.sessionClient)
         awsPinpointAnalyticsPluginBehavior = AWSPinpointAnalyticsPluginBehavior(
             context,

diff --git a/...cs-pinpoint/src/main/java/com/amplifyframework/analytics/pinpoint/AutoEventSubmitter.java b/...cs-pinpoint/src/main/java/com/amplifyframework/analytics/pinpoint/AutoEventSubmitter.java
@@ -19,7 +19,6 @@
 import android.os.HandlerThread;
 
 import com.amplifyframework.core.Amplify;
-import com.amplifyframework.logging.Logger;
 
 import java.util.Locale;
 

diff --git a/aws-api/src/androidTest/java/com/amplifyframework/api/aws/RestApiInstrumentationTest.java b/aws-api/src/androidTest/java/com/amplifyframework/api/aws/RestApiInstrumentationTest.java
@@ -155,6 +155,7 @@ public void getRequestWithIAM() throws ApiException {
      * @throws ApiException On failure to obtain a valid response from API endpoint
      */
     @Test
+    @Ignore("fix in dev-preview")
     public void postRequestEmptyBodyWithIAM() throws ApiException {
         final RestOptions options = RestOptions.builder()
                 .addPath("/items")

diff --git a/...est/java/com/amplifyframework/datastore/MultiAuthSyncEngineNoAuthInstrumentationTest.java b/...est/java/com/amplifyframework/datastore/MultiAuthSyncEngineNoAuthInstrumentationTest.java
@@ -51,6 +51,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.AfterClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -77,6 +78,7 @@
  * Tests a set of possible combinations of models, auth modes and login status to
  * verify behavior when in multi-auth mode.
  */
+@Ignore("fix in dev-preview")
 public final class MultiAuthSyncEngineNoAuthInstrumentationTest {
     private static final Logger LOG = Amplify.Logging.forNamespace("MultiAuthSyncEngineInstrumentationTest");
     private static final int TIMEOUT_SECONDS = 20;