add delete timeout, restructure integration tests

Author: mediumTaj

Scripts/Services/Discovery/v1/Discovery.cs

@@ -44,6 +44,8 @@ public class Discovery : IWatsonService
         private const string SERVICE_ENVIRONMENT_COLLECTION_DOCUMENTS = "/v1/environments/{0}/collections/{1}/documents";
         private const string SERVICE_ENVIRONMENT_COLLECTION_DOCUMENT = "/v1/environments/{0}/collections/{1}/documents/{2}";
         private const string SERVICE_ENVIRONMENT_COLLECTION_QUERY = "/v1/environments/{0}/collections/{1}/query";
+
+        private const float DELETE_TIMEOUT = 30f;
         #endregion
 
         #region Public Types
@@ -271,6 +273,7 @@ private void OnGetEnvironmentResponse(RESTConnector.Request req, RESTConnector.R
             req.Parameters["version"] = DiscoveryVersion.Version;
             req.OnResponse = OnDeleteEnvironmentResponse;
             req.Delete = true;
+            req.Timeout = DELETE_TIMEOUT;
 
             RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, string.Format(SERVICE_ENVIRONMENT, environmentID));
             if (connector == null)
@@ -542,6 +545,7 @@ private void OnGetConfigurationResponse(RESTConnector.Request req, RESTConnector
             req.Parameters["version"] = DiscoveryVersion.Version;
             req.OnResponse = OnDeleteConfigurationResponse;
             req.Delete = true;
+            req.Timeout = DELETE_TIMEOUT;
 
             RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, string.Format(SERVICE_ENVIRONMENT_CONFIGURATION, environmentID, configurationID));
             if (connector == null)
@@ -946,6 +950,7 @@ private void OnGetCollectionResponse(RESTConnector.Request req, RESTConnector.Re
             req.Parameters["version"] = DiscoveryVersion.Version;
             req.OnResponse = OnDeleteCollectionResponse;
             req.Delete = true;
+            req.Timeout = DELETE_TIMEOUT;
 
             RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, string.Format(SERVICE_ENVIRONMENT_COLLECTION, environmentID, collectionID));
             if (connector == null)
@@ -1271,6 +1276,7 @@ private void OnAddDocumentResponse(RESTConnector.Request req, RESTConnector.Resp
             req.Parameters["version"] = DiscoveryVersion.Version;
             req.OnResponse = OnDeleteDocumentResponse;
             req.Delete = true;
+            req.Timeout = DELETE_TIMEOUT;
 
             RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, string.Format(SERVICE_ENVIRONMENT_COLLECTION_DOCUMENT, environmentID, collectionID, documentID));
             if (connector == null)