Fix default value bug and add tests (#6630)

Author: zhhyu

src/NuGetGallery/Services/TyposquattingConfiguration.cs

@@ -7,8 +7,8 @@ namespace NuGetGallery.Services
 {
     public sealed class TyposquattingConfiguration : ITyposquattingConfiguration
     {
-        private const int DefaultPackageIdCheckListLength = 20000;
-        private const double DefaultPackageIdChecklistCacheExpireTimeInHours = 24;
+        public const int DefaultPackageIdCheckListLength = 10000;
+        public const double DefaultPackageIdChecklistCacheExpireTimeInHours = 24.0;
         public int PackageIdChecklistLength { get; }
         public bool IsCheckEnabled { get; }
         public bool IsBlockUsersEnabled { get; }
@@ -29,10 +29,10 @@ public TyposquattingConfiguration(
             bool isBlockUsersEnabled,
             double packageIdChecklistCacheExpireTimeInHours)
         {
-            PackageIdChecklistLength = packageIdChecklistLength;
+            PackageIdChecklistLength = packageIdChecklistLength == default(int) ? DefaultPackageIdCheckListLength : packageIdChecklistLength;
             IsCheckEnabled = isCheckEnabled;
             IsBlockUsersEnabled = isBlockUsersEnabled;
-            PackageIdChecklistCacheExpireTimeInHours = packageIdChecklistCacheExpireTimeInHours;
+            PackageIdChecklistCacheExpireTimeInHours = packageIdChecklistCacheExpireTimeInHours == default(double) ? DefaultPackageIdChecklistCacheExpireTimeInHours : packageIdChecklistCacheExpireTimeInHours;
         }
     }
 }

tests/NuGetGallery.Facts/Services/ContentObjectServiceFacts.cs

@@ -36,6 +36,13 @@ public void ObjectsHaveDefaultStateIfNotRefreshed()
                 Assert.False(symbolsConfiguration.IsSymbolsUploadEnabledForAll);
                 Assert.Empty(symbolsConfiguration.AlwaysEnabledForDomains);
                 Assert.Empty(symbolsConfiguration.AlwaysEnabledForEmailAddresses);
+
+                var typosquattingConfiguration = service.TyposquattingConfiguration as TyposquattingConfiguration;
+
+                Assert.Equal(TyposquattingConfiguration.DefaultPackageIdCheckListLength, typosquattingConfiguration.PackageIdChecklistLength);
+                Assert.False(typosquattingConfiguration.IsCheckEnabled);
+                Assert.False(typosquattingConfiguration.IsBlockUsersEnabled);
+                Assert.Equal(TyposquattingConfiguration.DefaultPackageIdChecklistCacheExpireTimeInHours, typosquattingConfiguration.PackageIdChecklistCacheExpireTimeInHours);
             }
 
             [Fact]
@@ -55,6 +62,9 @@ public async Task RefreshRefreshesObject()
                 var alwaysEnabledForDomains = new[] { "a" };
                 var alwaysEnabledForEmailAddresses = new[] { "b" };
 
+                var packageIdChecklistLength = 20000;
+                var packageIdChecklistCacheExpireTimeInHours = 12.0;
+
                 var certificatesConfiguration = new CertificatesConfiguration(
                     isUIEnabledByDefault,
                     alwaysEnabledForDomains,
@@ -67,6 +77,13 @@ public async Task RefreshRefreshesObject()
                     alwaysEnabledForEmailAddresses: alwaysEnabledForEmailAddresses);
                 var symbolsJson = JsonConvert.SerializeObject(symbolsConfiguration);
 
+                var typosquattingConfiguration = new TyposquattingConfiguration(
+                    packageIdChecklistLength: packageIdChecklistLength,
+                    isCheckEnabled: true,
+                    isBlockUsersEnabled: true,
+                    packageIdChecklistCacheExpireTimeInHours: packageIdChecklistCacheExpireTimeInHours);
+                var typosquattingJson = JsonConvert.SerializeObject(typosquattingConfiguration);
+
                 var contentService = GetMock<IContentService>();
 
                 contentService
@@ -81,6 +98,10 @@ public async Task RefreshRefreshesObject()
                     .Setup(x => x.GetContentItemAsync(GalleryConstants.ContentNames.SymbolsConfiguration, It.IsAny<TimeSpan>()))
                     .Returns(Task.FromResult<IHtmlString>(new HtmlString(symbolsJson)));
 
+                contentService
+                    .Setup(x => x.GetContentItemAsync(GalleryConstants.ContentNames.TyposquattingConfiguration, It.IsAny<TimeSpan>()))
+                    .Returns(Task.FromResult<IHtmlString>(new HtmlString(typosquattingJson)));
+
                 var service = GetService<ContentObjectService>();
 
                 // Act
@@ -89,6 +110,7 @@ public async Task RefreshRefreshesObject()
                 loginDiscontinuationConfiguration = service.LoginDiscontinuationConfiguration as LoginDiscontinuationConfiguration;
                 certificatesConfiguration = service.CertificatesConfiguration as CertificatesConfiguration;
                 symbolsConfiguration = service.SymbolsConfiguration as SymbolsConfiguration;
+                typosquattingConfiguration = service.TyposquattingConfiguration as TyposquattingConfiguration;
 
                 // Assert
                 Assert.True(loginDiscontinuationConfiguration.DiscontinuedForEmailAddresses.SequenceEqual(emails));
@@ -103,6 +125,11 @@ public async Task RefreshRefreshesObject()
                 Assert.True(symbolsConfiguration.IsSymbolsUploadEnabledForAll);
                 Assert.Equal(alwaysEnabledForDomains, symbolsConfiguration.AlwaysEnabledForDomains);
                 Assert.Equal(alwaysEnabledForEmailAddresses, symbolsConfiguration.AlwaysEnabledForEmailAddresses);
+
+                Assert.Equal(packageIdChecklistLength, typosquattingConfiguration.PackageIdChecklistLength);
+                Assert.True(typosquattingConfiguration.IsCheckEnabled);
+                Assert.True(typosquattingConfiguration.IsBlockUsersEnabled);
+                Assert.Equal(packageIdChecklistCacheExpireTimeInHours, typosquattingConfiguration.PackageIdChecklistCacheExpireTimeInHours);
             }
         }
     }