From bdd3a9ad547c37dfc17095b980a1768425cee277 Mon Sep 17 00:00:00 2001 From: dengdan154 Date: Mon, 5 Dec 2022 11:15:47 -0600 Subject: [PATCH 1/2] unignore tests --- .../pinpoint/PinpointAnalyticsInstrumentationTest.kt | 2 -- .../storage/s3/AWSS3StorageDownloadTest.java | 6 ------ .../amplifyframework/storage/s3/AWSS3StorageUploadTest.java | 5 ----- 3 files changed, 13 deletions(-) diff --git a/aws-analytics-pinpoint/src/androidTest/java/com/amplifyframework/analytics/pinpoint/PinpointAnalyticsInstrumentationTest.kt b/aws-analytics-pinpoint/src/androidTest/java/com/amplifyframework/analytics/pinpoint/PinpointAnalyticsInstrumentationTest.kt index 5194bd7f83..a7f89824e1 100644 --- a/aws-analytics-pinpoint/src/androidTest/java/com/amplifyframework/analytics/pinpoint/PinpointAnalyticsInstrumentationTest.kt +++ b/aws-analytics-pinpoint/src/androidTest/java/com/amplifyframework/analytics/pinpoint/PinpointAnalyticsInstrumentationTest.kt @@ -45,7 +45,6 @@ import org.json.JSONException import org.junit.Assert import org.junit.Before import org.junit.BeforeClass -import org.junit.Ignore import org.junit.Test class PinpointAnalyticsInstrumentationTest { @@ -244,7 +243,6 @@ class PinpointAnalyticsInstrumentationTest { * an [EndpointProfile] on the [PinpointClient], containing * all provided Amplify attributes. */ - @Ignore("Test Failure") @Test fun testIdentifyUserWithDefaultProfile() { val location = testLocation diff --git a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java index 603826d5e3..0b1dddb4aa 100644 --- a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java +++ b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java @@ -42,7 +42,6 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -146,7 +145,6 @@ public void tearDown() { * * @throws Exception if download fails */ - @Ignore("Test Failure") @Test public void testDownloadSmallFile() throws Exception { synchronousStorage.downloadFile(SMALL_FILE_NAME, downloadFile, options); @@ -158,7 +156,6 @@ public void testDownloadSmallFile() throws Exception { * * @throws Exception if download fails */ - @Ignore("Test Failure") @Test public void testDownloadLargeFile() throws Exception { synchronousStorage.downloadFile(LARGE_FILE_NAME, downloadFile, options, EXTENDED_TIMEOUT_MS); @@ -173,7 +170,6 @@ public void testDownloadLargeFile() throws Exception { * before timeout */ @SuppressWarnings("unchecked") - @Ignore("Test Failure") @Test public void testDownloadFileIsCancelable() throws Exception { final CountDownLatch canceled = new CountDownLatch(1); @@ -220,7 +216,6 @@ public void testDownloadFileIsCancelable() throws Exception { * completed successfully before timeout */ @SuppressWarnings("unchecked") - @Ignore("Test Failure") @Test public void testDownloadFileIsResumable() throws Exception { final CountDownLatch completed = new CountDownLatch(1); @@ -271,7 +266,6 @@ public void testDownloadFileIsResumable() throws Exception { * completed successfully before timeout */ @SuppressWarnings("unchecked") - @Ignore("Test Failure") @Test public void testGetTransferOnPause() throws Exception { final CountDownLatch completed = new CountDownLatch(1); diff --git a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java index 936c20308a..9fd05dc57e 100644 --- a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java +++ b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java @@ -42,7 +42,6 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -146,7 +145,6 @@ public void testUploadSmallFileStream() throws Exception { * * @throws Exception if upload fails */ - @Ignore("Test Failure") @Test public void testUploadLargeFile() throws Exception { File uploadFile = new RandomTempFile(LARGE_FILE_SIZE); @@ -211,7 +209,6 @@ public void testUploadFileIsCancelable() throws Exception { * completed successfully before timeout */ @SuppressWarnings("unchecked") - @Ignore("Test Failure") @Test public void testUploadFileIsResumable() throws Exception { final CountDownLatch completed = new CountDownLatch(1); @@ -264,7 +261,6 @@ public void testUploadFileIsResumable() throws Exception { * completed successfully before timeout */ @SuppressWarnings("unchecked") - @Ignore("Test Failure") @Test public void testUploadFileGetTransferOnPause() throws Exception { final CountDownLatch completed = new CountDownLatch(1); @@ -327,7 +323,6 @@ public void testUploadFileGetTransferOnPause() throws Exception { * completed successfully before timeout */ @SuppressWarnings("unchecked") - @Ignore("Test Failure") @Test public void testUploadInputStreamGetTransferOnPause() throws Exception { final CountDownLatch completed = new CountDownLatch(1); From 217bb798cbc4719ec5d97c3d9ae538bf07350d14 Mon Sep 17 00:00:00 2001 From: dengdan154 Date: Mon, 5 Dec 2022 11:17:02 -0600 Subject: [PATCH 2/2] extend timeout to 60s --- .../amplifyframework/storage/s3/AWSS3StorageDownloadTest.java | 2 +- .../com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java index 0b1dddb4aa..41fc7d9729 100644 --- a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java +++ b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageDownloadTest.java @@ -59,7 +59,7 @@ * Instrumentation test for operational work on download. */ public final class AWSS3StorageDownloadTest { - private static final long EXTENDED_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(20); + private static final long EXTENDED_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(60); private static final StorageAccessLevel TESTING_ACCESS_LEVEL = StorageAccessLevel.PUBLIC; private static final long LARGE_FILE_SIZE = 10 * 1024 * 1024L; // 10 MB diff --git a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java index 9fd05dc57e..7199f81fb2 100644 --- a/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java +++ b/aws-storage-s3/src/androidTest/java/com/amplifyframework/storage/s3/AWSS3StorageUploadTest.java @@ -60,7 +60,7 @@ * Instrumentation test for operational work on upload. */ public final class AWSS3StorageUploadTest { - private static final long EXTENDED_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(20); + private static final long EXTENDED_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(60); private static final StorageAccessLevel TESTING_ACCESS_LEVEL = StorageAccessLevel.PUBLIC; private static final long LARGE_FILE_SIZE = 10 * 1024 * 1024L; // 10 MB