Skip to content

Commit 21425a6

Browse files
author
Oleksii Sokol
committed
fix azureTable container
1 parent 7435f86 commit 21425a6

File tree

9 files changed

+26
-56
lines changed

9 files changed

+26
-56
lines changed

ManagedCode.Database.Tests/AzureTablesTests/AzureTablesCollectionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*using Azure;
1+
using Azure;
22
using FluentAssertions;
33
using ManagedCode.Database.AzureTables;
44
using ManagedCode.Database.Core.Exceptions;
@@ -13,10 +13,10 @@
1313

1414
namespace ManagedCode.Database.Tests.AzureTablesTests;
1515

16-
[Collection("AzureTables collection")]
16+
[Collection(nameof(AzureTablesTestContainer))]
1717
public class AzureTablesCollectionTests : BaseCollectionTests<TableId, TestAzureTablesItem>
1818
{
19-
public AzureTablesCollectionTests() : base(new AzureTablesTestContainer())
19+
public AzureTablesCollectionTests(AzureTablesTestContainer container) : base(container)
2020
{
2121
}
2222

@@ -86,4 +86,4 @@ public override async Task DeleteAll()
8686
deletedItems.Should().BeTrue();
8787
await countAction.Should().ThrowExactlyAsync<DatabaseException>();
8888
}
89-
}*/
89+
}

ManagedCode.Database.Tests/AzureTablesTests/AzureTablesQueryableTests.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*using FluentAssertions;
1+
using FluentAssertions;
22
using ManagedCode.Database.AzureTables;
33
using ManagedCode.Database.Tests.BaseTests;
44
using ManagedCode.Database.Tests.Common;
@@ -10,10 +10,10 @@
1010

1111
namespace ManagedCode.Database.Tests.AzureTablesTests;
1212

13-
[Collection("AzureTables collection")]
13+
[Collection(nameof(AzureTablesTestContainer))]
1414
public class AzureTablesQueryableTests : BaseQueryableTests<TableId, TestAzureTablesItem>
1515
{
16-
public AzureTablesQueryableTests() : base(new AzureTablesTestContainer())
16+
public AzureTablesQueryableTests(AzureTablesTestContainer container) : base(container)
1717
{
1818
}
1919

@@ -37,4 +37,3 @@ await itemsResult
3737
.ThrowAsync<ArgumentNullException>();
3838
}
3939
}
40-
*/

ManagedCode.Database.Tests/MongoDBTests/MongoDBCollectionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace ManagedCode.Database.Tests.MongoDBTests;
1212
[Collection(nameof(MongoDBTestContainer))]
1313
public class MongoDBCollectionTests : BaseCollectionTests<ObjectId, TestMongoDBItem>
1414
{
15-
public MongoDBCollectionTests(MongoDBTestContainer container) : base(container)
15+
public MongoDBCollectionTests(MongoDBTestContainer container) : base(container)
1616
{
1717
}
1818
}

ManagedCode.Database.Tests/TestContainers/AzureTablesTestContainer.cs

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
using ManagedCode.Database.AzureTables;
1010
using ManagedCode.Database.Core;
1111
using ManagedCode.Database.Tests.Common;
12+
using Xunit;
1213
using Xunit.Abstractions;
1314

1415
namespace ManagedCode.Database.Tests.TestContainers;
1516

16-
public class AzureTablesTestContainer : ITestContainer<TableId, TestAzureTablesItem>
17+
[CollectionDefinition(nameof(AzureTablesTestContainer))]
18+
public class AzureTablesTestContainer : ITestContainer<TableId, TestAzureTablesItem>, ICollectionFixture<AzureTablesTestContainer>, IDisposable
1719
{
1820
//private readonly ITestOutputHelper _testOutputHelper;
1921
private readonly TestcontainersContainer _azureTablesTestContainer;
@@ -27,6 +29,7 @@ public class AzureTablesTestContainer : ITestContainer<TableId, TestAzureTablesI
2729
{3, 10002}
2830
};
2931
private bool containerExsist = false;
32+
private string containerId;
3033

