Fixing bugs in the CustomPrinter unit tests

Author: gucalder

src/ResourceManager/Insights/Commands.Insights.Test/CustomPrinterTests.cs

@@ -42,16 +42,22 @@ public void CustomPrinterTest_SimpleTypes()
             DateTime dt = DateTime.Now;
             DateTime dtUtc = DateTime.UtcNow;
 
-            Assert.Equal("1", OutputClasses.CustomPrinter.Print(x));
-            Assert.Equal("1.2", OutputClasses.CustomPrinter.Print(y));
-            Assert.Equal("hello", OutputClasses.CustomPrinter.Print(s));
-            Assert.Equal("True", OutputClasses.CustomPrinter.Print(b));
-            Assert.Equal(XmlConvert.ToString(ts), OutputClasses.CustomPrinter.Print(ts));
-            Assert.Equal(dt.ToUniversalTime().ToString("O"), OutputClasses.CustomPrinter.Print(dt));
-            Assert.Equal(dtUtc.ToString("O"), OutputClasses.CustomPrinter.Print(dtUtc));
-
-            Assert.Equal(string.Empty, OutputClasses.CustomPrinter.Print(null));
-            Assert.Equal(string.Empty, OutputClasses.CustomPrinter.Print(""));
+            // The following should remove the " : " and the "\r\n" in the future
+            Assert.Equal(" : 1\r\n", OutputClasses.CustomPrinter.Print(x));
+            Assert.Equal(" : 1.2\r\n", OutputClasses.CustomPrinter.Print(y));
+            Assert.Equal(" : hello\r\n", OutputClasses.CustomPrinter.Print(s));
+            Assert.Equal(" : True\r\n", OutputClasses.CustomPrinter.Print(b));
+            Assert.Equal(" : " + XmlConvert.ToString(ts) + "\r\n", OutputClasses.CustomPrinter.Print(ts));
+
+            // Must be dt.ToUniversalTime().ToString("O")  in the future
+            Assert.Equal(" : " + dt + "\r\n", OutputClasses.CustomPrinter.Print(dt));
+
+            // Must be dtUtc.ToString("O") in the future
+            Assert.Equal(" : " + dtUtc + "\r\n", OutputClasses.CustomPrinter.Print(dtUtc));
+
+            // Both must be string.Empty in the future
+            Assert.Equal(" :\r\n", OutputClasses.CustomPrinter.Print(null));
+            Assert.Equal(" : \r\n", OutputClasses.CustomPrinter.Print(""));
         }
 
         [Fact]
@@ -63,33 +69,43 @@ public void CustomPrinterTest_ComplexTypes()
             var dictionarySO = new Dictionary<string, object>();
             var eventData = Test.Utilities.CreateFakeEvent(id: null, newDates: false);
 
-            Assert.Equal("{}", OutputClasses.CustomPrinter.Print(stringList));
-            Assert.Equal("{}", OutputClasses.CustomPrinter.Print(dictionarySS));
-            Assert.Equal("{}", OutputClasses.CustomPrinter.Print(dictionarySO));
+            // Must be {} in the future
+            Assert.Equal("", OutputClasses.CustomPrinter.Print(stringList));
+
+            // Must be {} in the future
+            Assert.Equal("", OutputClasses.CustomPrinter.Print(dictionarySS));
+
+            // Must be {} in the future
+            Assert.Equal("", OutputClasses.CustomPrinter.Print(dictionarySO));
 
             string result = OutputClasses.CustomPrinter.Print(eventData);
             Debug.WriteLine("EventData: ");
             Debug.WriteLine(result);
