Skip to content

[ComputerVision] Add Brand Analysis test case #5305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cthrash wants to merge 6 commits into from
Closed

[ComputerVision] Add Brand Analysis test case #5305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98df1e6
Update README.md
shahabhijeet Jan 20, 2019
adb4b7c
Updated SDK for Brand Analysis
cthrash Mar 1, 2019
2a476a5
Fix response JSON for RecognizeTextInStream
cthrash Mar 2, 2019
d5c059d
Fix merge problem with README
cthrash Mar 2, 2019
c5b4fbc
Remove key
cthrash Mar 2, 2019
ec27bc2
Add regenerated sdkinfo file
cthrash Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions ...on.Tests/SessionRecords/ComputerVisionSDK.Tests.VisionAnalyzeTests/AnalyzeBrandsTest.json
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 81 additions & 21 deletions ...onRecords/ComputerVisionSDK.Tests.VisionRecognizeTextTests/RecognizeTextInStreamTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
""
],
"User-Agent": [
"FxVersion/4.6.25211.01",
"Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ComputerVisionClient/3.2.0.0"
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.10.0.17763.",
"Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ComputerVisionClient/3.5.0.0"
],
"Content-Type": [
"application/octet-stream"
Expand All @@ -25,13 +27,13 @@
"no-cache"
],
"Date": [
"Mon, 30 Jul 2018 21:58:44 GMT"
"Sat, 02 Feb 2019 01:00:34 GMT"
],
"Pragma": [
"no-cache"
],
"Operation-Location": [
"https://westus.api.cognitive.microsoft.com/vision/v2.0/textOperations/dc2ec7b5-fb7a-4152-a91a-f005abb9a97f"
"https://westus.api.cognitive.microsoft.com/vision/v2.0/textOperations/bebee14c-7958-48c1-9198-3aacef389369"
],
"X-AspNet-Version": [
"4.0.30319"
Expand All @@ -40,7 +42,7 @@
"ASP.NET"
],
"apim-request-id": [
"336fb2ac-796b-48b1-bb29-5a480a0d8d87"
"02cb7086-298a-49f1-a161-23687bfd8073"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains; preload"
Expand All @@ -59,25 +61,27 @@
"StatusCode": 202
},
{
"RequestUri": "/vision/v2.0/textOperations/dc2ec7b5-fb7a-4152-a91a-f005abb9a97f",
"EncodedRequestUri": "L3Zpc2lvbi92Mi4wL3RleHRPcGVyYXRpb25zL2RjMmVjN2I1LWZiN2EtNDE1Mi1hOTFhLWYwMDVhYmI5YTk3Zg==",
"RequestUri": "/vision/v2.0/textOperations/bebee14c-7958-48c1-9198-3aacef389369",
"EncodedRequestUri": "L3Zpc2lvbi92Mi4wL3RleHRPcGVyYXRpb25zL2JlYmVlMTRjLTc5NTgtNDhjMS05MTk4LTNhYWNlZjM4OTM2OQ==",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"Ocp-Apim-Subscription-Key": [
""
],
"User-Agent": [
"FxVersion/4.6.25211.01",
"Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ComputerVisionClient/3.2.0.0"
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.10.0.17763.",
"Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ComputerVisionClient/3.5.0.0"
]
},
"ResponseHeaders": {
"Cache-Control": [
"no-cache"
],
"Date": [
"Mon, 30 Jul 2018 21:58:44 GMT"
"Sat, 02 Feb 2019 01:00:34 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -89,7 +93,7 @@
"ASP.NET"
],
"apim-request-id": [
"7f3cc94b-8067-475c-83db-194b8a16b621"
"f0a75942-98f0-4cbf-b2b2-7851e175347e"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains; preload"
Expand All @@ -98,7 +102,7 @@
"nosniff"
],
"Content-Length": [
"23"
"20"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -107,29 +111,31 @@
"-1"
]
},
"ResponseBody": "{\r\n \"status\": \"NotStarted\"\r\n}",
"ResponseBody": "{\r\n \"status\": \"Running\"\r\n}",
"StatusCode": 200
},
{
"RequestUri": "/vision/v2.0/textOperations/dc2ec7b5-fb7a-4152-a91a-f005abb9a97f",
"EncodedRequestUri": "L3Zpc2lvbi92Mi4wL3RleHRPcGVyYXRpb25zL2RjMmVjN2I1LWZiN2EtNDE1Mi1hOTFhLWYwMDVhYmI5YTk3Zg==",
"RequestUri": "/vision/v2.0/textOperations/bebee14c-7958-48c1-9198-3aacef389369",
"EncodedRequestUri": "L3Zpc2lvbi92Mi4wL3RleHRPcGVyYXRpb25zL2JlYmVlMTRjLTc5NTgtNDhjMS05MTk4LTNhYWNlZjM4OTM2OQ==",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"Ocp-Apim-Subscription-Key": [
""
],
"User-Agent": [
"FxVersion/4.6.25211.01",
"Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ComputerVisionClient/3.2.0.0"
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.10.0.17763.",
"Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ComputerVisionClient/3.5.0.0"
]
},
"ResponseHeaders": {
"Cache-Control": [
"no-cache"
],
"Date": [
"Mon, 30 Jul 2018 21:58:45 GMT"
"Sat, 02 Feb 2019 01:00:35 GMT"
],
"Pragma": [
"no-cache"
Expand All @@ -141,7 +147,7 @@
"ASP.NET"
],
"apim-request-id": [
"f590ae8d-22d0-4cb5-b940-5b52d9f56368"
"bd98dd0c-2c1e-4c16-bb6e-8d9fefac74ce"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains; preload"
Expand All @@ -150,7 +156,7 @@
"nosniff"
],
"Content-Length": [
"1067"
"20"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -159,7 +165,61 @@
"-1"
]
},
"ResponseBody": "{\r\n \"status\": \"Succeeded\",\r\n \"recognitionResult\": {\r\n \"lines\": [\r\n {\r\n \"boundingBox\": [\r\n 209,\r\n 281,\r\n 544,\r\n 280,\r\n 545,\r\n 317,\r\n 210,\r\n 318\r\n ],\r\n \"text\": \"You must be the change\",\r\n \"words\": [\r\n {\r\n \"boundingBox\": [\r\n 203,\r\n 282,\r\n 267,\r\n 280,\r\n 273,\r\n 327,\r\n 209,\r\n 328\r\n ],\r\n \"text\": \"You\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 270,\r\n 280,\r\n 350,\r\n 277,\r\n 356,\r\n 324,\r\n 276,\r\n 326\r\n ],\r\n \"text\": \"must\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 340,\r\n 278,\r\n 385,\r\n 276,\r\n 392,\r\n 323,\r\n 347,\r\n 324\r\n ],\r\n \"text\": \"be\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 385,\r\n 276,\r\n 443,\r\n 275,\r\n 449,\r\n 321,\r\n 392,\r\n 323\r\n ],\r\n \"text\": \"the\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 443,\r\n 275,\r\n 545,\r\n 272,\r\n 551,\r\n 319,\r\n 449,\r\n 321\r\n ],\r\n \"text\": \"change\"\r\n }\r\n ]\r\n },\r\n {\r\n \"boundingBox\": [\r\n 260,\r\n 350,\r\n 686,\r\n 340,\r\n 687,\r\n 383,\r\n 261,\r\n 394\r\n ],\r\n \"text\": \"you want to see in the world !\",\r\n \"words\": [\r\n {\r\n \"boundingBox\": [\r\n 241,\r\n 344,\r\n 300,\r\n 344,\r\n 304,\r\n 395,\r\n 245,\r\n 395\r\n ],\r\n \"text\": \"you\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 283,\r\n 344,\r\n 372,\r\n 344,\r\n 375,\r\n 395,\r\n 287,\r\n 395\r\n ],\r\n \"text\": \"want\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 359,\r\n 344,\r\n 414,\r\n 344,\r\n 417,\r\n 395,\r\n 363,\r\n 395\r\n ],\r\n \"text\": \"to\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 418,\r\n 344,\r\n 481,\r\n 343,\r\n 485,\r\n 394,\r\n 422,\r\n 395\r\n ],\r\n \"text\": \"see\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 472,\r\n 344,\r\n 527,\r\n 343,\r\n 531,\r\n 394,\r\n 476,\r\n 394\r\n ],\r\n \"text\": \"in\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 510,\r\n 343,\r\n 582,\r\n 343,\r\n 585,\r\n 394,\r\n 514,\r\n 394\r\n ],\r\n \"text\": \"the\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 569,\r\n 343,\r\n 682,\r\n 343,\r\n 686,\r\n 394,\r\n 573,\r\n 394\r\n ],\r\n \"text\": \"world\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 661,\r\n 343,\r\n 703,\r\n 343,\r\n 707,\r\n 394,\r\n 665,\r\n 394\r\n ],\r\n \"text\": \"!\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}",
"ResponseBody": "{\r\n \"status\": \"Running\"\r\n}",
"StatusCode": 200
},
{
"RequestUri": "/vision/v2.0/textOperations/bebee14c-7958-48c1-9198-3aacef389369",
"EncodedRequestUri": "L3Zpc2lvbi92Mi4wL3RleHRPcGVyYXRpb25zL2JlYmVlMTRjLTc5NTgtNDhjMS05MTk4LTNhYWNlZjM4OTM2OQ==",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"Ocp-Apim-Subscription-Key": [
""
],
"User-Agent": [
"FxVersion/4.6.26614.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.10.0.17763.",
"Microsoft.Azure.CognitiveServices.Vision.ComputerVision.ComputerVisionClient/3.5.0.0"
]
},
"ResponseHeaders": {
"Cache-Control": [
"no-cache"
],
"Date": [
"Sat, 02 Feb 2019 01:00:36 GMT"
],
"Pragma": [
"no-cache"
],
"X-AspNet-Version": [
"4.0.30319"
],
"X-Powered-By": [
"ASP.NET"
],
"apim-request-id": [
"c1f824d9-9ef4-444e-9669-84dcb278a5c3"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains; preload"
],
"x-content-type-options": [
"nosniff"
],
"Content-Length": [
"1027"
],
"Content-Type": [
"application/json; charset=utf-8"
],
"Expires": [
"-1"
]
},
"ResponseBody": "{\r\n \"status\": \"Succeeded\",\r\n \"recognitionResult\": {\r\n \"lines\": [\r\n {\r\n \"boundingBox\": [\r\n 204,\r\n 281,\r\n 548,\r\n 280,\r\n 549,\r\n 315,\r\n 205,\r\n 316\r\n ],\r\n \"text\": \"You must be the change\",\r\n \"words\": [\r\n {\r\n \"boundingBox\": [\r\n 208,\r\n 281,\r\n 271,\r\n 282,\r\n 270,\r\n 317,\r\n 207,\r\n 317\r\n ],\r\n \"text\": \"You\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 280,\r\n 283,\r\n 350,\r\n 284,\r\n 349,\r\n 316,\r\n 279,\r\n 317\r\n ],\r\n \"text\": \"must\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 350,\r\n 284,\r\n 388,\r\n 284,\r\n 386,\r\n 316,\r\n 349,\r\n 316\r\n ],\r\n \"text\": \"be\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 395,\r\n 284,\r\n 446,\r\n 284,\r\n 444,\r\n 315,\r\n 393,\r\n 316\r\n ],\r\n \"text\": \"the\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 455,\r\n 284,\r\n 547,\r\n 284,\r\n 544,\r\n 313,\r\n 453,\r\n 315\r\n ],\r\n \"text\": \"change\"\r\n }\r\n ]\r\n },\r\n {\r\n \"boundingBox\": [\r\n 254,\r\n 350,\r\n 693,\r\n 339,\r\n 695,\r\n 378,\r\n 255,\r\n 389\r\n ],\r\n \"text\": \"you want to see in the world!!\",\r\n \"words\": [\r\n {\r\n \"boundingBox\": [\r\n 255,\r\n 363,\r\n 289,\r\n 359,\r\n 291,\r\n 382,\r\n 257,\r\n 384\r\n ],\r\n \"text\": \"you\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 300,\r\n 358,\r\n 358,\r\n 352,\r\n 360,\r\n 379,\r\n 302,\r\n 382\r\n ],\r\n \"text\": \"want\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 377,\r\n 350,\r\n 402,\r\n 349,\r\n 404,\r\n 377,\r\n 378,\r\n 378\r\n ],\r\n \"text\": \"to\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 432,\r\n 347,\r\n 470,\r\n 345,\r\n 472,\r\n 376,\r\n 434,\r\n 376\r\n ],\r\n \"text\": \"see\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 491,\r\n 344,\r\n 513,\r\n 344,\r\n 514,\r\n 375,\r\n 493,\r\n 375\r\n ],\r\n \"text\": \"in\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 528,\r\n 343,\r\n 571,\r\n 343,\r\n 573,\r\n 375,\r\n 530,\r\n 375\r\n ],\r\n \"text\": \"the\"\r\n },\r\n {\r\n \"boundingBox\": [\r\n 588,\r\n 343,\r\n 700,\r\n 346,\r\n 702,\r\n 379,\r\n 590,\r\n 376\r\n ],\r\n \"text\": \"world!!\",\r\n \"confidence\": \"Low\"\r\n }\r\n ]\r\n }\r\n ]\r\n }\r\n}",
"StatusCode": 200
}
],
Expand Down
Binary file added ...e/Vision/ComputerVision/ComputerVision.Tests/TestImages/MicrosoftRealMadrid.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions ...nitiveServices/dataPlane/Vision/ComputerVision/ComputerVision.Tests/VisionAnalyzeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,37 @@ public void AnalyzeImageTest()
}
}


