Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Commit 11c84fc

Browse files
authored
Fix id+version parsing issue for Microsoft.VisualStudio.Shell.15.0 (#347)
1 parent fe2af29 commit 11c84fc

3 files changed

Lines changed: 21 additions & 9 deletions

File tree

src/Stats.ImportAzureCdnStatistics/packagetranslations.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@
101101
"incorrectpackageversionpattern": "2016.(.*)",
102102
"correctedpackageid": "xrmlibrary.extensionmethods.2016",
103103
"correctedpackageversionpattern": "$1"
104+
},
105+
{
106+
"incorrectpackageid": "Microsoft.VisualStudio.Shell.15",
107+
"incorrectpackageversionpattern": "0.(.*)",
108+
"correctedpackageid": "Microsoft.VisualStudio.Shell.15.0",
109+
"correctedpackageversionpattern": "$1"
104110
}
105111
]
106112
}

tests/Tests.Stats.ImportAzureCdnStatistics/PackageStatisticsParserFacts.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ public void PackageVersionsAreParsedCorrectly(string packageId, string packageVe
3232
}
3333

3434
[Theory]
35-
[InlineData("donottranslate", "0.1.0", "donottranslate", "0.1.0")]
36-
[InlineData("package4", "0.1.0", "package4.0", "1.0.0")]
37-
[InlineData("package4", "0.2.3.5", "package4.0", "2.3.5")]
38-
[InlineData("package4", "5.1.0", "package4.5", "1.0.0")]
39-
[InlineData("package4", "5.2.3.5", "package4.5", "2.3.5")]
40-
public void TranslatesPackagesCorrectly(string packageId, string packageVersion, string expectedId, string expectedVersion)
35+
[InlineData("donottranslate", "0.1.0")]
36+
[InlineData("package4.0", "1.0.0")]
37+
[InlineData("package4.0", "2.3.5")]
38+
[InlineData("package4.5", "1.0.0")]
39+
[InlineData("package4.5", "2.3.5")]
40+
[InlineData("Microsoft.VisualStudio.Shell.15.0", "15.6.27413")]
41+
public void TranslatesPackagesCorrectly(string packageId, string packageVersion)
4142
{
4243
// Arrange
4344
var logEntry = GetCdnLogEntry($"http://test.me/{packageId}.{packageVersion}.nupkg");
@@ -49,9 +50,8 @@ public void TranslatesPackagesCorrectly(string packageId, string packageVersion,
4950
var stats = statsParser.FromCdnLogEntry(logEntry);
5051

5152
// Assert
52-
Assert.Equal(expectedId, stats.PackageId);
53-
Assert.Equal(expectedVersion, stats.PackageVersion);
54-
53+
Assert.Equal(packageId, stats.PackageId);
54+
Assert.Equal(packageVersion, stats.PackageVersion);
5555
}
5656

5757
private CdnLogEntry GetCdnLogEntry(string requestUrl)

tests/Tests.Stats.ImportAzureCdnStatistics/packagetranslations.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
"incorrectpackageversionpattern": "5.(.*)",
1212
"correctedpackageid": "package4.5",
1313
"correctedpackageversionpattern": "$1"
14+
},
15+
{
16+
"incorrectpackageid": "Microsoft.VisualStudio.Shell.15",
17+
"incorrectpackageversionpattern": "0.(.*)",
18+
"correctedpackageid": "Microsoft.VisualStudio.Shell.15.0",
19+
"correctedpackageversionpattern": "$1"
1420
}
1521
]
1622
}

0 commit comments

Comments
 (0)