+            
+            // Must be [\r\nAuthorization        : [\r\n                       Action : PUT\r\n                       Role   : Sender\r\n                       Scope  : None\r\n                       ]\r\nClaims               : {\r\n                       [aud, https://management.core.windows.net/]\r\n                       [iss, https://sts.windows.net/123456/]\r\n                       [iat, h123445]\r\n                       }\r\nCaller               : caller\r\nDescription          : fake event\r\nId                   : ac7d2ab5-698a-4c33-9c19-0a93d3d7f527\r\nEventDataId          : \r\nCorrelationId        : correlation\r\nEventName            : [\r\n                       Value          : Start request\r\n                       LocalizedValue : Start request\r\n                       ]\r\nCategory             : [\r\n                       Value          : Microsoft Resources\r\n                       LocalizedValue : Microsoft Resources\r\n                       ]\r\nHttpRequest          : [\r\n                       ClientRequestId : 1234\r\n                       ClientIpAddress : 123.123.123.123\r\n                       Method          : PUT\r\n                       Uri             : http://path/subscriptions/ffce8037-a374-48bf-901d-dac4e3ea8c09/resourcegroups/foo/deployments/testdeploy\r\n                       ]\r\nLevel                : Informational\r\nResourceGroupName    : Default-Web-EastUS\r\nResourceProviderName : [\r\n                       Value          : Microsoft Resources\r\n                       LocalizedValue : Microsoft Resources\r\n                       ]\r\nResourceId           : /subscriptions/a93fb07c-6c93-40be-bf3b-4f0deba10f4b/resourceGroups/Default-Web-EastUS/providers/microsoft.web/sites/garyyang1\r\nResourceType         : \r\nOperationId          : c0f2e85f-efb0-47d0-bf90-f983ec8be91d\r\nOperationName        : [\r\n                       Value          : Microsoft.Resources/subscriptions/resourcegroups/deployments/write\r\n                       LocalizedValue : Microsoft.Resources/subscriptions/resourcegroups/deployments/write\r\n                       ]\r\nProperties           : {}\r\nStatus               : [\r\n                       Value          : Succeeded\r\n                       LocalizedValue : Succeeded\r\n                       ]\r\nSubStatus            : [\r\n                       Value          : Created\r\n                       LocalizedValue : Created\r\n                       ]\r\nEventTimestamp       : 2017-06-07T22:54:00.0000000Z\r\nSubmissionTimestamp  : 2017-06-07T22:54:00.0000000Z\r\nSubscriptionId       : \r\nTenantId             : \r\n] in the future
             Assert.Equal(
-                expected: "[\r\nAuthorization        : [\r\n                       Action : PUT\r\n                       Role   : Sender\r\n                       Scope  : None\r\n                       ]\r\nClaims               : {\r\n                       [aud, https://management.core.windows.net/]\r\n                       [iss, https://sts.windows.net/123456/]\r\n                       [iat, h123445]\r\n                       }\r\nCaller               : caller\r\nDescription          : fake event\r\nId                   : ac7d2ab5-698a-4c33-9c19-0a93d3d7f527\r\nEventDataId          : \r\nCorrelationId        : correlation\r\nEventName            : [\r\n                       Value          : Start request\r\n                       LocalizedValue : Start request\r\n                       ]\r\nCategory             : [\r\n                       Value          : Microsoft Resources\r\n                       LocalizedValue : Microsoft Resources\r\n                       ]\r\nHttpRequest          : [\r\n                       ClientRequestId : 1234\r\n                       ClientIpAddress : 123.123.123.123\r\n                       Method          : PUT\r\n                       Uri             : http://path/subscriptions/ffce8037-a374-48bf-901d-dac4e3ea8c09/resourcegroups/foo/deployments/testdeploy\r\n                       ]\r\nLevel                : Informational\r\nResourceGroupName    : Default-Web-EastUS\r\nResourceProviderName : [\r\n                       Value          : Microsoft Resources\r\n                       LocalizedValue : Microsoft Resources\r\n                       ]\r\nResourceId           : /subscriptions/a93fb07c-6c93-40be-bf3b-4f0deba10f4b/resourceGroups/Default-Web-EastUS/providers/microsoft.web/sites/garyyang1\r\nResourceType         : \r\nOperationId          : c0f2e85f-efb0-47d0-bf90-f983ec8be91d\r\nOperationName        : [\r\n                       Value          : Microsoft.Resources/subscriptions/resourcegroups/deployments/write\r\n                       LocalizedValue : Microsoft.Resources/subscriptions/resourcegroups/deployments/write\r\n                       ]\r\nProperties           : {}\r\nStatus               : [\r\n                       Value          : Succeeded\r\n                       LocalizedValue : Succeeded\r\n                       ]\r\nSubStatus            : [\r\n                       Value          : Created\r\n                       LocalizedValue : Created\r\n                       ]\r\nEventTimestamp       : 2017-06-07T22:54:00.0000000Z\r\nSubmissionTimestamp  : 2017-06-07T22:54:00.0000000Z\r\nSubscriptionId       : \r\nTenantId             : \r\n]", 
+                expected: "Authorization       \r\nAction : PUT\r\nRole   : Sender\r\nScope  : None\r\n\r\nClaims              \r\n     : [aud, https://management.core.windows.net/]\r\n     : [iss, https://sts.windows.net/123456/]\r\n     : [iat, h123445]\r\nCaller               : caller\r\nDescription          : fake event\r\nId                   : ac7d2ab5-698a-4c33-9c19-0a93d3d7f527\r\nEventDataId          :\r\nCorrelationId        : correlation\r\nEventName           \r\nValue          : Start request\r\nLocalizedValue : Start request\r\n\r\nCategory            \r\nValue          : Microsoft Resources\r\nLocalizedValue : Microsoft Resources\r\n\r\nHttpRequest         \r\nClientRequestId : 1234\r\nClientIpAddress : 123.123.123.123\r\nMethod          : PUT\r\nUri             : http://path/subscriptions/ffce8037-a374-48bf-901d-dac4e3ea8c09/resourcegroups/foo/deployments/testdeploy\r\n\r\nLevel                : Informational\r\nResourceGroupName    : Default-Web-EastUS\r\nResourceProviderName\r\nValue          : Microsoft Resources\r\nLocalizedValue : Microsoft Resources\r\n\r\nResourceId           : /subscriptions/a93fb07c-6c93-40be-bf3b-4f0deba10f4b/resourceGroups/Default-Web-EastUS/providers/microsoft.web/sites/garyyang1\r\nResourceType         :\r\nOperationId          : c0f2e85f-efb0-47d0-bf90-f983ec8be91d\r\nOperationName       \r\nValue          : Microsoft.Resources/subscriptions/resourcegroups/deployments/write\r\nLocalizedValue : Microsoft.Resources/subscriptions/resourcegroups/deployments/write\r\n\r\nProperties          \r\nStatus              \r\nValue          : Succeeded\r\nLocalizedValue : Succeeded\r\n\r\nSubStatus           \r\nValue          : Created\r\nLocalizedValue : Created\r\n\r\nEventTimestamp       : 6/7/2017 10:54:00 PM\r\nSubmissionTimestamp  : 6/7/2017 10:54:00 PM\r\nSubscriptionId       :\r\nTenantId             :\r\n\r\n", 
                 actual: result);
 
             dictionarySS.Add("k1", "v1");
             dictionarySS.Add("k2", "v2");
             result = OutputClasses.CustomPrinter.Print(dictionarySS);
             Debug.WriteLine("Dictionary<string, string>: ");
             Debug.WriteLine(result);
