[IoT] Change integration test to not fail on tearDown step

Removed wrapping exception and assertions that made debugging difficult

Author: minbi

aws-android-sdk-iot-test/src/androidTest/java/com/amazonaws/mobileconnectors/iot/MqttManagerIntegrationTest.java

@@ -20,7 +20,6 @@
 import android.util.Log;
 
 import com.amazonaws.AmazonClientException;
-import com.amazonaws.AmazonServiceException;
 import com.amazonaws.auth.AWSCredentialsProvider;
 import com.amazonaws.auth.CognitoCachingCredentialsProvider;
 import com.amazonaws.regions.Region;
@@ -97,7 +96,7 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         deletePolicyAndCertificate();
         File keystoreFile = new File(KEYSTORE_PATH, KEYSTORE_NAME);
         if (keystoreFile.exists()) {
@@ -1024,37 +1023,34 @@ private void createAndAttachPolicy() {
      * Delete the certificate.
      */
     private void deletePolicyAndCertificate() {
+        Log.d(TAG, "Detatching the policy from the certificate.");
+        DetachPolicyRequest detachPolicyRequest = new DetachPolicyRequest();
+        detachPolicyRequest.setPolicyName(IOT_POLICY_NAME);
+        detachPolicyRequest.setTarget(this.certResult.getCertificateArn());
+        iotClient.detachPolicy(detachPolicyRequest);
+
+        // delete policy
+        Log.d(TAG, "Deleting the policy.");
         try {
-            Log.d(TAG, "Detatching the policy from the certificate.");
-            DetachPolicyRequest detachPolicyRequest = new DetachPolicyRequest();
-            detachPolicyRequest.setPolicyName(IOT_POLICY_NAME);
-            detachPolicyRequest.setTarget(this.certResult.getCertificateArn());
-            iotClient.detachPolicy(detachPolicyRequest);
-
-            // delete policy
-            Log.d(TAG, "Deleting the policy.");
             DeletePolicyRequest deletePolicyRequest = new DeletePolicyRequest();
             deletePolicyRequest.setPolicyName(IOT_POLICY_NAME);
             iotClient.deletePolicy(deletePolicyRequest);
-
-            // set cert inactive
-            Log.d(TAG, "Make the certificate inactive.");
-            UpdateCertificateRequest updateCertificateRequest = new UpdateCertificateRequest();
-            updateCertificateRequest.setCertificateId(this.certResult.getCertificateId());
-            updateCertificateRequest.setNewStatus(CertificateStatus.INACTIVE);
-            iotClient.updateCertificate(updateCertificateRequest);
-
-            // delete cert
-            Log.d(TAG, "Delete the certificate.");
-            DeleteCertificateRequest deleteCertificateRequest = new DeleteCertificateRequest();
-            deleteCertificateRequest.setCertificateId(this.certResult.getCertificateId());
-            iotClient.deleteCertificate(deleteCertificateRequest);
-        } catch (AmazonServiceException ase) {
-            ase.printStackTrace();
-            assertTrue("Exception thrown while deleting the policy and certificate", false);
-        } catch (AmazonClientException ace) {
-            ace.printStackTrace();
-            assertTrue("Exception thrown while deleting the policy and certificate", false);
+        } catch (AmazonClientException e) {
+            // TODO Ignore failures in tearDown, but this needs to be fixed.
+            e.printStackTrace();
         }
+
+        // set cert inactive
+        Log.d(TAG, "Make the certificate inactive.");
+        UpdateCertificateRequest updateCertificateRequest = new UpdateCertificateRequest();
+        updateCertificateRequest.setCertificateId(this.certResult.getCertificateId());
+        updateCertificateRequest.setNewStatus(CertificateStatus.INACTIVE);
+        iotClient.updateCertificate(updateCertificateRequest);
+
+        // delete cert
+        Log.d(TAG, "Delete the certificate.");
+        DeleteCertificateRequest deleteCertificateRequest = new DeleteCertificateRequest();
+        deleteCertificateRequest.setCertificateId(this.certResult.getCertificateId());
+        iotClient.deleteCertificate(deleteCertificateRequest);
     }
 }