Feature 97 integration testing

.travis.yml

@@ -7,5 +7,5 @@ install:
 script:
 - ./Travis/createProject.sh
 - ./Travis/installSDK.sh
-- ./Travis/runTests.sh
+- travis_wait 15 ./Travis/runTests.sh
 - ./Travis/build.sh

Scripts/Logging/Logger.cs

@@ -214,6 +214,7 @@ public static class Log
         public static void Debug(string subSystem, string messageFmt, params object[] args)
         {
             LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.DEBUG, subSystem, messageFmt, args));
+            System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.DEBUG, subSystem, string.Format(messageFmt, args));
         }
 #else
         // We compile out Log.Debug() functions in release builds.
@@ -230,6 +231,7 @@ public static void Debug(string subSystem, string messageFmt, params object[] ar
         public static void Status(string subSystem, string messageFmt, params object[] args)
         {
             LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.STATUS, subSystem, messageFmt, args));
+            System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.STATUS, subSystem, string.Format(messageFmt, args));
         }
         /// <summary>
         /// Log a WARNING level message.
@@ -240,6 +242,7 @@ public static void Status(string subSystem, string messageFmt, params object[] a
         public static void Warning(string subSystem, string messageFmt, params object[] args)
         {
             LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.WARNING, subSystem, messageFmt, args));
+                System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.WARNING, subSystem, string.Format(messageFmt, args));
         }
         /// <summary>
         /// Log a ERROR level message.
@@ -250,6 +253,7 @@ public static void Warning(string subSystem, string messageFmt, params object[]
         public static void Error(string subSystem, string messageFmt, params object[] args)
         {
             LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.ERROR, subSystem, messageFmt, args));
+            System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.ERROR, subSystem, string.Format(messageFmt, args));
         }
         /// <summary>
         /// Log a CRITICAL level message.
@@ -260,6 +264,7 @@ public static void Error(string subSystem, string messageFmt, params object[] ar
         public static void Critical(string subSystem, string messageFmt, params object[] args)
         {
             LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.CRITICAL, subSystem, messageFmt, args));
+            System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.CRITICAL, subSystem, string.Format(messageFmt, args));
         }
     }
 }

Scripts/Services/RetrieveAndRank/DataModels.cs

@@ -303,6 +303,25 @@ public class Doc
         /// </summary>
         public string[] bibliography { get; set; }
     }
+
+    /// <summary>
+    /// Cluster object containing it's associated configs and collections.
+    /// </summary>
+    public class ClusterInfo
+    {
+        /// <summary>
+        /// The Cluster's info.
+        /// </summary>
+        public SolrClusterResponse Cluster { get; set; }
+        /// <summary>
+        /// Cluster's configs.
+        /// </summary>
+        public string[] Configs { get; set; }
+        /// <summary>
+        /// Cluster's collections.
+        /// </summary>
+        public string[] Collections { get; set; }
+    }
     #endregion
 
     #region Rankers

Scripts/Services/RetrieveAndRank/RetrieveAndRank.cs

