Merge pull request #193 from cqse/ts/41104_last_segment_not_matching

TS-41104 Fix cutting off assembly names

CHANGELOG.md

@@ -7,6 +7,7 @@ Please prefix each entry with one of:
 
 
 # Next Release
+- [fix] Assembly patterns could not match on full assembly name when using `@AssemblyDir` as PDB directory
 
 # v24.5.1
 - [fix] Upload Daemon uploaded to Artifactory in the wrong format

UploadDaemon/Configuration/GlobPatternList.cs

@@ -65,7 +65,7 @@ private static Regex ConvertGlobPatternToRegex(String pattern)
         /// </summary>
         public string Describe()
         {
-            return $"include={string.Join(",", includePatterns)} exclude={string.Join(",", excludePatterns)}";
+            return $"[Pattern include={string.Join(",", includeRegexes)} exclude={string.Join(",", excludeRegexes)}]";
         }
 
         /// <summary>
@@ -82,5 +82,5 @@ public override bool Equals(object other) => other is GlobPatternList otherList
 
         /// <inheritdoc/>
         public override int GetHashCode() => (includePatterns, excludePatterns).GetHashCode();
-    }
+	}
 }

UploadDaemon/SymbolAnalysis/SymbolCollectionResolver.cs

@@ -121,13 +121,15 @@ private void UpdateValidationInfo(ICollection<SymbolFileInfo> relevantSymbolFile
         private static ICollection<SymbolFileInfo> FindRelevantSymbolFiles(string symbolDirectory, GlobPatternList assemblyPatterns)
         {
             return new HashSet<SymbolFileInfo>(Directory.EnumerateFiles(symbolDirectory, "*.pdb", SearchOption.AllDirectories)
-                .Where(file => MatchesAssemblyPattern(assemblyPatterns, file))
+                .Where(file => MatchesAssemblyPattern(assemblyPatterns, Path.GetFileNameWithoutExtension(file)))
                 .Select(file => new SymbolFileInfo { Path = file, LastWriteTime = File.GetLastWriteTimeUtc(file) }));
         }
 
         private static bool MatchesAssemblyPattern(GlobPatternList assemblyPatterns, string file)
         {
-            return assemblyPatterns.Matches(Path.GetFileNameWithoutExtension(file));
+            bool isMatch = assemblyPatterns.Matches(file);
+            logger.Trace("Testing {file} against {assemblyPatterns}: match is {isMatch}", file, assemblyPatterns.Describe(), isMatch);
+            return isMatch;
         }
     }
 }

UploadDaemon_Test/Configuration/ConfigTest.cs

@@ -455,7 +455,7 @@ public void NotSpecifyingIncludePatternMeansEverythingIsIncluded()
                         exclude: [ 'Bar' ]
             ").CreateConfigForProcess("foo.exe");
 
-            Assert.That(config.AssemblyPatterns.Describe(), Is.EqualTo("include=* exclude=Bar"));
+            Assert.That(config.AssemblyPatterns.Describe(), Is.EqualTo("[Pattern include=^.*$ exclude=^Bar$]"));
         }
 
         [Test]
@@ -473,7 +473,7 @@ public void NotSpecifyingExcludePatternMeansDefaultExcludesAreUsed()
                         include: [ 'Bar' ]
             ").CreateConfigForProcess("foo.exe");
 
-            Assert.That(config.AssemblyPatterns.Describe(), Does.StartWith("include=Bar exclude=").And.Contains("mscorlib"));
+            Assert.That(config.AssemblyPatterns.Describe(), Does.StartWith("[Pattern include=^Bar$ exclude=").And.Contains("^mscorlib$"));
         }
 
         [Test]

UploadDaemon_Test/SymbolAnalysis/SymbolCollectionResolverTest.cs

@@ -8,10 +8,10 @@
 namespace UploadDaemon.SymbolAnalysis
 {
     [TestFixture]
-    class SymbolCollectionResolverTest
+    internal class SymbolCollectionResolverTest
     {
         private static readonly string TestSymbolDirectory = Path.Combine(Path.GetTempPath(), TestUtils.SolutionRoot.FullName, TestUtils.GetSanitizedTestClassName());
-        private static readonly string TestSymbolFilePath = $"{TestSymbolDirectory}\\Some.pdb";
+        private static readonly string TestSymbolFilePath = $"{TestSymbolDirectory}\\Cqse.Teamscale.Profiler.Commons.pdb";
         private static readonly GlobPatternList includeAllAssembliesPattern = new GlobPatternList(new List<string> { "*" }, new List<string> { });
 
         private SymbolCollectionResolver resolver;
@@ -22,7 +22,7 @@ public void SetUp()
             resolver = new SymbolCollectionResolver();
 
             Directory.CreateDirectory(TestSymbolDirectory);
-            File.Copy($"{TestUtils.TestDataDirectory}\\Some.pdb", TestSymbolFilePath);
+            File.Copy($"{TestUtils.TestDataDirectory}\\Cqse.Teamscale.Profiler.Commons.pdb", TestSymbolFilePath);
             File.SetLastWriteTime(TestSymbolFilePath, new DateTime(2019, 1, 1));
         }
 
@@ -33,19 +33,39 @@ public void TearDown()
         }
 
         [Test]
-        public void ConsidersSymbolFileIncludes()
+        public void ConsidersSymbolFileIncludesFromSymbolDirectory()
         {
             SymbolCollection collection = resolver.ResolveFromSymbolDirectory(TestSymbolDirectory,
-                   new GlobPatternList(new List<string> { "DoesNotExist*" }, new List<string> {}));
+                   new GlobPatternList(new List<string> { "DoesNotExist*" }, new List<string> { }));
+            Assert.That(collection.IsEmpty, Is.True);
 
+            collection = resolver.ResolveFromSymbolDirectory(TestSymbolDirectory,
+                   new GlobPatternList(new List<string> { "Cqse.Teamscale.Profiler.Commons" }, new List<string> { }));
+            Assert.That(collection.IsEmpty, Is.False);
+        }
+
+        [Test]
+        public void ConsidersSymbolFileIncludesFromTraceFile()
+        {
+            ParsedTraceFile traceFile = new ParsedTraceFile(new string[]
+            {
+            $"Assembly=Cqse.Teamscale.Profiler.Commons:2 Version:1.0.0.0 Path:{TestSymbolFilePath}",
+            }, "cov.txt");
+
+            SymbolCollection collection = resolver.ResolveFromTraceFile(traceFile, "@AssemblyDir",
+                   new GlobPatternList(new List<string> { "DoesNotExist*" }, new List<string> { }));
             Assert.That(collection.IsEmpty, Is.True);
+
+            collection = resolver.ResolveFromTraceFile(traceFile, "@AssemblyDir",
+                   new GlobPatternList(new List<string> { "Cqse.Teamscale.Profiler.Commons" }, new List<string> { }));
+            Assert.That(collection.IsEmpty, Is.False);
         }
 
         [Test]
         public void ConsidersSymbolFileExcludes()
         {
             SymbolCollection collection = resolver.ResolveFromSymbolDirectory(TestSymbolDirectory,
-                   new GlobPatternList(new List<string> { "*" }, new List<string> { "So*" }));
+                   new GlobPatternList(new List<string> { "*" }, new List<string> { "Cq*" }));
 
             Assert.That(collection.IsEmpty, Is.True);
         }