Fixed Unit Tests

Author: adnan-khan

Chronological.Tests/HttpRepositoryTests.cs

@@ -11,45 +11,126 @@ public class HttpRepositoryTests
         string applicationClientSecret = "testApplicationSecret";
         string tenant = "testTenant";
 
-        [Fact(Skip = "Valid Client-Id and Client-Secret requried.")]
+        [Fact]
         public async void GenericFluentEventQueryTest()
         {
-            var connection = new Connection(applicationClientId, applicationClientSecret, tenant);
-            var environment = connection.GetEnvironmentsAsync().Result.FirstOrDefault();
+            //var connection = new Connection(applicationClientId, applicationClientSecret, tenant);
+            //var environment = connection.GetEnvironmentsAsync().Result.FirstOrDefault();
+
+            var environment = new Environment("TestFqdn", "TestAccessToken");
 
             var from = new DateTime(2017, 12, 23, 12, 0, 0, DateTimeKind.Utc);
             var to = new DateTime(2018, 10, 23, 12, 0, 0, DateTimeKind.Utc);
 
-            var result = await new GenericFluentEventQuery<TestType1>("Test", Search.Span(from, to), Limit.CreateLimit(Limit.Take, 10), environment, new EventWebSocketRepository(new HttpRepository(environment)))
-            .Where(x => x.Value == 10)
+            var result = await new GenericFluentEventQuery<EmailTest>("Test", Search.Span(from, to), Limit.CreateLimit(Limit.Take, 10), environment, new EventWebSocketRepository(new MockHttpRepository(_eventsResult))) //new HttpRepository(environment)
+            .Where(x => x.ip == "127.0.0.1")
                 .ExecuteAsync();
 
             Assert.NotNull(result);
         }
 
-        [Fact(Skip = "Valid Client-Id and Client-Secret requried.")]
+        [Fact]
         public async void AggregateQueryTest()
         {
-            var connection = new Connection(applicationClientId, applicationClientSecret, tenant);
-            var environment = connection.GetEnvironmentsAsync().Result.FirstOrDefault();
+            //var connection = new Connection(applicationClientId, applicationClientSecret, tenant);
+            //var environment = connection.GetEnvironmentsAsync().Result.FirstOrDefault();
+
+            var environment = new Environment("TestFqdn", "TestAccessToken");
 
             var from = new DateTime(2017, 12, 23, 12, 0, 0, DateTimeKind.Utc);
             var to = new DateTime(2018, 10, 23, 12, 0, 0, DateTimeKind.Utc);
 
-            var result = await new GenericFluentAggregateQuery<TestType1>("Test", Search.Span(from, to), environment, new AggregateWebSocketRepository(new HttpRepository(environment)))
-            .Select(builder => builder.UniqueValues(x => x.DataType, 10,
-                                builder.DateHistogram(x => x.Date, Breaks.InDays(1),
-                                new
-                                {
-                                    Maximum = builder.Maximum(x => x.Value),
-                                    Minmum = builder.Minimum(x => x.Value)
-                                })))
-            .Where(x => x.Value > 5)
+            var result = await new GenericFluentAggregateQuery<EmailTest>("Test", Search.Span(from, to), environment, new AggregateWebSocketRepository(new MockHttpRepository(_aggregateResults))) //new HttpRepository(environment)
+            .Select(builder => builder.UniqueValues(x => x.ip, 10, new { Count = builder.Count() }))
+            .Where(x => x.ip == "127.0.0.1")
             .ExecuteAsync();
 
-            var uniqueValues = result.First();
-
-            Assert.NotNull(uniqueValues);
+            Assert.NotNull(result);
         }
+
+        private string _eventsResult = @"{
+  ""warnings"": [],
+  ""events"": [
+    {
+      ""schema"": {
+        ""rid"": 0,
+        ""$esn"": ""source1"",
+        ""properties"": [
+          {
+            ""name"": ""email"",
+            ""type"": ""String""
+          },
+          {
+            ""name"": ""ip"",
+            ""type"": ""String""
+          },
+          {
+            ""name"": ""useragent"",
+            ""type"": ""String""
+          }
+        ]
+      },
+      ""$ts"": ""2018-10-18T11:30:36Z"",
+      ""values"": [
+        ""test1@mail.com"",
+        ""127.0.0.1"",
+        ""IE""
+      ]
+    },
+    {
+      ""schemaRid"": 0,
+      ""$ts"": ""2018-10-18T11:30:36Z"",
+      ""values"": [
+        ""test2@mail.com"",
+        ""127.0.0.1"",
+        ""FF""
+      ]
+    },
+    {
+      ""schemaRid"": 0,
+      ""$ts"": ""2018-10-18T11:30:36Z"",
+      ""values"": [
+        ""test3@mail.com"",
+        ""127.0.0.1"",
+        ""IE""
+      ]
+    }
+  ]
+}";
+
+        private string _aggregateResults = @"{
+  ""aggregates"": [
+    {
+      ""dimension"": [
+        null,
+        ""EmailOpened"",
+        ""EmailSent""
+      ],
+      ""measures"": [
+        [
+          10.0
+        ],
+        [
+          20.0
+        ],
+        [
+          200.0
+        ]
+      ]
+    }
+  ],
+  ""warnings"": []
+}";
+
+    }
+
+    public class EmailTest
+    {
+        [ChronologicalEventField("email")]
+        public string email { get; set; }
+        [ChronologicalEventField("ip")]
+        public string ip { get; set; }
+        [ChronologicalEventField("useragent")]
+        public string useragent { get; set; }
     }
 }

Chronological.Tests/MockHttpRepository.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+
+namespace Chronological.Tests
+{
+    internal class MockHttpRepository : IWebRequestRepository
+    {
+        private readonly List<string> _results;
+
+        public MockHttpRepository(string result) : this(new List<string> { result })
+        {
+        }
+
+        public MockHttpRepository(List<string> results)
+        {
+            _results = results;
+        }
+
+        async Task<IReadOnlyList<JToken>> IWebRequestRepository.ExecuteRequestAsync(string query, string resourcePath, CancellationToken cancellationToken)
+        {
+            if ("aggregates".Equals(resourcePath, StringComparison.OrdinalIgnoreCase))
+            {
+                return new List<JToken>() { JToken.Parse(_results.First())["aggregates"] };
+            }
+
+            return new List<JToken> { JToken.Parse(_results.First()) };
+        }
+    }
+}

Chronological/HttpRepository.cs

@@ -86,6 +86,9 @@ private static async Task<JToken> GetResponseAsync(HttpWebRequest request)
             }
             catch (WebException e)
             {
+                if (e.Response == null)
+                    throw e;
+
                 using (WebResponse response = e.Response)
                 {
                     HttpWebResponse httpResponse = (HttpWebResponse)response;