ToString override in query results model, tracing query results in integration test

Author: mediumTaj

Scripts/Services/Discovery/v1/DataModels.cs

@@ -16,6 +16,7 @@
 */
 
 using FullSerializer;
+using System.Text;
 
 namespace IBM.Watson.DeveloperCloud.Services.Discovery.v1
 {
@@ -340,6 +341,36 @@ public class QueryResponse
         public double matching_results { get; set; }
         public QueryResult[] results { get; set; }
         public QueryAggregation aggregations { get; set; }
+
+        public override string ToString()
+        {
+            StringBuilder stringBuilder = new StringBuilder();
+
+            if (!string.IsNullOrEmpty(matching_results.ToString()))
+                stringBuilder.Append(string.Format("matching_results: {0}", matching_results.ToString()));
+
+            foreach(QueryResult result in results)
+            {
+                if(!string.IsNullOrEmpty(result.id))
+                    stringBuilder.Append(string.Format("result id: {0}", result.id) + "\n\t");
+
+                if(!string.IsNullOrEmpty(result.score.ToString()))
+                    stringBuilder.Append(string.Format("result score: {0}", result.score) + "\n\t");
+            }
+
+            stringBuilder.Append("\n");
+
+            if (aggregations != null && aggregations.term != null && aggregations.term.results != null)
+            {
+                if (!string.IsNullOrEmpty(aggregations.term.results.key))
+                    stringBuilder.Append(string.Format("key: {0}", aggregations.term.results.key));
+
+                if (!string.IsNullOrEmpty(aggregations.term.results.matching_results.ToString()))
+                    stringBuilder.Append(string.Format("key: {0}", aggregations.term.results.matching_results.ToString()));
+            }
+
+            return string.Format("{0}", stringBuilder.ToString());
+        }
     }
 
     [fsObject]

Scripts/UnitTests/TestDiscovery.cs

@@ -350,21 +350,21 @@ public override IEnumerator RunTest()
 
             #region Fields
             Log.Debug("ExampleDiscoveryV1", "Attempting to get fields");
-            if(!m_Discovery.GetFields((GetFieldsResponse resp, string customData) =>
-            {
-                if(resp != null)
-                {
-                    foreach (Field field in resp.fields)
-                        Log.Debug("ExampleDiscoveryV1", "Field: {0}, type: {1}", field.field, field.type);
-                }
-                else
-                {
-                    Log.Debug("ExampleDiscoveryV1", "Discovery.GetFields(); resp is null");
-                }
-
-                Test(resp != null);
-                m_GetFieldsTested = true;
-            }, m_CreatedEnvironmentID, m_CreatedCollectionID))
+            if (!m_Discovery.GetFields((GetFieldsResponse resp, string customData) =>
+             {
+                 if (resp != null)
+                 {
+                     foreach (Field field in resp.fields)
+                         Log.Debug("ExampleDiscoveryV1", "Field: {0}, type: {1}", field.field, field.type);
+                 }
+                 else
+                 {
+                     Log.Debug("ExampleDiscoveryV1", "Discovery.GetFields(); resp is null");
+                 }
+
+                 Test(resp != null);
+                 m_GetFieldsTested = true;
+             }, m_CreatedEnvironmentID, m_CreatedCollectionID))
                 Log.Debug("ExampleDiscoveryV1", "Failed to get fields");
 
             while (!m_GetFieldsTested)
@@ -445,10 +445,7 @@ public override IEnumerator RunTest()
             {
                 if (resp != null)
                 {
-                    //Log.Debug("ExampleDiscoveryV1", "key: {0}, matching results: {1}", resp.aggregations.term.results.key, resp.aggregations.term.results.matching_results);
-
-                    foreach (QueryResult result in resp.results)
-                        Log.Debug("ExampleDiscoveryV1", "Query response: id: {0}, score: {1}", result.id, result.score);
+                    Log.Debug("ExampleDiscoveryV1", resp.ToString());
                 }
                 else
                 {