Skip to content

Commit 4d5f4ef

Browse files
mediumTajmediumTaj
authored
Merge pull request #112 from watson-developer-cloud/feature-97-integrationTesting
Feature 97 integration testing
2 parents 8d936fa + 95a0eb1 commit 4d5f4ef

21 files changed

+536
-60
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ install:
77
script:
88
- ./Travis/createProject.sh
99
- ./Travis/installSDK.sh
10-
- ./Travis/runTests.sh
10+
- travis_wait 15 ./Travis/runTests.sh
1111
- ./Travis/build.sh

‎Config.json.enc

0 Bytes
Binary file not shown.

‎Examples/ServiceExamples/Scripts/ExampleDIalog.cs.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Scripts/Logging/Logger.cs

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ public static class Log
214214
public static void Debug(string subSystem, string messageFmt, params object[] args)
215215
{
216216
LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.DEBUG, subSystem, messageFmt, args));
217+
System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.DEBUG, subSystem, string.Format(messageFmt, args));
217218
}
218219
#else
219220
// We compile out Log.Debug() functions in release builds.
@@ -230,6 +231,7 @@ public static void Debug(string subSystem, string messageFmt, params object[] ar
230231
public static void Status(string subSystem, string messageFmt, params object[] args)
231232
{
232233
LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.STATUS, subSystem, messageFmt, args));
234+
System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.STATUS, subSystem, string.Format(messageFmt, args));
233235
}
234236
/// <summary>
235237
/// Log a WARNING level message.
@@ -240,6 +242,7 @@ public static void Status(string subSystem, string messageFmt, params object[] a
240242
public static void Warning(string subSystem, string messageFmt, params object[] args)
241243
{
242244
LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.WARNING, subSystem, messageFmt, args));
245+
System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.WARNING, subSystem, string.Format(messageFmt, args));
243246
}
244247
/// <summary>
245248
/// Log a ERROR level message.
@@ -250,6 +253,7 @@ public static void Warning(string subSystem, string messageFmt, params object[]
250253
public static void Error(string subSystem, string messageFmt, params object[] args)
251254
{
252255
LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.ERROR, subSystem, messageFmt, args));
256+
System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.ERROR, subSystem, string.Format(messageFmt, args));
253257
}
254258
/// <summary>
255259
/// Log a CRITICAL level message.
@@ -260,6 +264,7 @@ public static void Error(string subSystem, string messageFmt, params object[] ar
260264
public static void Critical(string subSystem, string messageFmt, params object[] args)
261265
{
262266
LogSystem.Instance.ProcessLog(new LogRecord(LogLevel.CRITICAL, subSystem, messageFmt, args));
267+
System.Console.WriteLine("[{0}][{1}]: {2}", LogLevel.CRITICAL, subSystem, string.Format(messageFmt, args));
263268
}
264269
}
265270
}

‎Scripts/Services/RetrieveAndRank/DataModels.cs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,25 @@ public class Doc
303303
/// </summary>
304304
public string[] bibliography { get; set; }
305305
}
306+
307+
/// <summary>
308+
/// Cluster object containing it's associated configs and collections.
309+
/// </summary>
310+
public class ClusterInfo
311+
{
312+
/// <summary>
313+
/// The Cluster's info.
314+
/// </summary>
315+
public SolrClusterResponse Cluster { get; set; }
316+
/// <summary>
317+
/// Cluster's configs.
318+
/// </summary>
319+
public string[] Configs { get; set; }
320+
/// <summary>
321+
/// Cluster's collections.
322+
/// </summary>
323+
public string[] Collections { get; set; }
324+
}
306325
#endregion
307326

308327
#region Rankers