[Fact]
public void AnalyzeBrandsTest()
{
using (MockContext context = MockContext.Start(this.GetType().FullName))
{
HttpMockServer.Initialize(this.GetType().FullName, "AnalyzeBrandsTest");

using (IComputerVisionClient client = GetComputerVisionClient(HttpMockServer.CreateInstance()))
using (FileStream stream = new FileStream(GetTestImagePath("MicrosoftRealMadrid.jpg"), FileMode.Open))
{
ImageAnalysis result = client.AnalyzeImageInStreamAsync(
stream,
new List<VisualFeatureTypes>()
{
VisualFeatureTypes.Brands
})
.Result;

Assert.Equal("Microsoft", result.Brands[0].Name);
Assert.True(result.Brands[0].Confidence > 0.5);
Assert.True(result.Brands[0].Rectangle.X >= 0);
Assert.True(result.Brands[0].Rectangle.W >= 0);
Assert.True(result.Brands[0].Rectangle.X + result.Brands[0].Rectangle.W <= result.Metadata.Width);
Assert.True(result.Brands[0].Rectangle.Y >= 0);
Assert.True(result.Brands[0].Rectangle.H >= 0);
Assert.True(result.Brands[0].Rectangle.Y + result.Brands[0].Rectangle.H <= result.Metadata.Height);
}
}
}

[Fact]
public void AnalyzeImageNullImageTest()
{
Expand Down
4 changes: 2 additions & 2 deletions ...Services/dataPlane/Vision/ComputerVision/ComputerVision.Tests/VisionRecognizeTextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ public void RecognizeTextInStreamTest()
Assert.NotNull(recognitionResult);

Assert.Equal(
new string[] { "You must be the change", "you want to see in the world !" },
new string[] { "You must be the change", "you want to see in the world!!" },
recognitionResult.Lines.Select(line => line.Text));
Assert.Equal(2, recognitionResult.Lines.Count);
Assert.Equal(5, recognitionResult.Lines[0].Words.Count);
Assert.Equal(8, recognitionResult.Lines[1].Words.Count);
Assert.Equal(7, recognitionResult.Lines[1].Words.Count);
}
}
}
Expand Down
Loading