@@ -24,15 +24,14 @@ internal static class SiloInstanceTableTestConstants
24
24
}
25
25
26
26
[ Collection ( "Default" ) ]
27
- public abstract class MembershipTableTestsBase : IDisposable //, IClassFixture<ConnectionStringFixture>
27
+ public abstract class MembershipTableTestsBase : IDisposable
28
28
{
29
29
private static readonly string hostName = Dns . GetHostName ( ) ;
30
30
private readonly ILogger logger = null ;
31
31
private readonly IMembershipTable membershipTable ;
32
32
private readonly IGatewayListProvider gatewayListProvider ;
33
33
protected readonly string clusterId ;
34
34
protected ILoggerFactory loggerFactory ;
35
- protected const string testDatabaseName = "OrleansMembershipTest" ; //for relational storage
36
35
37
36
private static string accountEndpoint ;
38
37
private static string accountKey ;
@@ -42,10 +41,8 @@ static MembershipTableTestsBase()
42
41
OrleansFixture . GetAccountInfo ( out accountEndpoint , out accountKey ) ;
43
42
}
44
43
45
- protected MembershipTableTestsBase ( /*ConnectionStringFixture fixture, TestEnvironmentFixture environment, */ LoggerFilterOptions filters )
44
+ protected MembershipTableTestsBase ( )
46
45
{
47
- //this.environment = environment;
48
- //loggerFactory = TestingUtils.CreateDefaultLoggerFactory($"{this.GetType()}.log", filters);
49
46
var sp = new ServiceCollection ( ) . AddLogging ( b => b . AddConsole ( ) ) . BuildServiceProvider ( ) ;
50
47
loggerFactory = sp . GetRequiredService < ILoggerFactory > ( ) ;
51
48
logger = loggerFactory . CreateLogger ( this . GetType ( ) . FullName ) ;
@@ -54,40 +51,23 @@ protected MembershipTableTestsBase(/*ConnectionStringFixture fixture, TestEnviro
54
51
55
52
logger ? . Info ( "ClusterId={0}" , this . clusterId ) ;
56
53
57
- //fixture.InitializeConnectionStringAccessor(GetConnectionString);
58
- //this.connectionString = fixture.ConnectionString;
59
- var adoVariant = GetAdoInvariant ( ) ;
60
-
61
54
membershipTable = CreateMembershipTable ( logger , accountEndpoint , accountKey ) ;
62
55
membershipTable . InitializeMembershipTable ( true ) . WithTimeout ( TimeSpan . FromMinutes ( 3 ) ) . Wait ( ) ;
63
56
64
57
gatewayListProvider = CreateGatewayListProvider ( logger , accountEndpoint , accountKey ) ;
65
58
gatewayListProvider . InitializeGatewayListProvider ( ) . WithTimeout ( TimeSpan . FromMinutes ( 3 ) ) . Wait ( ) ;
66
59
}
67
60
68
- //public IGrainFactory GrainFactory => this.environment.GrainFactory;
69
-
70
- //public IGrainReferenceConverter GrainReferenceConverter => this.environment.Services.GetRequiredService<IGrainReferenceConverter>();
71
-
72
- //public IServiceProvider Services => this.environment.Services;
73
-
74
61
public void Dispose ( )
75
62
{
76
63
if ( membershipTable != null && SiloInstanceTableTestConstants . DeleteEntriesAfterTest )
77
64
{
78
65
membershipTable . DeleteMembershipTableEntries ( this . clusterId ) . Wait ( ) ;
79
66
}
80
- //this.loggerFactory.Dispose();
81
67
}
82
68
83
69
protected abstract IGatewayListProvider CreateGatewayListProvider ( ILogger logger , string accountEndpoint , string accountKey ) ;
84
70
protected abstract IMembershipTable CreateMembershipTable ( ILogger logger , string accountEndpoint , string accountKey ) ;
85
- protected abstract Task < string > GetConnectionString ( ) ;
86
-
87
- protected virtual string GetAdoInvariant ( )
88
- {
89
- return null ;
90
- }
91
71
92
72
protected async Task MembershipTable_GetGateways ( )
93
73
{
0 commit comments