Fixes for s3 test failures (#756)

* Fixes for s3 test failures

* Update config.yml

* Update config.yml

Author: desokroshan

aws-android-sdk-s3-test/src/androidTest/assets/errorResponse.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DeleteResult>
+    <Deleted>
+       <Key>object1</Key>
+       <VersionId>123</VersionId>
+    </Deleted>
+    <Error>
+       <Key>object2</Key>
+       <Code>AccessDenied</Code>
+       <Message>Access Denied</Message>
+    </Error> 
+</DeleteResult>

aws-android-sdk-s3-test/src/androidTest/assets/fullResponse.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DeleteResult>
+    <Deleted>
+       <Key>key1</Key>
+       <VersionId>Version1</VersionId>
+    </Deleted>
+    <Error>
+       <Key>key2</Key>
+       <VersionId>Version2</VersionId>
+       <Code>Code</Code>
+       <Message>Message</Message>
+    </Error> 
+    <Deleted>
+       <Key>key3</Key>
+       <DeleteMarker>true</DeleteMarker>
+       <DeleteMarkerVersionId>Version3</DeleteMarkerVersionId>
+    </Deleted>
+</DeleteResult>

aws-android-sdk-s3-test/src/androidTest/assets/samplePolicy.json

@@ -0,0 +1,12 @@
+{
+  "Version":"2008-10-17",
+  "Statement":[{
+      "Sid":"AddPerm",
+      "Effect":"Allow",
+      "Principal": {
+          "AWS": "*"
+      },
+      "Action":["s3:GetObject"],
+      "Resource":["arn:aws:s3:::@BUCKET_NAME@/*"]
+  }]
+}

aws-android-sdk-s3-test/src/androidTest/java/com/amazonaws/services/s3/BucketPolicyIntegrationTest.java

@@ -15,6 +15,8 @@
 
 package com.amazonaws.services.s3;
 
+import android.support.test.InstrumentationRegistry;
+
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -27,6 +29,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.InputStream;
+
 /**
  * Integration tests for S3 bucket policy operations.
  */
@@ -36,7 +40,7 @@ public class BucketPolicyIntegrationTest extends S3IntegrationTestBase {
     private final String bucketName = "java-bucket-policy-integ-test-" + System.currentTimeMillis();
 
     /** Path to the sample policy for this test */
-    private static final String POLICY_FILE = "/com/amazonaws/services/s3/samplePolicy.json";
+    private static final String POLICY_FILE = "samplePolicy.json";
 
     /** Create bucket and wait for creation */
     @Before
@@ -58,7 +62,8 @@ public void tearDown() {
     /** Tests that we can get/put/delete bucket policies. */
     @Test
     public void testBucketPolicies() throws Exception {
-        String policyText = IOUtils.toString(getClass().getResourceAsStream(POLICY_FILE));
+        InputStream policyInputStream = InstrumentationRegistry.getContext().getResources().getAssets().open(POLICY_FILE);
+        String policyText = IOUtils.toString(policyInputStream);
         policyText = replace(policyText, "@BUCKET_NAME@", bucketName);
 
         // Verify that no policy exists yet

aws-android-sdk-s3-test/src/androidTest/java/com/amazonaws/services/s3/MultiObjectDeleteIntegrationTest.java

@@ -15,6 +15,8 @@
 
 package com.amazonaws.services.s3;
 
+import android.support.test.InstrumentationRegistry;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -146,10 +148,7 @@ public void testErrorHandling() throws Exception {
 
         DeleteObjectsResultUnmarshaller unmarshaller = new Unmarshallers.DeleteObjectsResultUnmarshaller();
         DeleteObjectsResponse response = unmarshaller
-                .unmarshall(this
-                        .getClass()
-                        .getResourceAsStream(
-                                "/com/amazonaws/services/s3/multiObjectDelete/testResponses/errorResponse.xml"));
+                .unmarshall(InstrumentationRegistry.getContext().getResources().getAssets().open("errorResponse.xml"));
 
         assertEquals(1, response.getDeletedObjects().size());
         assertEquals(1, response.getErrors().size());
@@ -170,10 +169,7 @@ public void testErrorHandling() throws Exception {
     public void testFullServiceResponse() throws Exception {
         DeleteObjectsResultUnmarshaller unmarshaller = new Unmarshallers.DeleteObjectsResultUnmarshaller();
         DeleteObjectsResponse response = unmarshaller
-                .unmarshall(this
-                        .getClass()
-                        .getResourceAsStream(
-                                "/com/amazonaws/services/s3/multiObjectDelete/testResponses/fullResponse.xml"));
+                .unmarshall(InstrumentationRegistry.getContext().getResources().getAssets().open("fullResponse.xml"));
 
         assertEquals(2, response.getDeletedObjects().size());
         assertEquals(1, response.getErrors().size());