chore: Address comments

mediumTaj · mediumTaj · commit 23d290292090 · 2019-09-30T12:22:46.000-05:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -149,4 +149,8 @@ replace = {new_version}
 
 [bumpversion:file:test/VisualRecognition.v4.IntegrationTests/IBM.Watson.VisualRecognition.v4.IntegrationTests.csproj]
 search = {current_version}
-replace = {new_version}
+replace = {new_version}
+
+[bumpversion:file:test/VisualRecognition.v4.UnitTests/IBM.Watson.VisualRecognition.v4.UnitTests.csproj]
+search = {current_version}
+replace = {new_version}
diff --git a/src/IBM.Watson.VisualRecognition.v4/IVisualRecognitionService.cs b/src/IBM.Watson.VisualRecognition.v4/IVisualRecognitionService.cs
@@ -24,7 +24,7 @@ namespace IBM.Watson.VisualRecognition.v4
 {
     public partial interface IVisualRecognitionService
     {
-        DetailedResponse<AnalyzeResponse> Analyze(string collectionIds, string features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null);
+        DetailedResponse<AnalyzeResponse> Analyze(List<string> collectionIds, List<string> features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null);
         DetailedResponse<Collection> CreateCollection(string name = null, string description = null);
         DetailedResponse<CollectionsList> ListCollections();
         DetailedResponse<Collection> GetCollection(string collectionId);
diff --git a/src/IBM.Watson.VisualRecognition.v4/VisualRecognitionService.cs b/src/IBM.Watson.VisualRecognition.v4/VisualRecognitionService.cs
@@ -82,13 +82,13 @@ public VisualRecognitionService(string versionDate, IAuthenticator authenticator
         /// You can also include images with the **images_file** parameter. (optional)</param>
         /// <param name="threshold">The minimum score a feature must have to be returned. (optional)</param>
         /// <returns><see cref="AnalyzeResponse" />AnalyzeResponse</returns>
-        public DetailedResponse<AnalyzeResponse> Analyze(string collectionIds, string features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null)
+        public DetailedResponse<AnalyzeResponse> Analyze(List<string> collectionIds, List<string> features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null)
         {
-            if (string.IsNullOrEmpty(collectionIds))
+            if (collectionIds == null || collectionIds.Count == 0)
             {
                 throw new ArgumentNullException("`collectionIds` is required for `Analyze`");
             }
-            if (string.IsNullOrEmpty(features))
+            if (features == null || features.Count == 0)
             {
                 throw new ArgumentNullException("`features` is required for `Analyze`");
             }
@@ -106,14 +106,14 @@ public DetailedResponse<AnalyzeResponse> Analyze(string collectionIds, string fe
 
                 if (collectionIds != null)
                 {
-                    var collectionIdsContent = new StringContent(collectionIds, Encoding.UTF8, HttpMediaType.TEXT_PLAIN);
+                    var collectionIdsContent = new StringContent(string.Join(",", collectionIds.ToArray()), Encoding.UTF8, HttpMediaType.TEXT_PLAIN);
                     collectionIdsContent.Headers.ContentType = null;
                     formData.Add(collectionIdsContent, "collection_ids");
                 }
 
                 if (features != null)
                 {
-                    var featuresContent = new StringContent(features, Encoding.UTF8, HttpMediaType.TEXT_PLAIN);
+                    var featuresContent = new StringContent(string.Join(",", features.ToArray()), Encoding.UTF8, HttpMediaType.TEXT_PLAIN);
                     featuresContent.Headers.ContentType = null;
                     formData.Add(featuresContent, "features");
                 }
diff --git a/test/VisualRecognition.v4.IntegrationTests/Properties/AssemblyInfo.cs b/test/VisualRecognition.v4.IntegrationTests/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 // associated with an assembly.
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("IBM")]
-[assembly: AssemblyProduct("IBM.Watson.VisualRecognition.v3.IntegrationTests")]
+[assembly: AssemblyProduct("IBM.Watson.VisualRecognition.v4.IntegrationTests")]
 [assembly: AssemblyTrademark("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible
diff --git a/test/VisualRecognition.v4.IntegrationTests/VisualRecognitionServiceIntegrationTests.cs b/test/VisualRecognition.v4.IntegrationTests/VisualRecognitionServiceIntegrationTests.cs
@@ -84,8 +84,8 @@ public void Analyze_Success()
 
                     service.WithHeader("X-Watson-Test", "1");
                     analyzeResult = service.Analyze(
-                        collectionIds: giraffeCollectionId + "," + turtleCollectionId,
-                        features: "objects",
+                        collectionIds: new List<string>() { giraffeCollectionId, turtleCollectionId },
+                        features: new List<string>() { "objects" },
                         imagesFile: imagesFile);
                 }
             }
@@ -300,7 +300,7 @@ public void Training_Success()
             Assert.IsTrue(addTrainingDataResult.Result.Objects[0]._Object == objectName);
         }
         #endregion
-        
+
         #region Delete labeled data
         [TestMethod]
         public void DeleteUserData()
diff --git a/test/VisualRecognition.v4.UnitTests/VisualRecognitionUnitTests.cs b/test/VisualRecognition.v4.UnitTests/VisualRecognitionUnitTests.cs

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace IBM.Watson.VisualRecognition.v4`
`24`	`24`	`{`
`25`	`25`	`public partial interface IVisualRecognitionService`
`26`	`26`	`{`
`27`		`- DetailedResponse<AnalyzeResponse> Analyze(string collectionIds, string features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null);`
	`27`	`+ DetailedResponse<AnalyzeResponse> Analyze(List<string> collectionIds, List<string> features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null);`
`28`	`28`	`DetailedResponse<Collection> CreateCollection(string name = null, string description = null);`
`29`	`29`	`DetailedResponse<CollectionsList> ListCollections();`
`30`	`30`	`DetailedResponse<Collection> GetCollection(string collectionId);`
Original file line number	Diff line number	Diff line change
`@@ -82,13 +82,13 @@ public VisualRecognitionService(string versionDate, IAuthenticator authenticator`
`82`	`82`	`/// You can also include images with the images_file parameter. (optional)</param>`
`83`	`83`	`/// <param name="threshold">The minimum score a feature must have to be returned. (optional)</param>`
`84`	`84`	`/// <returns><see cref="AnalyzeResponse" />AnalyzeResponse</returns>`
`85`		`- public DetailedResponse<AnalyzeResponse> Analyze(string collectionIds, string features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null)`
	`85`	`+ public DetailedResponse<AnalyzeResponse> Analyze(List<string> collectionIds, List<string> features, List<FileWithMetadata> imagesFile = null, List<string> imageUrl = null, float? threshold = null)`
`86`	`86`	`{`
`87`		`- if (string.IsNullOrEmpty(collectionIds))`
	`87`	`+ if (collectionIds == null \|\| collectionIds.Count == 0)`
`88`	`88`	`{`
`89`	`89`	throw new ArgumentNullException("`collectionIds` is required for `Analyze`");
`90`	`90`	`}`
`91`		`- if (string.IsNullOrEmpty(features))`
	`91`	`+ if (features == null \|\| features.Count == 0)`
`92`	`92`	`{`
`93`	`93`	throw new ArgumentNullException("`features` is required for `Analyze`");
`94`	`94`	`}`
`@@ -106,14 +106,14 @@ public DetailedResponse<AnalyzeResponse> Analyze(string collectionIds, string fe`
`106`	`106`
`107`	`107`	`if (collectionIds != null)`
`108`	`108`	`{`
`109`		`- var collectionIdsContent = new StringContent(collectionIds, Encoding.UTF8, HttpMediaType.TEXT_PLAIN);`
	`109`	`+ var collectionIdsContent = new StringContent(string.Join(",", collectionIds.ToArray()), Encoding.UTF8, HttpMediaType.TEXT_PLAIN);`
`110`	`110`	`collectionIdsContent.Headers.ContentType = null;`
`111`	`111`	`formData.Add(collectionIdsContent, "collection_ids");`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if (features != null)`
`115`	`115`	`{`
`116`		`- var featuresContent = new StringContent(features, Encoding.UTF8, HttpMediaType.TEXT_PLAIN);`
	`116`	`+ var featuresContent = new StringContent(string.Join(",", features.ToArray()), Encoding.UTF8, HttpMediaType.TEXT_PLAIN);`
`117`	`117`	`featuresContent.Headers.ContentType = null;`
`118`	`118`	`formData.Add(featuresContent, "features");`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ public void Analyze_Success()`
`84`	`84`
`85`	`85`	`service.WithHeader("X-Watson-Test", "1");`
`86`	`86`	`analyzeResult = service.Analyze(`
`87`		`- collectionIds: giraffeCollectionId + "," + turtleCollectionId,`
`88`		`- features: "objects",`
	`87`	`+ collectionIds: new List<string>() { giraffeCollectionId, turtleCollectionId },`
	`88`	`+ features: new List<string>() { "objects" },`
`89`	`89`	`imagesFile: imagesFile);`
`90`	`90`	`}`
`91`	`91`	`}`
`@@ -300,7 +300,7 @@ public void Training_Success()`
`300`	`300`	`Assert.IsTrue(addTrainingDataResult.Result.Objects[0]._Object == objectName);`
`301`	`301`	`}`
`302`	`302`	`#endregion`
`303`		`-`
	`303`	`+`
`304`	`304`	`#region Delete labeled data`
`305`	`305`	`[TestMethod]`
`306`	`306`	`public void DeleteUserData()`