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

chore: Update xUnit.net #1087

Merged
merged 2 commits into from
Jan 14, 2024
Merged

chore: Update xUnit.net #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6861e1d
chore: Update xUnit.net
HofmeisterAn Jan 13, 2024
0d70ac2
chore: Simplify HTTP default headers
HofmeisterAn Jan 14, 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
4 changes: 2 additions & 2 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<!-- Unit and integration test dependencies: -->
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Update="coverlet.collector" Version="6.0.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.0" />
<PackageReference Update="xunit" Version="2.5.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Update="xunit" Version="2.6.5" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions examples/Flyway/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<Project>
<ItemGroup>
<PackageReference Update="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="all"/>
<PackageReference Update="Testcontainers.PostgreSql" Version="3.5.0"/>
<PackageReference Update="Testcontainers.PostgreSql" Version="3.7.0"/>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Update="xunit" Version="2.5.0"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Update="xunit" Version="2.6.5"/>
<PackageReference Update="Npgsql" Version="6.0.10"/>
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions examples/WeatherForecast/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.23"/>
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="6.0.23"/>
<PackageReference Update="Microsoft.Fast.Components.FluentUI" Version="3.2.0"/>
<PackageReference Update="Testcontainers.SqlEdge" Version="3.5.0"/>
<PackageReference Update="Testcontainers.SqlEdge" Version="3.7.0"/>
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0"/>
<PackageReference Update="System.Text.Json" Version="6.0.9"/>
<PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.23"/>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Update="Selenium.WebDriver.ChromeDriver" Version="106.0.5249.6100"/>
<PackageReference Update="Selenium.WebDriver" Version="4.9.1"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Update="xunit" Version="2.5.0"/>
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Update="xunit" Version="2.6.5"/>
</ItemGroup>
</Project>
9 changes: 3 additions & 6 deletions src/Testcontainers/Configurations/AuthConfigs/DockerEndpointAuthenticationConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,9 @@ public DockerEndpointAuthenticationConfiguration(Uri endpoint, Credentials crede
/// <inheritdoc />
public DockerClientConfiguration GetDockerClientConfiguration(Guid sessionId = default)
{
var defaultHttpRequestHeaders = new ReadOnlyDictionary<string, string>(new Dictionary<string, string>
{
{ "User-Agent", "tc-dotnet/" + TestcontainersClient.Version },
{ "x-tc-sid", sessionId.ToString("D") },
});

var defaultHttpRequestHeaders = new Dictionary<string, string>();
defaultHttpRequestHeaders.Add("User-Agent", "tc-dotnet/" + TestcontainersClient.Version);
defaultHttpRequestHeaders.Add("x-tc-sid", sessionId.ToString("D"));
return new DockerClientConfiguration(Endpoint, Credentials, defaultHttpRequestHeaders: defaultHttpRequestHeaders);
}
}
Expand Down
18 changes: 9 additions & 9 deletions tests/Testcontainers.ActiveMq.Tests/ArtemisContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,34 +36,34 @@ public async Task EstablishesConnection()

// When
using var connection = await connectionFactory.CreateConnectionAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

await connection.StartAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

Assert.True(connection.IsStarted);

// Then
using var session = await connection.CreateSessionAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

using var queue = await session.CreateTemporaryQueueAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

using var producer = await session.CreateProducerAsync(queue)
.ConfigureAwait(false);
.ConfigureAwait(true);

using var consumer = await session.CreateConsumerAsync(queue)
.ConfigureAwait(false);
.ConfigureAwait(true);

var producedMessage = await producer.CreateTextMessageAsync(Guid.NewGuid().ToString("D"))
.ConfigureAwait(false);
.ConfigureAwait(true);

await producer.SendAsync(producedMessage)
.ConfigureAwait(false);
.ConfigureAwait(true);

var receivedMessage = await consumer.ReceiveAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

Assert.Equal(producedMessage.Text, receivedMessage.Body<string>());
}
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.ActiveMq.Tests/Testcontainers.ActiveMq.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="Apache.NMS.ActiveMQ" Version="2.1.0"/>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Testcontainers.ArangoDb.Tests/ArangoDbContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public async Task RetrievesDatabases()

// When
var response = await client.Database.GetDatabasesAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.Equal(HttpStatusCode.OK, response.Code);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.ArangoDb.Tests/Testcontainers.ArangoDb.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="ArangoDBNetStandard" Version="2.0.1"/>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions tests/Testcontainers.Azurite.Tests/AzuriteContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public async Task EstablishesBlobServiceConnection()

// When
var properties = await client.GetPropertiesAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.False(HasError(properties));
Expand All @@ -43,7 +43,7 @@ public async Task EstablishesQueueServiceConnection()

// When
var properties = await client.GetPropertiesAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.False(HasError(properties));
Expand All @@ -58,7 +58,7 @@ public async Task EstablishesTableServiceConnection()