3134
public AzureTablesTestContainer()
3235
{
@@ -78,13 +81,17 @@ public async Task InitializeAsync()
7881
publicPort[1] = _azureTablesTestContainer.GetMappedPublicPort(privatePort[1]);
7982
publicPort[2] = _azureTablesTestContainer.GetMappedPublicPort(privatePort[2]);
8083
publicPort[3] = _azureTablesTestContainer.GetMappedPublicPort(privatePort[3]);
84+
85+
containerId = _azureTablesTestContainer.Id;
8186
}
8287
else
8388
{
8489
var listContainers = await _dockerClient.Containers.ListContainersAsync(new ContainersListParameters());
8590

8691
ContainerListResponse containerListResponse = listContainers.Single(container => container.Names.Contains($"/{containerName}"));
8792

93+
containerId = containerListResponse.ID;
94+
8895
publicPort[1] = containerListResponse.Ports.Single(port => port.PrivatePort == privatePort[1]).PublicPort;
8996
publicPort[2] = containerListResponse.Ports.Single(port => port.PrivatePort == privatePort[2]).PublicPort;
9097
publicPort[3] = containerListResponse.Ports.Single(port => port.PrivatePort == privatePort[3]).PublicPort;
@@ -112,10 +119,18 @@ public async Task InitializeAsync()
112119
public async Task DisposeAsync()
113120
{
114121
await _database.DisposeAsync();
115-
//await _azureTablesContainer.StopAsync();
116-
//await _azureTablesContainer.CleanUpAsync();
117122

118123
//_testOutputHelper.WriteLine($"Azure Tables container State:{_azureTablesContainer.State}");
119124
//_testOutputHelper.WriteLine("=STOP=");
120125
}
126+
127+
public async void Dispose()
128+
{
129+
130+
await _dockerClient.Containers.RemoveContainerAsync(containerId,
131+
new ContainerRemoveParameters
132+
{
133+
Force = true
134+
});
135+
}
121136
}

ManagedCode.Database.Tests/TestContainers/DatabaseCollections/AzureTeblesTestCollection.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

ManagedCode.Database.Tests/TestContainers/DatabaseCollections/CosmosTestCollection.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

ManagedCode.Database.Tests/TestContainers/DatabaseCollections/DynamoDBTestCollection.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

ManagedCode.Database.Tests/TestContainers/DatabaseCollections/MongoDBTestCollection.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

ManagedCode.Database.Tests/TestContainers/MongoDBTestContainer.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ public async Task InitializeAsync()
7979
containerId = containerListResponse.ID;
8080

8181
publicPort = containerListResponse.Ports.Single(port => port.PrivatePort == privatePort).PublicPort;
82-
83-
/*if(containerListResponse.State == "exited")
84-
{
85-
await _dockerClient.Containers.StartContainerAsync(containerId, new ContainerStartParameters());
86-
}*/
8782
}
8883

8984
_dbDatabase = new MongoDBDatabase(new MongoDBOptions()
@@ -101,7 +96,6 @@ public async Task InitializeAsync()
10196
public async Task DisposeAsync()
10297
{
10398
await _dbDatabase.DisposeAsync();
104-
//await _dockerClient.Containers.StopContainerAsync(_mongoDBTestContainer.Id, new ContainerStopParameters());
10599

106100
// _testOutputHelper.WriteLine($"Mongo container State:{_mongoDBContainer.State}");
107101
//_testOutputHelper.WriteLine("=STOP=");
@@ -115,7 +109,5 @@ await _dockerClient.Containers.RemoveContainerAsync(containerId,
115109
{
116110
Force = true
117111
});
118-
// await _dockerClient.Containers.StopContainerAsync(containerId, new ContainerStopParameters());
119-
120112
}
121113
}

0 commit comments

Comments
 (0)