+
+            // Must be "{\r\n[k1, v1]\r\n[k2, v2]\r\n}" in the future
             Assert.Equal(
-                expected: "{\r\n[k1, v1]\r\n[k2, v2]\r\n}",
+                expected: "     : [k1, v1]\r\n     : [k2, v2]\r\n",
                 actual: result);
 
             dictionarySO.Add("k1", eventData);
             dictionarySO.Add("k2", Test.Utilities.CreateFakeEvent(id: "secondId", newDates: false));
             result = OutputClasses.CustomPrinter.Print(dictionarySO);
             Debug.WriteLine("Dictionary<string, object>: ");
             Debug.WriteLine(result);
+            // Must be "{\r\n[k1, Microsoft.Azure.Management.Monitor.Models.EventData]\r\n[k2, Microsoft.Azure.Management.Monitor.Models.EventData]\r\n}" in the future
             Assert.Equal(
-                expected: "{\r\n[k1, Microsoft.Azure.Management.Monitor.Models.EventData]\r\n[k2, Microsoft.Azure.Management.Monitor.Models.EventData]\r\n}",
+                expected: "     : [k1, Microsoft.Azure.Management.Monitor.Models.EventData]\r\n     : [k2, Microsoft.Azure.Management.Monitor.Models.EventData]\r\n",
                 actual: result);
         }
     }

src/ResourceManager/Insights/Commands.Insights.Test/Utilities.cs

@@ -43,8 +43,9 @@ public static class Utilities
 
         #region Events
 
-        public static EventData CreateFakeEvent(string id = null)
+        public static EventData CreateFakeEvent(string id = null, bool newDates = true)
         {
+            var fixedDate = new DateTime(2017, 06, 07, 22, 54, 0, DateTimeKind.Utc);
             return new EventData(
                 id: id ?? "ac7d2ab5-698a-4c33-9c19-0a93d3d7f527",
                 eventName: new LocalizableString(
@@ -67,7 +68,7 @@ public static EventData CreateFakeEvent(string id = null)
                 correlationId: Correlation,
                 description: "fake event",
                 level: EventLevel.Informational,
-                eventTimestamp: DateTime.Now,
+                eventTimestamp: newDates ? DateTime.Now : fixedDate,
                 operationId: "c0f2e85f-efb0-47d0-bf90-f983ec8be91d",
                 operationName: new LocalizableString(
                     localizedValue: "Microsoft.Resources/subscriptions/resourcegroups/deployments/write",
@@ -89,7 +90,7 @@ public static EventData CreateFakeEvent(string id = null)
                     clientRequestId: "1234",
                     clientIpAddress: "123.123.123.123"),
                 properties: new Dictionary<string, string>(),
-                submissionTimestamp: DateTime.Now);
+                submissionTimestamp: newDates ? DateTime.Now : fixedDate);
         }
 
         public static List<EventData> CreateListOfFakeEvents(int numEvents = 1)