// When
var properties = await client.GetPropertiesAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.False(HasError(properties));
Expand Down Expand Up @@ -107,7 +107,7 @@ public async Task MemoryLimitIsConfigured()
{
// Given
var (stdout, _) = await _azuriteContainer.GetLogsAsync(timestampsEnabled: false)
.ConfigureAwait(false);
.ConfigureAwait(true);

// When
var firstLine = stdout.Split(LineEndings, StringSplitOptions.RemoveEmptyEntries).First();
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.Azurite.Tests/Testcontainers.Azurite.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="Azure.Data.Tables" Version="12.8.0"/>
<PackageReference Include="Azure.Storage.Blobs" Version="12.17.0"/>
<PackageReference Include="Azure.Storage.Queues" Version="12.15.0"/>
Expand Down
10 changes: 5 additions & 5 deletions tests/Testcontainers.BigQuery.Tests/BigQueryContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ public async Task ExecuteQueryReturnsInsertRow()
expectedRow.Add("score", 85L);

using var bigQueryClient = await bigQueryClientBuilder.BuildAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

var dataset = await bigQueryClient.GetOrCreateDatasetAsync("mydata")
.ConfigureAwait(false);
.ConfigureAwait(true);

// When
var table = await dataset.CreateTableAsync("scores", tableSchema)
.ConfigureAwait(false);
.ConfigureAwait(true);

_ = await table.InsertRowAsync(expectedRow)
.ConfigureAwait(false);
.ConfigureAwait(true);

var results = await bigQueryClient.ExecuteQueryAsync($"SELECT * FROM {table}", null)
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.Single(results);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.BigQuery.Tests/Testcontainers.BigQuery.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="Google.Cloud.BigQuery.V2" Version="3.4.0"/>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/Testcontainers.Bigtable.Tests/BigtableContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public async Task GetTableReturnsCreateTable()

// When
var bigtableClient = await bigtableClientBuilder.BuildAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

_ = await bigtableClient.CreateTableAsync(instanceName, tableName.TableId, table)
.ConfigureAwait(false);
.ConfigureAwait(true);

var actualTable = await bigtableClient.GetTableAsync(tableName)
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.NotNull(actualTable);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.Bigtable.Tests/Testcontainers.Bigtable.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="Google.Cloud.Bigtable.Admin.V2" Version="3.7.0"/>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Testcontainers.ClickHouse.Tests/ClickHouseContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public async Task ExecScriptReturnsSuccessful()

// When
var execResult = await _clickHouseContainer.ExecScriptAsync(scriptContent)
.ConfigureAwait(false);
.ConfigureAwait(true);

// When
Assert.True(0L.Equals(execResult.ExitCode), execResult.Stderr);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.ClickHouse.Tests/Testcontainers.ClickHouse.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="ClickHouse.Client" Version="6.7.1"/>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.Consul.Tests/ConsulContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ public async Task GetItemReturnsPutItem()

// When
_ = await consulClient.KV.Put(expected)
.ConfigureAwait(false);
.ConfigureAwait(true);

var actual = await consulClient.KV.Get(key)
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.Equal(HttpStatusCode.OK, actual.StatusCode);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.Consul.Tests/Testcontainers.Consul.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit" Version="2.6.5" />
<PackageReference Include="Consul" Version="1.6.10.9" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Testcontainers.CosmosDb.Tests/CosmosDbContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public async Task AccountPropertiesIdReturnsLocalhost()

// When
var accountProperties = await cosmosClient.ReadAccountAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.Equal("localhost", accountProperties.Id);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.CosmosDb.Tests/Testcontainers.CosmosDb.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.32.1"/>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/Testcontainers.CouchDb.Tests/CouchDbContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public async Task PutDatabaseReturnsHttpStatusCodeCreated()

// When
var database = await client.Database.PutAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.Equal(HttpStatusCode.Created, database.StatusCode);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.CouchDb.Tests/Testcontainers.CouchDb.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="MyCouch" Version="7.6.0"/>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/Testcontainers.Couchbase.Tests/CouchbaseContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public async Task GetBucketReturnsDefaultBucket()
clusterOptions.Password = CouchbaseBuilder.DefaultPassword;

var cluster = await Cluster.ConnectAsync(clusterOptions)
.ConfigureAwait(false);
.ConfigureAwait(true);

// When
var ping = await cluster.PingAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

var bucket = await cluster.BucketAsync(_couchbaseContainer.Buckets.Single().Name)
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.NotEmpty(ping.Id);
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.Couchbase.Tests/Testcontainers.Couchbase.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="CouchbaseNetClient" Version="3.4.3"/>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions tests/Testcontainers.Databases.Tests/Testcontainers.Databases.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
<PackageReference Include="coverlet.collector" Version="6.0.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
<PackageReference Include="xunit" Version="2.5.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<PackageReference Include="xunit" Version="2.6.5"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)tests/Testcontainers.*.Tests/Testcontainers.*.Tests.csproj"/>
Expand Down
8 changes: 4 additions & 4 deletions tests/Testcontainers.DynamoDb.Tests/DynamoDbContainerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public async Task ListBucketsReturnsHttpStatusCodeOk()

// When
var tables = await client.ListTablesAsync()
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.Equal(HttpStatusCode.OK, tables.HttpStatusCode);
Expand Down Expand Up @@ -68,13 +68,13 @@ public async Task GetItemReturnsPutItem()

// When
_ = await client.CreateTableAsync(tableRequest)
.ConfigureAwait(false);
.ConfigureAwait(true);

_ = await client.PutItemAsync(putItemRequest)
.ConfigureAwait(false);
.ConfigureAwait(true);

var itemResponse = await client.GetItemAsync(getItemRequest)
.ConfigureAwait(false);
.ConfigureAwait(true);

// Then
Assert.Equal(id, itemResponse.Item.Values.Single().S);
Expand Down
Loading