Skip to content

Commit b56eb51

Browse files
committed
chore(Visual Recognition V3): Wrapped method to wait for classifier in try catch
1 parent 4aee41f commit b56eb51

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

Tests/CoreTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class CoreTests
2525
[Test]
2626
public void TestGetDefaultHeaders()
2727
{
28-
Dictionary<string, string> defaultHeaders = Common.GetDefaultheaders("TestSevice", "V1", "TestOperation");
28+
Dictionary<string, string> defaultHeaders = Common.GetSdkHeaders("TestSevice", "V1", "TestOperation");
2929
Assert.IsNotNull(defaultHeaders);
3030
Assert.IsTrue(defaultHeaders["X-IBMCloud-SDK-Analytics"] == "service_name=TestSevice;service_version=V1;operation_id=TestOperation");
3131
Assert.IsNotNull(defaultHeaders["User-Agent"]);

Tests/VisualRecognitionV3IntegrationTests.cs

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*
1616
*/
1717

18+
using System;
1819
using System.Collections;
1920
using System.Collections.Generic;
2021
using System.IO;
@@ -319,7 +320,7 @@ public IEnumerator TestGetCoreMlModel()
319320
yield return null;
320321
}
321322
#endregion
322-
323+
323324
#region DeleteClassifier
324325
[UnityTest, Order(98)]
325326
public IEnumerator TestDeleteClassifier()
@@ -374,23 +375,30 @@ private IEnumerator CheckClassifierStatus()
374375

375376
Log.Debug("VisualRecognitionServiceV3IntegrationTests", "Attempting to GetClassifier...");
376377
Classifier getClassifierResponse = null;
377-
service.GetClassifier(
378-
callback: (DetailedResponse<Classifier> response, IBMError error, Dictionary<string, object> customResponseData) =>
379-
{
380-
getClassifierResponse = response.Result;
381-
Log.Debug("VisualRecognitionServiceV3IntegrationTests", "CheckClassifierStatus: {0}", getClassifierResponse.Status);
382-
if (getClassifierResponse.Status == Classifier.StatusValue.READY || getClassifierResponse.Status == Classifier.StatusValue.FAILED)
383-
{
384-
isClassifierReady = true;
385-
}
386-
else
378+
try
379+
{
380+
service.GetClassifier(
381+
callback: (DetailedResponse<Classifier> response, IBMError error, Dictionary<string, object> customResponseData) =>
387382
{
388-
Runnable.Run(CheckClassifierStatus());
389-
}
390-
},
391-
classifierId: classifierId,
392-
customData: customData
393-
);
383+
getClassifierResponse = response.Result;
384+
Log.Debug("VisualRecognitionServiceV3IntegrationTests", "CheckClassifierStatus: {0}", getClassifierResponse.Status);
385+
if (getClassifierResponse.Status == Classifier.StatusValue.READY || getClassifierResponse.Status == Classifier.StatusValue.FAILED)
386+
{
387+
isClassifierReady = true;
388+
}
389+
else
390+
{
391+
Runnable.Run(CheckClassifierStatus());
392+
}
393+
},
394+
classifierId: classifierId,
395+
customData: customData
396+
);
397+
}
398+
catch
399+
{
400+
Runnable.Run(CheckClassifierStatus());
401+
}
394402

395403
while (getClassifierResponse == null)
396404
yield return null;

0 commit comments

Comments
 (0)