Merge branch 'master' of https://github.com/NuGet/NuGet.Jobs

Author: scottbommarito

src/Stats.ImportAzureCdnStatistics/Dimensions/ToolDimension.cs

@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+using System;
 
 namespace Stats.ImportAzureCdnStatistics
 {
@@ -19,7 +20,9 @@ public ToolDimension(string toolId, string toolVersion, string fileName)
 
         protected bool Equals(ToolDimension other)
         {
-            return string.Equals(ToolId, other.ToolId) && string.Equals(ToolVersion, other.ToolVersion) && string.Equals(FileName, other.FileName);
+            return string.Equals(ToolId, other.ToolId, StringComparison.OrdinalIgnoreCase) 
+                && string.Equals(ToolVersion, other.ToolVersion, StringComparison.OrdinalIgnoreCase) 
+                && string.Equals(FileName, other.FileName, StringComparison.OrdinalIgnoreCase);
         }
 
         public override bool Equals(object obj)
@@ -34,9 +37,9 @@ public override int GetHashCode()
         {
             unchecked
             {
-                var hashCode = (ToolId != null ? ToolId.GetHashCode() : 0);
-                hashCode = (hashCode*397) ^ (ToolVersion != null ? ToolVersion.GetHashCode() : 0);
-                hashCode = (hashCode*397) ^ (FileName != null ? FileName.GetHashCode() : 0);
+                var hashCode = (ToolId != null ? ToolId.ToLower().GetHashCode() : 0);
+                hashCode = (hashCode*397) ^ (ToolVersion != null ? ToolVersion.ToLower().GetHashCode() : 0);
+                hashCode = (hashCode*397) ^ (FileName != null ? FileName.ToLower().GetHashCode() : 0);
                 return hashCode;
             }
         }

src/Stats.ImportAzureCdnStatistics/Warehouse.cs

@@ -620,14 +620,7 @@ private async Task<IReadOnlyCollection<ToolDimension>> RetrieveToolDimensions(IR
                 return results;
             }
 
-            results.AddRange(_cachedToolDimensions
-                .Where(p1 => tools
-                    .FirstOrDefault(p2 =>
-                        string.Equals(p1.ToolId, p2.ToolId, StringComparison.OrdinalIgnoreCase)
-                        && string.Equals(p1.ToolVersion, p2.ToolVersion, StringComparison.OrdinalIgnoreCase)
-                        && string.Equals(p1.FileName, p2.FileName, StringComparison.OrdinalIgnoreCase)) != null
-                    )
-                );
+            results.AddRange(_cachedToolDimensions.Where(p1 => tools.FirstOrDefault(p2 => p2.Equals(p1)) != null));
 
             var nonCachedToolDimensions = tools.Except(results).ToList();
 

tests/Tests.Stats.ImportAzureCdnStatistics/Tests.Stats.ImportAzureCdnStatistics.csproj

@@ -100,6 +100,7 @@
     <Compile Include="PackageDimensionFacts.cs" />
     <Compile Include="PackageTranslatorFacts.cs" />
     <Compile Include="StatisticsParserFacts.cs" />
+    <Compile Include="ToolDimensionFacts.cs" />
     <Compile Include="ToolStatisticsParserFacts.cs" />
     <Compile Include="UserAgentParserFacts.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

tests/Tests.Stats.ImportAzureCdnStatistics/ToolDimensionFacts.cs

@@ -0,0 +1,36 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Stats.ImportAzureCdnStatistics;
+using Xunit;
+
+namespace Tests.Stats.ImportAzureCdnStatistics
+{
+    public class ToolDimensionFacts
+    {
+        [Theory]
+        [InlineData("win-x86-commandline", "v3.5.0", "NuGet.exe", "win-x86-commandline", "v3.5.0", "nuget.exe", true)] // Lowercase and uppercase are equal for filename
+        [InlineData("win-x86-commandline", "v3.5.0", "nuget.exe", "win-x86-commandline", "V3.5.0", "nuget.exe", true)] // Lowercase and uppercase are equal for tool version
+        [InlineData("WIN-x86-commandline", "v3.5.0", "nuget.exe", "win-x86-commandline", "v3.5.0", "nuget.exe", true)] // Lowercase and uppercase are equal for tool id
+        [InlineData("win-x86-commandline", "v3.5.0", "NuGet.exe", "win-x86-commandline", "v3.5.0", "NuGet1.exe", false)] // different file name
+        [InlineData("win-x86-commandline", "v3.5.0", "nuget.exe", "win-x86-commandline", "VV3.5.0", "nuget.exe", false)] // different tool version
+        [InlineData("win-x86-commandline", "v3.5.0", "nuget.exe", "win-x64-commandline", "v3.5.0", "nuget.exe", false)] // different tool id
+        public void ComparesToolsDimensionsCorrectly(string toolId1, string toolVersion1, string fileName1,
+                                                    string toolId2, string toolVersion2, string fileName2, bool expectedResult)
+        {
+            var tool1 = new ToolDimension(toolId1, toolVersion1, fileName1);
+            var tool2 = new ToolDimension(toolId2, toolVersion2, fileName2);
+
+            //Act
+            var actualResultEquals = tool1.Equals(tool2);
+            var actualResultGetHashCode = tool1.GetHashCode() == tool2.GetHashCode();
+
+            // Assert
+            Assert.Equal(expectedResult, actualResultEquals);
+            Assert.Equal(expectedResult, actualResultGetHashCode);
+        }
+    }
+}