add deleteArchive implementation, adds tests #11

Author: aoberoi

src/main/java/com/opentok/OpenTok.java

@@ -420,7 +420,7 @@ public Archive stopArchive(String archiveId) throws OpenTokException {
      *
      * @param archiveId The archive ID of the archive you want to delete.
      */
-//    public void deleteArchive(String archiveId) throws OpenTokException {
-//        HttpClient.makeDeleteRequest("/v2/partner/" + this.apiKey + "/archive/" + archiveId);
-//    }
+    public void deleteArchive(String archiveId) throws OpenTokException {
+        this.client.deleteArchive(archiveId);
+    }
 }

src/main/java/com/opentok/util/HttpClient.java

@@ -208,6 +208,36 @@ public String stopArchive(String archiveId) {
         return responseString;
     }
 
+    public String deleteArchive(String archiveId) {
+        String responseString = null;
+        Future<Response> request = null;
+        String url = this.apiUrl+"/v2/partner/"+this.apiKey+"/archive/"+archiveId;
+
+        try {
+            request = this.prepareDelete(url).execute();
+        } catch (IOException e) {
+            // TODO: throw OpenTokException
+            e.printStackTrace();
+        }
+
+        try {
+            Response response = request.get();
+            // TODO: check response code
+            responseString = response.getResponseBody();
+        } catch (InterruptedException e) {
+            // TODO: throw OpenTokException
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            // TODO: throw OpenTokException
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO: throw OpenTokException
+            e.printStackTrace();
+        }
+
+        return responseString;
+    }
+
 //    protected static String makeDeleteRequest(String resource) throws OpenTokException {
 //        BoundRequestBuilder get = client.prepareDelete(apiUrl + resource);
 //        addCommonHeaders(get);

src/test/java/com/opentok/test/OpenTokTest.java

@@ -494,6 +494,8 @@ public void testStartArchive() throws OpenTokException {
         assertNotNull(archive.getId());
 
         verify(postRequestedFor(urlMatching("/v2/partner/"+this.apiKey+"/archive"))
+                // TODO: find a way to match JSON without caring about spacing
+                //.withRequestBody(matching(".*"+".*"))
                 .withHeader("X-TB-PARTNER-AUTH", matching(this.apiKey+":"+this.apiSecret))
                 .withHeader("User-Agent", matching(".*Opentok-Java-SDK/"+ Version.VERSION+".*")));
     }
@@ -533,4 +535,21 @@ public void testStopArchive() throws OpenTokException {
                 .withHeader("User-Agent", matching(".*Opentok-Java-SDK/"+ Version.VERSION+".*")));
     }
 
+    // TODO: test stop archive failure scenarios
+
+    @Test
+    public void testDeleteArchive() throws OpenTokException {
+        String archiveId = "ARCHIVEID";
+        stubFor(delete(urlEqualTo("/v2/partner/"+this.apiKey+"/archive/"+archiveId))
+                .willReturn(aResponse()
+                        .withStatus(204)
+                        .withHeader("Content-Type", "application/json")));
+
+        sdk.deleteArchive(archiveId);
+
+        verify(deleteRequestedFor(urlMatching("/v2/partner/"+this.apiKey+"/archive/"+archiveId))
+                .withHeader("X-TB-PARTNER-AUTH", matching(this.apiKey+":"+this.apiSecret))
+                .withHeader("User-Agent", matching(".*Opentok-Java-SDK/"+ Version.VERSION+".*")));
+    }
+
 }