Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade SDK tests to XUnit 2.9.3 #528

Merged
merged 5 commits into from
Mar 6, 2025
Merged

Upgrade SDK tests to XUnit 2.9.3 #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
adaf15c
upgrade to XUnit 2.5
algompluecker Mar 6, 2025
af4e741
add changie
algompluecker Mar 6, 2025
f8aa47c
Delete .changes/unreleased/Improvements-528.yaml
Frassle Mar 6, 2025
b38cead
upgrade to 2.9.3
algompluecker Mar 6, 2025
16ca285
Merge branch 'algompluecker/xunit-upgrade' of https://github.com/algo…
algompluecker Mar 6, 2025
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
34 changes: 17 additions & 17 deletions sdk/Pulumi.Tests/Core/InputTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ public Task MergeInputMaps()
var result = InputMap<string>.Merge(map1, map2);

// Check the merged map
var data = await result.ToOutput().DataTask.ConfigureAwait(false);
var data = await result.ToOutput().DataTask;
Assert.True(data.IsKnown);
Assert.Equal(4, data.Value.Count);
for (var i = 1; i <= 4; i++)
Assert.True(data.Value.Contains($"K{i}", $"V{i}"));

// Check that the input maps haven't changed
var map1Data = await map1.ToOutput().DataTask.ConfigureAwait(false);
var map1Data = await map1.ToOutput().DataTask;
Assert.Equal(3, map1Data.Value.Count);
Assert.True(map1Data.Value.ContainsValue("V3_wrong"));

var map2Data = await map2.ToOutput().DataTask.ConfigureAwait(false);
var map2Data = await map2.ToOutput().DataTask;
Assert.Equal(2, map2Data.Value.Count);
Assert.True(map2Data.Value.ContainsValue("V3"));
});
Expand All @@ -57,7 +57,7 @@ public Task InputMapCollectionInitializers()
new Dictionary<string, string> { { "K3", "V3" }, { "K4", "V4"} },
Output.Create(new Dictionary<string, string> { ["K5"] = "V5", ["K6"] = "V6" }.ToImmutableDictionary())
};
var data = await map.ToOutput().DataTask.ConfigureAwait(false);
var data = await map.ToOutput().DataTask;
Assert.Equal(6, data.Value.Count);
Assert.Equal(new Dictionary<string, string> { ["K1"] = "V1", ["K2"] = "V2", ["K3"] = "V3", ["K4"] = "V4", ["K5"] = "V5", ["K6"] = "V6" }, data.Value);
});
Expand All @@ -76,7 +76,7 @@ public Task InputMapUnionInitializer()
{ "t1", Union<string, int>.FromT1(456) },
}
};
var data = await sample.Dict.ToOutput().DataTask.ConfigureAwait(false);
var data = await sample.Dict.ToOutput().DataTask;
Assert.Equal(4, data.Value.Count);
Assert.True(data.Value.ContainsValue("testValue"));
Assert.True(data.Value.ContainsValue(123));
Expand All @@ -96,7 +96,7 @@ public Task InputListCollectionInitializers()
new List<string> { "V5", "V6" },
Output.Create(ImmutableArray.Create("V7", "V8"))
};
var data = await list.ToOutput().DataTask.ConfigureAwait(false);
var data = await list.ToOutput().DataTask;
Assert.Equal(8, data.Value.Length);
Assert.Equal(new[] { "V1", "V2", "V3", "V4", "V5", "V6", "V7", "V8" }, data.Value);
});
Expand All @@ -115,7 +115,7 @@ public Task InputListUnionInitializer()
Union<string, int>.FromT1(456),
}
};
var data = await sample.List.ToOutput().DataTask.ConfigureAwait(false);
var data = await sample.List.ToOutput().DataTask;
Assert.Equal(4, data.Value.Length);
Assert.True(data.Value.IndexOf("testValue") >= 0);
Assert.True(data.Value.IndexOf(123) >= 0);
Expand All @@ -128,19 +128,19 @@ public Task InputUnionInitializer()
=> RunInPreview(async () =>
{
var sample = new SampleArgs { Union = "testValue" };
var data = await sample.Union.ToOutput().DataTask.ConfigureAwait(false);
var data = await sample.Union.ToOutput().DataTask;
Assert.Equal("testValue", data.Value);

sample = new SampleArgs { Union = 123 };
data = await sample.Union.ToOutput().DataTask.ConfigureAwait(false);
data = await sample.Union.ToOutput().DataTask;
Assert.Equal(123, data.Value);

sample = new SampleArgs { Union = Union<string, int>.FromT0("left") };
data = await sample.Union.ToOutput().DataTask.ConfigureAwait(false);
data = await sample.Union.ToOutput().DataTask;
Assert.Equal("left", data.Value);

sample = new SampleArgs { Union = Union<string, int>.FromT1(456) };
data = await sample.Union.ToOutput().DataTask.ConfigureAwait(false);
data = await sample.Union.ToOutput().DataTask;
Assert.Equal(456, data.Value);
});

Expand All @@ -157,7 +157,7 @@ public Task InputMapAdd()
map.Add("K2", "V2");

// We should be able to get this map still
var data = await map.ToOutput().DataTask.ConfigureAwait(false);
var data = await map.ToOutput().DataTask;
Assert.Equal(2, data.Value.Count);
Assert.Equal(new Dictionary<string, string> { ["K1"] = "V1", ["K2"] = "V2" }, data.Value);

Expand All @@ -166,7 +166,7 @@ public Task InputMapAdd()
map.Add("K3", "V3_wrong");

// This should now throw an exception
await Assert.ThrowsAsync<ArgumentException>(() => map.ToOutput().DataTask).ConfigureAwait(false);
await Assert.ThrowsAsync<ArgumentException>(() => map.ToOutput().DataTask);
});

// Regression test for https://github.com/pulumi/pulumi-dotnet/issues/456
Expand All @@ -177,14 +177,14 @@ public Task InputMapNull()
ImmutableDictionary<string, string>? nullDict = null;
var map = (InputMap<string>)nullDict!;

var data = await map.ToOutput().DataTask.ConfigureAwait(false);
var data = await map.ToOutput().DataTask;
Assert.True(data.IsKnown);
Assert.Null(data.Value);

var nullDictOutput = Output.Create(nullDict);
map = (InputMap<string>)nullDictOutput!;

data = await map.ToOutput().DataTask.ConfigureAwait(false);
data = await map.ToOutput().DataTask;
Assert.True(data.IsKnown);
Assert.Null(data.Value);
});
Expand All @@ -197,14 +197,14 @@ public Task InputListNull()
ImmutableArray<string> nullList = default;
var list = (InputList<string>)nullList;

var data = await list.ToOutput().DataTask.ConfigureAwait(false);
var data = await list.ToOutput().DataTask;
Assert.True(data.IsKnown);
Assert.True(data.Value.IsDefault);

var nullListOutput = Output.Create(nullList);
list = (InputList<string>)nullListOutput!;

data = await list.ToOutput().DataTask.ConfigureAwait(false);
data = await list.ToOutput().DataTask;
Assert.True(data.IsKnown);
Assert.True(data.Value.IsDefault);
});
Expand Down
Loading
Loading