Skip to content

Commit 56bf94a

Browse files
kendaleivodinserj
authored andcommitted
Use schema from constant in tests (HangfireIO#1532)
I made these changes while working through HangfireIO#1531 if you want to include them.
1 parent 926b231 commit 56bf94a

File tree

6 files changed

+256
-256
lines changed

6 files changed

+256
-256
lines changed

tests/Hangfire.SqlServer.Tests/CountersAggregatorFacts.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public class CountersAggregatorFacts
1414
[Fact, CleanDatabase]
1515
public void CountersAggregatorExecutesProperly()
1616
{
17-
const string createSql = @"
18-
insert into HangFire.Counter ([Key], [Value], ExpireAt)
17+
var createSql = $@"
18+
insert into [{Constants.DefaultSchema}].Counter ([Key], [Value], ExpireAt)
1919
values ('key', 1, @expireAt)";
2020

2121
using (var connection = CreateConnection())
@@ -31,7 +31,7 @@ insert into HangFire.Counter ([Key], [Value], ExpireAt)
3131
aggregator.Execute(cts.Token);
3232

3333
// Assert
34-
Assert.Equal(1, connection.Query<int>(@"select count(*) from HangFire.AggregatedCounter").Single());
34+
Assert.Equal(1, connection.Query<int>($"select count(*) from [{Constants.DefaultSchema}].AggregatedCounter").Single());
3535
}
3636
}
3737

tests/Hangfire.SqlServer.Tests/ExpirationManagerFacts.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public void Execute_Processes_AggregatedCounterTable()
6767
using (var connection = CreateConnection())
6868
{
6969
// Arrange
70-
const string createSql = @"
71-
insert into HangFire.AggregatedCounter ([Key], [Value], ExpireAt)
70+
var createSql = $@"
71+
insert into [{Constants.DefaultSchema}].AggregatedCounter ([Key], [Value], ExpireAt)
7272
values ('key', 1, @expireAt)";
7373
connection.Execute(createSql, new { expireAt = DateTime.UtcNow.AddMonths(-1) });
7474

@@ -78,7 +78,7 @@ insert into HangFire.AggregatedCounter ([Key], [Value], ExpireAt)
7878
manager.Execute(_cts.Token);
7979

8080
// Assert
81-
Assert.Equal(0, connection.Query<int>(@"select count(*) from HangFire.Counter").Single());
81+
Assert.Equal(0, connection.Query<int>($"select count(*) from [{Constants.DefaultSchema}].Counter").Single());
8282
}
8383
}
8484

@@ -88,8 +88,8 @@ public void Execute_Processes_JobTable()
8888
using (var connection = CreateConnection())
8989
{
9090
// Arrange
91-
const string createSql = @"
92-
insert into HangFire.Job (InvocationData, Arguments, CreatedAt, ExpireAt)
91+
var createSql = $@"
92+
insert into [{Constants.DefaultSchema}].Job (InvocationData, Arguments, CreatedAt, ExpireAt)
9393
values ('', '', getutcdate(), @expireAt)";
9494
connection.Execute(createSql, new { expireAt = DateTime.UtcNow.AddMonths(-1) });
9595

@@ -99,7 +99,7 @@ insert into HangFire.Job (InvocationData, Arguments, CreatedAt, ExpireAt)
9999
manager.Execute(_cts.Token);
100100

101101
// Assert
102-
Assert.Equal(0, connection.Query<int>(@"select count(*) from HangFire.Job").Single());
102+
Assert.Equal(0, connection.Query<int>($"select count(*) from [{Constants.DefaultSchema}].Job").Single());
103103
}
104104
}
105105