@@ -280,6 +280,7 @@ private void OnCreateClusterResponse(RESTConnector.Request req, RESTConnector.Re
 
             DeleteClusterRequest req = new DeleteClusterRequest();
             req.Callback = callback;
+            req.Data = customData;
             req.ClusterID = clusterID;
             req.Delete = true;
             req.Timeout = REQUEST_TIMEOUT;
@@ -318,7 +319,7 @@ public class DeleteClusterRequest : RESTConnector.Request
         /// <param name="resp"></param>
         private void OnDeleteClusterResponse(RESTConnector.Request req, RESTConnector.Response resp)
         {
-            Log.Debug("RetrieveAndRank", "OnDeleteClusterResponse!!");
+            Log.Debug("RetrieveAndRank", "OnDeleteClusterResponse success: {0}", resp.Success);
             if (((DeleteClusterRequest)req).Callback != null)
                 ((DeleteClusterRequest)req).Callback(resp.Success, ((DeleteClusterRequest)req).Data);
         }
@@ -348,6 +349,7 @@ private void OnDeleteClusterResponse(RESTConnector.Request req, RESTConnector.Re
 
             GetClusterRequest req = new GetClusterRequest();
             req.Callback = callback;
+            req.Data = customData;
             req.ClusterID = clusterID;
             req.Timeout = REQUEST_TIMEOUT;
 
@@ -437,6 +439,7 @@ private void OnGetClusterResponse(RESTConnector.Request req, RESTConnector.Respo
             GetClusterConfigsRequest req = new GetClusterConfigsRequest();
             req.Callback = callback;
             req.ClusterID = clusterID;
+            req.Data = customData;
             req.Timeout = REQUEST_TIMEOUT;
             req.OnResponse = OnGetClusterConfigsResponse;
 
@@ -530,6 +533,7 @@ private void OnGetClusterConfigsResponse(RESTConnector.Request req, RESTConnecto
 
             DeleteClusterConfigRequest req = new DeleteClusterConfigRequest();
             req.Callback = callback;
+            req.Data = customData;
             req.ClusterID = clusterID;
             req.ConfigID = configID;
             req.Timeout = REQUEST_TIMEOUT;
@@ -718,6 +722,7 @@ public void SaveConfig(OnSaveClusterConfig callback, byte[] configData, string c
 
             UploadClusterConfigRequest req = new UploadClusterConfigRequest();
             req.Callback = callback;
+            req.Data = customData;
             req.ClusterID = clusterID;
             req.ConfigName = configName;
             req.OnResponse = UploadClusterConfigResponse;
@@ -1499,6 +1504,7 @@ private void OnRankResponse(RESTConnector.Request req, RESTConnector.Response re
 
 			DeleteRankerRequest req = new DeleteRankerRequest();
 			req.Callback = callback;
+            req.Data = customData;
 			req.RankerID = rankerID;
             req.Timeout = REQUEST_TIMEOUT;
 			req.Delete = true;
@@ -1566,6 +1572,7 @@ private void OnDeleteRankerResponse(RESTConnector.Request req, RESTConnector.Res
 
 			GetRankerRequest req = new GetRankerRequest();
 			req.Callback = callback;
+            req.Data = customData;
 			req.RankerID = rankerID;
             req.Timeout = REQUEST_TIMEOUT;
 

Scripts/Services/VisualRecognition/VisualRecognition.cs

@@ -297,6 +297,7 @@ private void OnClassifyResp(RESTConnector.Request req, RESTConnector.Response re
             req.Callback = callback;
             req.Data = customData;
             req.OnResponse = OnDetectFacesResp;
+            req.Timeout = REQUEST_TIMEOUT;
             req.Parameters["api_key"] = mp_ApiKey;
             req.Parameters["url"] = url;
             req.Parameters["version"] = VisualRecognitionVersion.Version;
@@ -444,6 +445,7 @@ private void OnDetectFacesResp(RESTConnector.Request req, RESTConnector.Response
             req.Data = customData;
             req.Timeout = REQUEST_TIMEOUT;
             req.OnResponse = OnRecognizeTextResp;
+            req.Timeout = REQUEST_TIMEOUT;
             req.Parameters["api_key"] = mp_ApiKey;
             req.Parameters["url"] = url;
             req.Parameters["version"] = VisualRecognitionVersion.Version;
@@ -647,7 +649,7 @@ private void OnGetClassifier(GetClassifiersPerClassifierVerbose classifier, stri
             req.Data = customData;
             req.Parameters["api_key"] = mp_ApiKey;
             req.Parameters["version"] = VisualRecognitionVersion.Version;
-            req.Timeout = 10.0f * 60.0f;
+            req.Timeout = 20.0f * 60.0f;
             req.OnResponse = OnGetClassifiersResp;
 
             return connector.Send(req);
@@ -720,7 +722,6 @@ private void OnGetClassifiersResp(RESTConnector.Request req, RESTConnector.Respo
 
             GetClassifierReq req = new GetClassifierReq();
             req.Callback = callback;
-            req.Data = customData;
             req.Parameters["api_key"] = mp_ApiKey;
             req.Parameters["version"] = VisualRecognitionVersion.Version;
             req.OnResponse = OnGetClassifierResp;

Scripts/UnitTests/TestAlchemyLanguage.cs

@@ -366,6 +366,8 @@ public override IEnumerator RunTest()
 			m_AlchemyAPI.GetNews(OnGetNews, returnFields, queryFields);
 			while(!m_GetNewsTested)
 				yield return null;
+
+            yield break;
         }
 
         #region GetAuthors

Scripts/UnitTests/TestConversation.cs

@@ -42,7 +42,9 @@ public override IEnumerator RunTest()
 			while(!m_MessageTested)
 				yield return null;
 		}
-	}
+
+        yield break;
+    }
 
 	private void OnMessage(MessageResponse resp)
 	{