‎Scripts/Services/RetrieveAndRank/RetrieveAndRank.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ private void OnCreateClusterResponse(RESTConnector.Request req, RESTConnector.Re
280280

281281
DeleteClusterRequest req = new DeleteClusterRequest();
282282
req.Callback = callback;
283+
req.Data = customData;
283284
req.ClusterID = clusterID;
284285
req.Delete = true;
285286
req.Timeout = REQUEST_TIMEOUT;
@@ -318,7 +319,7 @@ public class DeleteClusterRequest : RESTConnector.Request
318319
/// <param name="resp"></param>
319320
private void OnDeleteClusterResponse(RESTConnector.Request req, RESTConnector.Response resp)
320321
{
321-
Log.Debug("RetrieveAndRank", "OnDeleteClusterResponse!!");
322+
Log.Debug("RetrieveAndRank", "OnDeleteClusterResponse success: {0}", resp.Success);
322323
if (((DeleteClusterRequest)req).Callback != null)
323324
((DeleteClusterRequest)req).Callback(resp.Success, ((DeleteClusterRequest)req).Data);
324325
}
@@ -348,6 +349,7 @@ private void OnDeleteClusterResponse(RESTConnector.Request req, RESTConnector.Re
348349

349350
GetClusterRequest req = new GetClusterRequest();
350351
req.Callback = callback;
352+
req.Data = customData;
351353
req.ClusterID = clusterID;
352354
req.Timeout = REQUEST_TIMEOUT;
353355

@@ -437,6 +439,7 @@ private void OnGetClusterResponse(RESTConnector.Request req, RESTConnector.Respo
437439
GetClusterConfigsRequest req = new GetClusterConfigsRequest();
438440
req.Callback = callback;
439441
req.ClusterID = clusterID;
442+
req.Data = customData;
440443
req.Timeout = REQUEST_TIMEOUT;
441444
req.OnResponse = OnGetClusterConfigsResponse;
442445

@@ -530,6 +533,7 @@ private void OnGetClusterConfigsResponse(RESTConnector.Request req, RESTConnecto
530533

531534
DeleteClusterConfigRequest req = new DeleteClusterConfigRequest();
532535
req.Callback = callback;
536+
req.Data = customData;
533537
req.ClusterID = clusterID;
534538
req.ConfigID = configID;
535539
req.Timeout = REQUEST_TIMEOUT;
@@ -718,6 +722,7 @@ public void SaveConfig(OnSaveClusterConfig callback, byte[] configData, string c
718722

719723
UploadClusterConfigRequest req = new UploadClusterConfigRequest();
720724
req.Callback = callback;
725+
req.Data = customData;
721726
req.ClusterID = clusterID;
722727
req.ConfigName = configName;
723728
req.OnResponse = UploadClusterConfigResponse;
@@ -1499,6 +1504,7 @@ private void OnRankResponse(RESTConnector.Request req, RESTConnector.Response re
14991504

15001505
DeleteRankerRequest req = new DeleteRankerRequest();
15011506
req.Callback = callback;
1507+
req.Data = customData;
15021508
req.RankerID = rankerID;
15031509
req.Timeout = REQUEST_TIMEOUT;
15041510
req.Delete = true;
@@ -1566,6 +1572,7 @@ private void OnDeleteRankerResponse(RESTConnector.Request req, RESTConnector.Res
15661572

15671573
GetRankerRequest req = new GetRankerRequest();
15681574
req.Callback = callback;
1575+
req.Data = customData;
15691576
req.RankerID = rankerID;
15701577
req.Timeout = REQUEST_TIMEOUT;
15711578

‎Scripts/Services/VisualRecognition/DataModels.cs

100644100755
File mode changed.

‎Scripts/Services/VisualRecognition/VisualRecognition.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ private void OnClassifyResp(RESTConnector.Request req, RESTConnector.Response re
297297
req.Callback = callback;
298298
req.Data = customData;
299299
req.OnResponse = OnDetectFacesResp;
300+
req.Timeout = REQUEST_TIMEOUT;
300301
req.Parameters["api_key"] = mp_ApiKey;
301302
req.Parameters["url"] = url;
302303
req.Parameters["version"] = VisualRecognitionVersion.Version;
@@ -444,6 +445,7 @@ private void OnDetectFacesResp(RESTConnector.Request req, RESTConnector.Response
444445
req.Data = customData;
445446
req.Timeout = REQUEST_TIMEOUT;
446447
req.OnResponse = OnRecognizeTextResp;
448+
req.Timeout = REQUEST_TIMEOUT;
447449
req.Parameters["api_key"] = mp_ApiKey;
448450
req.Parameters["url"] = url;
449451
req.Parameters["version"] = VisualRecognitionVersion.Version;
@@ -647,7 +649,7 @@ private void OnGetClassifier(GetClassifiersPerClassifierVerbose classifier, stri
647649
req.Data = customData;
648650
req.Parameters["api_key"] = mp_ApiKey;
649651
req.Parameters["version"] = VisualRecognitionVersion.Version;
650-
req.Timeout = 10.0f * 60.0f;
652+
req.Timeout = 20.0f * 60.0f;
651653
req.OnResponse = OnGetClassifiersResp;
652654

653655
return connector.Send(req);
@@ -720,7 +722,6 @@ private void OnGetClassifiersResp(RESTConnector.Request req, RESTConnector.Respo
720722

721723
GetClassifierReq req = new GetClassifierReq();
722724
req.Callback = callback;
723-
req.Data = customData;
724725
req.Parameters["api_key"] = mp_ApiKey;
725726
req.Parameters["version"] = VisualRecognitionVersion.Version;
726727
req.OnResponse = OnGetClassifierResp;

‎Scripts/UnitTests/TestAlchemyLanguage.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,8 @@ public override IEnumerator RunTest()
366366
m_AlchemyAPI.GetNews(OnGetNews, returnFields, queryFields);
367367
while(!m_GetNewsTested)
368368
yield return null;
369+
370+
yield break;
369371
}
370372

371373
#region GetAuthors

‎Scripts/UnitTests/TestConversation.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ public override IEnumerator RunTest()
4242
while(!m_MessageTested)
4343
yield return null;
4444
}
45-
}
45+
46+
yield break;
47+
}
4648

4749
private void OnMessage(MessageResponse resp)
4850
{

‎Scripts/UnitTests/TestDialog.cs

100644100755
File mode changed.

0 commit comments

Comments
 (0)