Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a57aabf
Copied initial files over and addressred some PR comments
jgonz120 Dec 20, 2023
05ed3db
Test updates
jgonz120 Dec 21, 2023
c285f0f
optimized string split
jgonz120 Dec 21, 2023
c06e3f5
cleanup
jgonz120 Dec 21, 2023
ef90a51
switch to stream
jgonz120 Dec 21, 2023
4c31cbf
fix typo
jgonz120 Dec 21, 2023
b787826
fix typo
jgonz120 Dec 21, 2023
c627b25
create static json reader state
jgonz120 Dec 21, 2023
ef35381
typo
jgonz120 Dec 21, 2023
084986d
typo
jgonz120 Dec 21, 2023
5850754
added lazy string split
jgonz120 Dec 22, 2023
014739f
using
jgonz120 Dec 22, 2023
d28a482
Update unit tests
jgonz120 Dec 22, 2023
c9cb53f
unit tests
jgonz120 Dec 22, 2023
d083e23
fix references
jgonz120 Dec 22, 2023
0b22126
Fix typo
jgonz120 Dec 22, 2023
e81974f
Added test for invalid logs
jgonz120 Jan 4, 2024
d2cc5d6
removed extra name assignment from package spec reader
jgonz120 Jan 4, 2024
2de68c4
use array empty
jgonz120 Jan 4, 2024
79e2b71
move public method up
jgonz120 Jan 4, 2024
ccd6fe1
remove uneeded string list
jgonz120 Jan 4, 2024
8d719c6
use false string
jgonz120 Jan 4, 2024
212b7bd
add is final block to test
jgonz120 Jan 4, 2024
b5a82d7
rename test
jgonz120 Jan 4, 2024
82363ee
style
jgonz120 Jan 4, 2024
0cc4e51
style
jgonz120 Jan 4, 2024
c525dc8
add tests for validating empty streams on creationg of utf8jsonstream…
jgonz120 Jan 4, 2024
4e5112a
Added test and implemented string split in two
jgonz120 Jan 5, 2024
2398980
fix validation for lazy string split
jgonz120 Jan 8, 2024
1693913
reduce methods in LikeFileFormat
jgonz120 Jan 8, 2024
e0ef66d
set the list values with the results directly
jgonz120 Jan 8, 2024
b4d0169
store environment variable to avoid calling GetEnvironmentVariable se…
jgonz120 Jan 8, 2024
f060670
switch to splitintwo
jgonz120 Jan 9, 2024
4602b44
Update conditional for framework
jgonz120 Jan 9, 2024
a240062
Caching the parsed NugetVersion and VersionRange objects.
jgonz120 Jan 11, 2024
0883567
Fixes from PR
jgonz120 Jan 11, 2024
c4adaf7
Avoid creating empty lists
jgonz120 Jan 11, 2024
bda30bb
Revert "Caching the parsed NugetVersion and VersionRange objects."
jgonz120 Jan 17, 2024
fb7ebd5
Fix netwonsoft json parsing
jgonz120 Jan 17, 2024
32aba9a
Add missing reference
jgonz120 Jan 17, 2024
8853734
added some examples of the json to be parsed
jgonz120 Jan 17, 2024
1b29455
Fix references in comments
jgonz120 Jan 17, 2024
1877448
Fixes from PR
jgonz120 Jan 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
unit tests
  • Loading branch information
