Added back resolver test that was temporarily commented out

microsoft · Oct 24, 2024 · fe3d04d · fe3d04d
1 parent 6bc8789
commit fe3d04d
Showing 1 changed file with 71 additions and 86 deletions.
diff --git a/src/EventLogExpert.Eventing.Tests/EventResolvers/EventResolverTests.cs b/src/EventLogExpert.Eventing.Tests/EventResolvers/EventResolverTests.cs
@@ -154,90 +154,75 @@ public void PerfTest2()
         Debug.WriteLine("Resolving events took " + sw.ElapsedMilliseconds);
     }
 
-    //[Fact]
-    //public void Test1()
-    //{
-    //    var eventLogReader = new EventLogReader("Application", PathType.LogName);
-
-    //    var resolvers = new List<IEventResolver>
-    //    {
-    //        new LocalProviderEventResolver(),
-    //        /* new EventProviderDatabaseEventResolver(
-    //            s => {
-    //                _outputHelper.WriteLine(s);
-    //                Debug.WriteLine(s);
-    //                Debug.Flush();
-    //            }) */
-    //    };
-
-    //    EventRecord er;
-    //    HashSet<string> uniqueDescriptions = [];
-    //    HashSet<string> uniqueXml = [];
-    //    HashSet<string> uniqueKeywords = [];
-
-    //    var totalCount = 0;
-    //    var mismatchCount = 0;
-    //    var xmlMismatchCount = 0;
-    //    var keywordsMismatchCount = 0;
-    //    var mismatches = new List<List<string>>();
-    //    var xmlMismatches = new List<List<string>>();
-    //    var keywordMismatches = new List<List<string>>();
-
-    //    while (null != (er = eventLogReader.ReadEvent()))
-    //    {
-    //        uniqueDescriptions.Clear();
-    //        uniqueXml.Clear();
-    //        uniqueKeywords.Clear();
-
-    //        foreach (var r in resolvers)
-    //        {
-    //            var resolved = r.ResolveProviderDetails(er, "Test");
-
-    //            uniqueDescriptions.Add(resolved.Description
-    //                .Replace("\r", "")      // I can't figure out the logic of FormatMessage() for when it leaves
-    //                .Replace("\n", "")      // CRLFs and spaces in or takes them out, so I'm just giving up for now.
-    //                .Replace(" ", "")       // If we're this close to matching FormatMessage() then we're close enough.
-    //                .Replace("\u200E", "")  // Remove LRM marks from dates.
-    //                .Trim());
-
-    //            if (r is EventReaderEventResolver && resolved.KeywordsDisplayNames.Count() < 1)
-    //            {
-    //                // Don't bother adding it. EventReader fails to resolve a lot of keywords for some reason.
-    //            }
-    //            else
-    //            {
-    //                uniqueKeywords.Add(string.Join(" ", resolved.KeywordsDisplayNames.OrderBy(n => n)));
-    //            }
-    //        }
-
-    //        if (uniqueDescriptions.Count > 1)
-    //        {
-    //            mismatchCount++;
-    //            mismatches.Add(uniqueDescriptions.ToList());
-    //        }
-
-    //        if (uniqueXml.Count > 1)
-    //        {
-    //            xmlMismatchCount++;
-    //            xmlMismatches.Add(uniqueXml.ToList());
-    //        }
-
-    //        if (uniqueKeywords.Count > 1)
-    //        {
-    //            keywordsMismatchCount++;
-    //            keywordMismatches.Add(uniqueKeywords.ToList());
-    //        }
-
-    //        totalCount++;
-    //    }
-
-    //    foreach (var resolver in resolvers)
-    //    {
-    //        resolver?.Dispose();
-    //    }
-
-    //    var mismatchPercent = mismatchCount / totalCount * 100;
-
-    //    Assert.True(mismatchPercent < 1);
-    //}
+    [Fact]
+    public void Test1()
+    {
+        var eventLogReader = new EventLogReader("Application", PathType.LogName);
+
+        var resolvers = new List<IEventResolver>
+        {
+            new LocalProviderEventResolver(),
+            /* new EventProviderDatabaseEventResolver(
+                s => {
+                    _outputHelper.WriteLine(s);
+                    Debug.WriteLine(s);
+                    Debug.Flush();
+                }) */
+        };
+
+        HashSet<string> uniqueDescriptions = [];
+        HashSet<string> uniqueKeywords = [];
+
+        var totalCount = 0;
+        var mismatchCount = 0;
+        var keywordsMismatchCount = 0;
+
+        while (eventLogReader.ReadEvent() is { } er)
+        {
+            uniqueDescriptions.Clear();
+            uniqueKeywords.Clear();
+
+            foreach (var r in resolvers)
+            {
+                r.ResolveProviderDetails(er, "Test");
+
+                var description = r.ResolveDescription(er);
+                var keywords = r.GetKeywordsFromBitmask(er);
+
+                uniqueDescriptions.Add(description
+                    .Replace("\r", "")      // I can't figure out the logic of FormatMessage() for when it leaves
+                    .Replace("\n", "")      // CRLFs and spaces in or takes them out, so I'm just giving up for now.
+                    .Replace(" ", "")       // If we're this close to matching FormatMessage() then we're close enough.
+                    .Replace("\u200E", "")  // Remove LRM marks from dates.
+                    .Trim());
+
+                if (!keywords.Any())
+                {
+                    // Don't bother adding it. EventReader fails to resolve a lot of keywords for some reason.
+                }
+                else
+                {
+                    uniqueKeywords.Add(string.Join(" ", keywords.OrderBy(n => n)));
+                }
+            }
+
+            if (uniqueDescriptions.Count > 1)
+            {
+                mismatchCount++;
+            }
+
+            if (uniqueKeywords.Count > 1)
+            {
+                keywordsMismatchCount++;
+            }
+
+            totalCount++;
+        }
+
+        var totalMismatchCount = mismatchCount + keywordsMismatchCount;
+
+        var mismatchPercent = totalMismatchCount > 0 && totalCount > 0 ? totalMismatchCount / totalCount * 100 : 0;
+
+        Assert.True(mismatchPercent < 1);
+    }
 }