Skip to content

Commit a9de1db

Browse files
Copilotjeffkl
andcommitted
Rename HasNonstandardId to IdContainsNonAsciiCharacter throughout
Co-authored-by: jeffkl <[email protected]>
1 parent 60ab977 commit a9de1db

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/NuGet.Clients/NuGet.VisualStudio.Common/Telemetry/PackageSourceTelemetry.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ internal static void AddNupkgCopiedData(ProtocolDiagnosticNupkgCopiedEvent ncEve
207207
data.NupkgCount++;
208208
data.NupkgSize += ncEvent.FileSize;
209209

210-
if (!data.HasNonstandardId && ncEvent.PackageId != null && HasNonstandardCharacters(ncEvent.PackageId))
210+
if (!data.IdContainsNonAsciiCharacter && ncEvent.PackageId != null && HasNonstandardCharacters(ncEvent.PackageId))
211211
{
212-
data.HasNonstandardId = true;
212+
data.IdContainsNonAsciiCharacter = true;
213213
}
214214
}
215215
}
@@ -274,7 +274,7 @@ internal static async Task<TelemetryEvent> ToTelemetryAsync(Data data, SourceRep
274274
telemetry[PropertyNames.Duration.Total] = data.Resources.Values.Sum(r => r.duration.TotalMilliseconds);
275275
telemetry[PropertyNames.Nupkgs.Copied] = data.NupkgCount;
276276
telemetry[PropertyNames.Nupkgs.Bytes] = data.NupkgSize;
277-
telemetry[PropertyNames.Nupkgs.HasNonstandardId] = data.HasNonstandardId;
277+
telemetry[PropertyNames.Nupkgs.IdContainsNonAsciiCharacter] = data.IdContainsNonAsciiCharacter;
278278
AddResourceProperties(telemetry, data.Resources);
279279

280280
if (data.Http.Requests > 0)
@@ -440,7 +440,7 @@ internal class Data
440440
internal HttpData Http { get; }
441441
internal int NupkgCount { get; set; }
442442
internal long NupkgSize { get; set; }
443-
internal bool HasNonstandardId { get; set; }
443+
internal bool IdContainsNonAsciiCharacter { get; set; }
444444

445445
internal Data()
446446
{
@@ -490,7 +490,7 @@ internal static class Nupkgs
490490
{
491491
internal const string Copied = "nupkgs.copied";
492492
internal const string Bytes = "nupkgs.bytes";
493-
internal const string HasNonstandardId = "nupkgs.hasnonstandard_id";
493+
internal const string IdContainsNonAsciiCharacter = "nupkgs.idcontainsnonasciicharacter";
494494
}
495495

496496
internal static class Resources

test/NuGet.Clients.Tests/NuGet.VisualStudio.Common.Test/Telemetry/PackageSourceTelemetryTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void AddNupkgCopiedData_MultipleEvents_AccumulatesCorrectly()
145145
[InlineData("alllower")]
146146
[InlineData("123Numeric")]
147147
[InlineData("a")]
148-
public void AddNupkgCopiedData_StandardPackageId_HasNonstandardIdIsFalse(string packageId)
148+
public void AddNupkgCopiedData_StandardPackageId_IdContainsNonAsciiCharacterIsFalse(string packageId)
149149
{
150150
// Arrange
151151
var data = CreateDataDictionary(SampleSource);
@@ -156,7 +156,7 @@ public void AddNupkgCopiedData_StandardPackageId_HasNonstandardIdIsFalse(string
156156

157157
// Assert
158158
var result = Assert.Single(data).Value;
159-
Assert.False(result.HasNonstandardId);
159+
Assert.False(result.IdContainsNonAsciiCharacter);
160160
}
161161

162162
[Theory]
@@ -165,7 +165,7 @@ public void AddNupkgCopiedData_StandardPackageId_HasNonstandardIdIsFalse(string
165165
[InlineData("Ünïcödé")]
166166
[InlineData("Package Name")]
167167
[InlineData("package+extra")]
168-
public void AddNupkgCopiedData_NonstandardPackageId_HasNonstandardIdIsTrue(string packageId)
168+
public void AddNupkgCopiedData_NonstandardPackageId_IdContainsNonAsciiCharacterIsTrue(string packageId)
169169
{
170170
// Arrange
171171
var data = CreateDataDictionary(SampleSource);
@@ -176,11 +176,11 @@ public void AddNupkgCopiedData_NonstandardPackageId_HasNonstandardIdIsTrue(strin
176176

177177
// Assert
178178
var result = Assert.Single(data).Value;
179-
Assert.True(result.HasNonstandardId);
179+
Assert.True(result.IdContainsNonAsciiCharacter);
180180
}
181181

182182
[Fact]
183-
public void AddNupkgCopiedData_MultiplePackagesOneNonstandard_HasNonstandardIdIsTrue()
183+
public void AddNupkgCopiedData_MultiplePackagesOneNonstandard_IdContainsNonAsciiCharacterIsTrue()
184184
{
185185
// Arrange
186186
var data = CreateDataDictionary(SampleSource);
@@ -192,11 +192,11 @@ public void AddNupkgCopiedData_MultiplePackagesOneNonstandard_HasNonstandardIdIs
192192

193193
// Assert
194194
var result = Assert.Single(data).Value;
195-
Assert.True(result.HasNonstandardId);
195+
Assert.True(result.IdContainsNonAsciiCharacter);
196196
}
197197

198198
[Fact]
199-
public void AddNupkgCopiedData_NullPackageId_HasNonstandardIdIsFalse()
199+
public void AddNupkgCopiedData_NullPackageId_IdContainsNonAsciiCharacterIsFalse()
200200
{
201201
// Arrange
202202
var data = CreateDataDictionary(SampleSource);
@@ -207,7 +207,7 @@ public void AddNupkgCopiedData_NullPackageId_HasNonstandardIdIsFalse()
207207

208208
// Assert
209209
var result = Assert.Single(data).Value;
210-
Assert.False(result.HasNonstandardId);
210+
Assert.False(result.IdContainsNonAsciiCharacter);
211211
}
212212

213213
[Fact]
@@ -381,7 +381,7 @@ public async Task ToTelemetry_WithData_CreatesTelemetryProperties(string package
381381

382382
Assert.Equal(data.NupkgCount, result[PackageSourceTelemetry.PropertyNames.Nupkgs.Copied]);
383383
Assert.Equal(data.NupkgSize, result[PackageSourceTelemetry.PropertyNames.Nupkgs.Bytes]);
384-
Assert.Equal(data.HasNonstandardId, result[PackageSourceTelemetry.PropertyNames.Nupkgs.HasNonstandardId]);
384+
Assert.Equal(data.IdContainsNonAsciiCharacter, result[PackageSourceTelemetry.PropertyNames.Nupkgs.IdContainsNonAsciiCharacter]);
385385

386386
Assert.Equal(data.Resources.Sum(r => r.Value.count), result[PackageSourceTelemetry.PropertyNames.Resources.Calls]);
387387
foreach (var resource in data.Resources)

0 commit comments

Comments
 (0)