jgonz120 committed Dec 22, 2023
commit c9cb53f9ca4c70f14af780bb292ec01fdc549ca9
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ namespace NuGet.VisualStudio.Implementation.Test.SolutionExplorer.Models
public class AssetsFileDependenciesSnapshotTests
{
[Fact]
[Obsolete]
public void ParseLibraries_IgnoreCaseInDependenciesTree_Succeeds()
{
var lockFileContent = """
Expand Down Expand Up @@ -69,7 +68,6 @@ public void ParseLibraries_IgnoreCaseInDependenciesTree_Succeeds()
}

[Fact]
[Obsolete]
public void ParseLibraries_LogForUnknownLibrary_AddsUnknownLibraryType()
{
var lockFileContent = """
Expand Down Expand Up @@ -120,7 +118,6 @@ public void ParseLibraries_LogForUnknownLibrary_AddsUnknownLibraryType()
}

[Fact]
[Obsolete]
public void ParseLibraries_LogForUnknownLibrary_WithAbsolutePath_AddsUnknownLibraryType()
{
var lockFileContent = """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,6 @@ public async Task RestoreCommand_UnmatchedRefAndLibAssembliesAsync()
}

[Fact(Skip = "https://github.com/NuGet/Home/issues/8765")]
[Obsolete]
public async Task RestoreCommand_LockedLockFileWithOutOfDateProjectAsync()
{
const string project = @"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class UWPRestoreTests
{
// Verify that a v1 lock file can be parsed without crashing.
[Fact]
[System.Obsolete]
public void UWPRestore_ReadV1LockFile()
{
// Arrange
Expand All @@ -44,7 +43,6 @@ public void UWPRestore_ReadV1LockFile()
}

[Fact]
[System.Obsolete]
public void UWPRestore_ReadLockFileRoundTrip()
{
using (var workingDir = TestDirectory.Create())
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using NuGet.LibraryModel;
using NuGet.Packaging.Core;
using NuGet.Versioning;
using Test.Utility;
using Xunit;
using static NuGet.Test.Utility.TestPackagesCore;

Expand All @@ -21,7 +20,7 @@ public class LockFileFormatTests
{
// Verify the value of locked has no impact on the parsed lock file
[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]

public void LockFileFormat_LockedPropertyIsIgnored(IEnvironmentVariableReader environmentVariableReader)
{
Expand Down Expand Up @@ -170,7 +169,7 @@ public void LockFileFormat_LockedPropertyIsIgnored(IEnvironmentVariableReader en
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsLockFileWithNoTools(IEnvironmentVariableReader environmentVariableReader)
{
var lockFileContent = @"{
Expand Down Expand Up @@ -1336,7 +1335,7 @@ public void LockFileFormat_WritesMinimalWarningMessageWithWarningLevel()
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsMinimalErrorMessage(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
Expand Down Expand Up @@ -1409,7 +1408,7 @@ public void LockFileFormat_ReadsMinimalErrorMessage(IEnvironmentVariableReader e
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsFullErrorMessage(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
Expand Down Expand Up @@ -1492,7 +1491,7 @@ public void LockFileFormat_ReadsFullErrorMessage(IEnvironmentVariableReader envi
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_SafeRead(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
Expand Down Expand Up @@ -1578,7 +1577,7 @@ public void LockFileFormat_SafeRead(IEnvironmentVariableReader environmentVariab


[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsWarningMessage(IEnvironmentVariableReader environmentVariableReader)
{

Expand Down Expand Up @@ -1664,7 +1663,7 @@ public void LockFileFormat_ReadsWarningMessage(IEnvironmentVariableReader enviro
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsWarningMessageWithoutWarningLevel(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
Expand Down Expand Up @@ -1749,7 +1748,7 @@ public void LockFileFormat_ReadsWarningMessageWithoutWarningLevel(IEnvironmentVa


[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsMultipleMessages(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
Expand Down Expand Up @@ -1839,7 +1838,7 @@ public void LockFileFormat_ReadsMultipleMessages(IEnvironmentVariableReader envi
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsLogMessageWithSameFilePathAndProjectPath(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
Expand Down Expand Up @@ -1919,7 +1918,7 @@ public void LockFileFormat_ReadsLogMessageWithSameFilePathAndProjectPath(IEnviro
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsLogMessageWithNoFilePath(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
Expand Down Expand Up @@ -1998,7 +1997,7 @@ public void LockFileFormat_ReadsLogMessageWithNoFilePath(IEnvironmentVariableRea
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsLockFileWithTools(IEnvironmentVariableReader environmentVariableReader)
{
var lockFileContent = @"{
Expand Down Expand Up @@ -2069,7 +2068,7 @@ public void LockFileFormat_ReadsLockFileWithTools(IEnvironmentVariableReader env
}

[Theory]
[MemberData(nameof(TestEnvironmentVariableReader))]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFileFormat_ReadsLockFileWithEmbedAssemblies(IEnvironmentVariableReader environmentVariableReader)
{
var lockFileContent = @"{
Expand Down Expand Up @@ -2312,40 +2311,5 @@ public void LockFileFormat_WritesCentralTransitiveDependencyGroups()
// Assert
Assert.Equal(expected.ToString(), output.ToString());
}

public static IEnumerable<object[]> TestEnvironmentVariableReader()
{
return GetTestEnvironmentVariableReader();
}

private static IEnumerable<object[]> GetTestEnvironmentVariableReader(params object[] objects)
{
var UseNjForFileTrue = new List<object> {
new TestEnvironmentVariableReader(
new Dictionary<string, string>()
{
["NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING"] = bool.TrueString
}, "NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING: true")
};
var UseNjForFileFalse = new List<object> {
new TestEnvironmentVariableReader(
new Dictionary<string, string>()
{
["NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING"] = bool.FalseString
}, "NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING: false")
};

if (objects != null)
{
UseNjForFileFalse.AddRange(objects);
UseNjForFileTrue.AddRange(objects);
}

return new List<object[]>
{
UseNjForFileTrue.ToArray(),
UseNjForFileFalse.ToArray()
};
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// 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.Collections.Generic;
using Test.Utility;

namespace NuGet.ProjectModel
{
public class LockFileParsingEnvironmentVariable
{
public static IEnumerable<object[]> TestEnvironmentVariableReader()
{
return GetTestEnvironmentVariableReader();
}

public static IEnumerable<object[]> TestEnvironmentVariableReader(object value1)
{
return GetTestEnvironmentVariableReader(value1);
}

public static IEnumerable<object[]> TestEnvironmentVariableReader(object value1, object value2)
{
return GetTestEnvironmentVariableReader(value1, value2);
}

public static IEnumerable<object[]> TestEnvironmentVariableReader(object value1, object value2, object value3)
{
return GetTestEnvironmentVariableReader(value1, value2, value3);
}

private static IEnumerable<object[]> GetTestEnvironmentVariableReader(params object[] objects)
{
var UseNjForFileTrue = new List<object> {
new TestEnvironmentVariableReader(
new Dictionary<string, string>()
{
["NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING"] = bool.TrueString
}, "NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING: true")
};
var UseNjForFileFalse = new List<object> {
new TestEnvironmentVariableReader(
new Dictionary<string, string>()
{
["NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING"] = bool.FalseString
}, "NUGET_EXPERIMENTAL_USE_NJ_FOR_FILE_PARSING: false")
};

if (objects != null)
{
UseNjForFileFalse.AddRange(objects);
UseNjForFileTrue.AddRange(objects);
}

return new List<object[]>
{
UseNjForFileTrue.ToArray(),
UseNjForFileFalse.ToArray()
};
}
}
}
16 changes: 8 additions & 8 deletions test/NuGet.Core.Tests/NuGet.ProjectModel.Test/LockFileTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -854,13 +854,13 @@ public void LockFile_ConsiderCentralTransitiveDependencyGroupsForEquality()
Assert.Equal(lockFile_1_2.GetHashCode(), lockFile_11_22.GetHashCode());
}

[Fact]
[Obsolete]
public void LockFile_GetTarget_WithNuGetFramework_ReturnsCorrectLockFileTarget()
[Theory]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFile_GetTarget_WithNuGetFramework_ReturnsCorrectLockFileTarget(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
var expectedJson = ResourceTestUtility.GetResource("NuGet.ProjectModel.Test.compiler.resources.sample.assets.json", typeof(LockFileTests));
var lockFile = new LockFileFormat().Parse(expectedJson, Path.GetTempPath());
var lockFile = new LockFileFormat().Parse(expectedJson, Path.GetTempPath(), environmentVariableReader);
NuGetFramework nuGetFramework = NuGetFramework.ParseComponents(".NETCoreApp,Version=v5.0", "Windows,Version=7.0");

// Act
Expand All @@ -870,13 +870,13 @@ public void LockFile_GetTarget_WithNuGetFramework_ReturnsCorrectLockFileTarget()
target.TargetFramework.Should().Be(nuGetFramework);
}

[Fact]
[Obsolete]
public void LockFile_GetTarget_WithAlias_ReturnsCorrectLockFileTarget()
[Theory]
[MemberData(nameof(LockFileParsingEnvironmentVariable.TestEnvironmentVariableReader), MemberType = typeof(LockFileParsingEnvironmentVariable))]
public void LockFile_GetTarget_WithAlias_ReturnsCorrectLockFileTarget(IEnvironmentVariableReader environmentVariableReader)
{
// Arrange
var expectedJson = ResourceTestUtility.GetResource("NuGet.ProjectModel.Test.compiler.resources.sample.assets.json", typeof(LockFileTests));
var lockFile = new LockFileFormat().Parse(expectedJson, Path.GetTempPath());
var lockFile = new LockFileFormat().Parse(expectedJson, Path.GetTempPath(), environmentVariableReader);
NuGetFramework nuGetFramework = NuGetFramework.ParseComponents(".NETCoreApp,Version=v5.0", "Windows,Version=7.0");

// Act
Expand Down