Skip to content

Commit 560641f

Browse files
desokroshanKarthikeyan
authored andcommitted
UI test fix (#752)
* Update config.yml * Refactor SQS and SES integration tests
1 parent c68443a commit 560641f

File tree

6 files changed

+8
-16
lines changed

6 files changed

+8
-16
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ commands:
7979
- run:
8080
name: Setup emulator
8181
command: |
82-
sdkmanager "system-images;android-24;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-24;default;armeabi-v7a"
82+
echo y | sdkmanager "system-images;android-24;default;armeabi-v7a" && echo "no" | avdmanager create avd -n test -k "system-images;android-24;default;armeabi-v7a"
8383
- run:
8484
name: Launch emulator
8585
command: export LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib && emulator64-arm -avd test -no-boot-anim -no-window -accel auto -verbose

aws-android-sdk-ses-test/src/androidTest/java/com/amazonaws/services/email/SESIntegrationTestBase.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,7 @@ public static void setUp() throws JSONException {
105105
EMAIL_TO_VERIFY = getPackageConfigure().getString("ios_test_email");
106106

107107
if (DESTINATION == null) {
108-
DESTINATION = System.getProperty("user.name").equals("webuser") ? HUDSON_EMAIL_LIST
109-
: System.getProperty("user.name") + "@amazon.com";
110-
if ("[email protected]".equalsIgnoreCase(DESTINATION)) {
111-
DESTINATION = HUDSON_EMAIL_LIST;
112-
}
108+
DESTINATION = HUDSON_EMAIL_LIST;
113109
SOURCE = DESTINATION;
114110
}
115111
System.out.println("Destination for test: " + DESTINATION);

aws-android-sdk-sqs-test/src/androidTest/java/com/amazonaws/services/sqs/MessageAttributesIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
/**
3939
* Integration tests for the SQS message attributes.
4040
*/
41-
public class MessageAttributesIntegrationTest extends IntegrationTestBase {
41+
public class MessageAttributesIntegrationTest extends SQSIntegrationTestBase {
4242

4343
private static final String MESSAGE_BODY = "message-body-" + System.currentTimeMillis();
4444
private static final String queueName = "android-sdk-message-attributes-integ-test-queue-"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
/**
6666
* Integration tests for the SQS Java client.
6767
*/
68-
public class SqsIntegrationTest extends IntegrationTestBase {
69-
public static final String TAG = SqsIntegrationTest.class.getSimpleName();
68+
public class SQSIntegrationTest extends SQSIntegrationTestBase {
69+
public static final String TAG = SQSIntegrationTest.class.getSimpleName();
7070

7171
private static final String ATTRIBUTE_VALUE = "42";
7272
private static final String ATTRIBUTE_NAME = "VisibilityTimeout";
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515

1616
package com.amazonaws.services.sqs;
1717

18-
import android.support.test.runner.AndroidJUnit4;
19-
2018
import org.json.JSONObject;
21-
import org.junit.runner.RunWith;
2219
import org.junit.BeforeClass;
2320

2421
import java.io.IOException;
@@ -38,12 +35,11 @@
3835
*
3936
*/
4037

41-
@RunWith(AndroidJUnit4.class)
42-
abstract public class IntegrationTestBase extends AWSTestBase{
38+
abstract public class SQSIntegrationTestBase extends AWSTestBase{
4339

4440
public static final String PACKAGE_NAME = "sqs";
4541

46-
public static final String TAG = IntegrationTestBase.class.getSimpleName();
42+
public static final String TAG = SQSIntegrationTestBase.class.getSimpleName();
4743
/** The SQS client for all tests to use */
4844
protected static AmazonSQSAsyncClient sqsClient;
4945

aws-android-sdk-sqs-test/src/androidTest/java/com/amazonaws/services/sqs/SimplifiedMethodIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import java.util.Map;
3939
import java.util.Map.Entry;
4040

41-
public class SimplifiedMethodIntegrationTest extends IntegrationTestBase {
41+
public class SimplifiedMethodIntegrationTest extends SQSIntegrationTestBase {
4242
private final static String QUEUE_NAME = "android-integration-test-" + System.currentTimeMillis();
4343
private static final String ATTRIBUTE_VALUE = "42";
4444
private static final String ATTRIBUTE_NAME = "VisibilityTimeout";

0 commit comments

Comments
 (0)