@@ -109,8 +109,8 @@ public void Execute_Processes_ListTable()
109109
using (var connection = CreateConnection())
110110
{
111111
// Arrange
112-
const string createSql = @"
113-
insert into HangFire.List ([Key], ExpireAt)
112+
var createSql = $@"
113+
insert into [{Constants.DefaultSchema}].List ([Key], ExpireAt)
114114
values ('key', @expireAt)";
115115
connection.Execute(createSql, new { expireAt = DateTime.UtcNow.AddMonths(-1) });
116116

@@ -120,7 +120,7 @@ insert into HangFire.List ([Key], ExpireAt)
120120
manager.Execute(_cts.Token);
121121

122122
// Assert
123-
Assert.Equal(0, connection.Query<int>(@"select count(*) from HangFire.List").Single());
123+
Assert.Equal(0, connection.Query<int>($"select count(*) from [{Constants.DefaultSchema}].List").Single());
124124
}
125125
}
126126

@@ -130,8 +130,8 @@ public void Execute_Processes_SetTable()
130130
using (var connection = CreateConnection())
131131
{
132132
// Arrange
133-
const string createSql = @"
134-
insert into HangFire.[Set] ([Key], [Score], [Value], ExpireAt)
133+
var createSql = $@"
134+
insert into [{Constants.DefaultSchema}].[Set] ([Key], [Score], [Value], ExpireAt)
135135
values ('key', 0, '', @expireAt)";
136136
connection.Execute(createSql, new { expireAt = DateTime.UtcNow.AddMonths(-1) });
137137

@@ -141,7 +141,7 @@ insert into HangFire.[Set] ([Key], [Score], [Value], ExpireAt)
141141
manager.Execute(_cts.Token);
142142

143143
// Assert
144-
Assert.Equal(0, connection.Query<int>(@"select count(*) from HangFire.[Set]").Single());
144+
Assert.Equal(0, connection.Query<int>($"select count(*) from [{Constants.DefaultSchema}].[Set]").Single());
145145
}
146146
}
147147

@@ -151,8 +151,8 @@ public void Execute_Processes_HashTable()
151151
using (var connection = CreateConnection())
152152
{
153153
// Arrange
154-
const string createSql = @"
155-
insert into HangFire.Hash ([Key], [Field], [Value], ExpireAt)
154+
var createSql = $@"
155+
insert into [{Constants.DefaultSchema}].Hash ([Key], [Field], [Value], ExpireAt)
156156
values ('key', 'field', '', @expireAt)";
157157
connection.Execute(createSql, new { expireAt = DateTime.UtcNow.AddMonths(-1) });
158158

@@ -162,14 +162,14 @@ insert into HangFire.Hash ([Key], [Field], [Value], ExpireAt)
162162
manager.Execute(_cts.Token);
163163

164164
// Assert
165-
Assert.Equal(0, connection.Query<int>(@"select count(*) from HangFire.Hash").Single());
165+
Assert.Equal(0, connection.Query<int>($"select count(*) from [{Constants.DefaultSchema}].Hash").Single());
166166
}
167167
}
168168

169169
private static void CreateExpirationEntry(SqlConnection connection, DateTime? expireAt)
170170
{
171-
const string insertSql = @"
172-
insert into HangFire.AggregatedCounter ([Key], [Value], [ExpireAt])
171+
var insertSql = $@"
172+
insert into [{Constants.DefaultSchema}].AggregatedCounter ([Key], [Value], [ExpireAt])
173173
values (N'key', 1, @expireAt)";
174174

175175
connection.Execute(insertSql, new { expireAt });
@@ -178,7 +178,7 @@ insert into HangFire.AggregatedCounter ([Key], [Value], [ExpireAt])
178178
private static bool IsEntryExpired(SqlConnection connection)
179179
{
180180
var count = connection.Query<int>(
181-
"select count(*) from HangFire.AggregatedCounter where [Key] = N'key'").Single();
181+
$"select count(*) from [{Constants.DefaultSchema}].AggregatedCounter where [Key] = N'key'").Single();
182182
return count == 0;
183183
}
184184

0 commit comments

Comments
 (0)