Skip to content

Commit c4a9422

Browse files
GillesTourreauGillesTourreau
committed
Fix unit tests previously failed.
1 parent 252f246 commit c4a9422

5 files changed

Lines changed: 31 additions & 19 deletions

File tree

‎tests/Testing.Databases.SqlServer.Dac.Tests/SqlServerDatabaseInitializerTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void Test1()
3535
this.initializer.IsInitialized.Should().BeTrue();
3636

3737
var currentUser = this.database.ExecuteQuery("SELECT SUSER_NAME()");
38-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
38+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
3939

4040
// Check the constructor has been called
4141
var table = this.database.ExecuteQuery("SELECT * FROM MyTable");
@@ -58,7 +58,7 @@ public void Test2()
5858
this.initializer.IsInitialized.Should().BeTrue();
5959

6060
var currentUser = this.database.ExecuteQuery("SELECT SUSER_NAME()");
61-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
61+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
6262

6363
// Check the constructor has been called
6464
var table = this.database.ExecuteQuery("SELECT * FROM MyTable");
@@ -81,7 +81,7 @@ public async Task Test1Async()
8181
this.initializer.IsInitialized.Should().BeTrue();
8282

8383
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()");
84-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
84+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
8585

8686
// Check the constructor has been called
8787
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable");
@@ -104,7 +104,7 @@ public async Task Test2Async()
104104
this.initializer.IsInitialized.Should().BeTrue();
105105

106106
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()");
107-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
107+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
108108

109109
// Check the constructor has been called
110110
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable");

‎tests/Testing.Databases.SqlServer.EntityFramework.Tests/EntityFrameworkDatabaseInitializerExtensionsTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public EntityFrameworkDatabaseInitializerExtensionsTest(SqlServerDatabaseInitial
3636
public void Test1()
3737
{
3838
var currentUser = this.database.ExecuteQuery("SELECT SUSER_NAME()");
39-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
39+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
4040

4141
// Check the constructor has been called
4242
var table = this.database.ExecuteQuery("SELECT * FROM MyTable");
@@ -57,7 +57,7 @@ public void Test1()
5757
public void Test2()
5858
{
5959
var currentUser = this.database.ExecuteQuery("SELECT SUSER_NAME()");
60-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
60+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
6161

6262
// Check the constructor has been called
6363
var table = this.database.ExecuteQuery("SELECT * FROM MyTable");

‎tests/Testing.Databases.SqlServer.Shared.Tests/ConnectionStrings.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,17 @@ public static string Get(string databaseName = "master")
2626

2727
return connectionStringBuilder.ToString();
2828
}
29+
30+
public static string ExtractUserName(string connectionString)
31+
{
32+
var connectionStringBuilder = new SqlConnectionStringBuilder(connectionString);
33+
34+
if (connectionStringBuilder.IntegratedSecurity == true)
35+
{
36+
return $"{Environment.UserDomainName}\\{Environment.UserName}";
37+
}
38+
39+
return connectionStringBuilder.UserID;
40+
}
2941
}
3042
}

‎tests/Testing.Databases.SqlServer.SqlCmd.Tests/SqlCmdDatabaseInitializerTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void Test1()
4444
this.initializer.IsInitialized.Should().BeTrue();
4545

4646
var currentUser = this.database.ExecuteQuery("SELECT SUSER_NAME()");
47-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
47+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
4848

4949
// Check the constructor has been called
5050
var table = this.database.ExecuteQuery("SELECT * FROM MyTable");
@@ -67,7 +67,7 @@ public void Test2()
6767
this.initializer.IsInitialized.Should().BeTrue();
6868

6969
var currentUser = this.database.ExecuteQuery("SELECT SUSER_NAME()");
70-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
70+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
7171

7272
// Check the constructor has been called
7373
var table = this.database.ExecuteQuery("SELECT * FROM MyTable");
@@ -113,7 +113,7 @@ public async Task Test2Async()
113113
this.initializer.IsInitialized.Should().BeTrue();
114114

115115
var currentUser = await this.database.ExecuteQueryAsync("SELECT SUSER_NAME()");
116-
currentUser.Rows[0][0].Should().Be($"{Environment.UserDomainName}\\{Environment.UserName}");
116+
currentUser.Rows[0][0].Should().Be(ConnectionStrings.ExtractUserName(ConnectionString));
117117

118118
// Check the constructor has been called
119119
var table = await this.database.ExecuteQueryAsync("SELECT * FROM MyTable");

‎tests/Testing.Databases.SqlServer.Tests/SqlServerDatabaseComparerTest.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ public async Task CompareAsync()
4040
differences.StoredProcedures[0].Target.Schema.Should().Be("dbo");
4141
differences.StoredProcedures[0].Properties.Should().HaveCount(1);
4242
differences.StoredProcedures[0].Properties[0].Name.Should().Be("Code");
43-
differences.StoredProcedures[0].Properties[0].Source.Should().Be("CREATE PROCEDURE [dbo].[StoredProcedureDifference]\r\n\t@param1 int = 0,\r\n\t@param2 int\r\nAS\r\n\tSELECT @param2\r\nRETURN 0\r\n");
44-
differences.StoredProcedures[0].Properties[0].Target.Should().Be("CREATE PROCEDURE [dbo].[StoredProcedureDifference]\r\n\t@param1 int = 0,\r\n\t@param2 int\r\nAS\r\n\tSELECT @param1\r\nRETURN 0\r\n");
43+
differences.StoredProcedures[0].Properties[0].Source.Should().Be($"CREATE PROCEDURE [dbo].[StoredProcedureDifference]{Environment.NewLine}\t@param1 int = 0,{Environment.NewLine}\t@param2 int{Environment.NewLine}AS{Environment.NewLine}\tSELECT @param2{Environment.NewLine}RETURN 0{Environment.NewLine}");
44+
differences.StoredProcedures[0].Properties[0].Target.Should().Be($"CREATE PROCEDURE [dbo].[StoredProcedureDifference]{Environment.NewLine}\t@param1 int = 0,{Environment.NewLine}\t@param2 int{Environment.NewLine}AS{Environment.NewLine}\tSELECT @param1{Environment.NewLine}RETURN 0{Environment.NewLine}");
4545

4646
differences.StoredProcedures[1].Source.Should().BeNull();
4747
differences.StoredProcedures[1].Target.Name.Should().Be("StoredProcedureTarget");
@@ -697,13 +697,13 @@ public async Task CompareAsync()
697697
differences.Tables[0].Source.Triggers.Should().HaveCount(1);
698698

699699
differences.Tables[0].Source.Triggers[0].Name.Should().Be("TriggerDifference");
700-
differences.Tables[0].Source.Triggers[0].Code.Should().Be("CREATE TRIGGER [TriggerDifference]\r\n\tON [dbo].[TableDifference]\r\n\tINSTEAD OF INSERT\r\n\tAS\r\n\tBEGIN\r\n\t\tPRINT 'From source'\r\n\tEND\r\n");
700+
differences.Tables[0].Source.Triggers[0].Code.Should().Be($"CREATE TRIGGER [TriggerDifference]{Environment.NewLine}\tON [dbo].[TableDifference]{Environment.NewLine}\tINSTEAD OF INSERT{Environment.NewLine}\tAS{Environment.NewLine}\tBEGIN{Environment.NewLine}\t\tPRINT 'From source'{Environment.NewLine}\tEND{Environment.NewLine}");
701701
differences.Tables[0].Source.Triggers[0].IsInsteadOfTrigger.Should().BeTrue();
702702

703703
differences.Tables[0].Target.Triggers.Should().HaveCount(1);
704704

705705
differences.Tables[0].Target.Triggers[0].Name.Should().Be("TriggerDifference");
706-
differences.Tables[0].Target.Triggers[0].Code.Should().Be("CREATE TRIGGER [TriggerDifference]\r\n\tON [dbo].[TableDifference]\r\n\tFOR INSERT\r\n\tAS\r\n\tBEGIN\r\n\t\tPRINT 'From target'\r\n\tEND\r\n");
706+
differences.Tables[0].Target.Triggers[0].Code.Should().Be($"CREATE TRIGGER [TriggerDifference]{Environment.NewLine}\tON [dbo].[TableDifference]{Environment.NewLine}\tFOR INSERT{Environment.NewLine}\tAS{Environment.NewLine}\tBEGIN{Environment.NewLine}\t\tPRINT 'From target'{Environment.NewLine}\tEND{Environment.NewLine}");
707707
differences.Tables[0].Target.Triggers[0].IsInsteadOfTrigger.Should().BeFalse();
708708

709709
differences.Tables[0].Triggers.Should().HaveCount(1);
@@ -712,8 +712,8 @@ public async Task CompareAsync()
712712
differences.Tables[0].Triggers[0].Properties[0].Source.Should().Be(true);
713713
differences.Tables[0].Triggers[0].Properties[0].Target.Should().Be(false);
714714
differences.Tables[0].Triggers[0].Properties[1].Name.Should().Be("Code");
715-
differences.Tables[0].Triggers[0].Properties[1].Source.Should().Be("CREATE TRIGGER [TriggerDifference]\r\n\tON [dbo].[TableDifference]\r\n\tINSTEAD OF INSERT\r\n\tAS\r\n\tBEGIN\r\n\t\tPRINT 'From source'\r\n\tEND\r\n");
716-
differences.Tables[0].Triggers[0].Properties[1].Target.Should().Be("CREATE TRIGGER [TriggerDifference]\r\n\tON [dbo].[TableDifference]\r\n\tFOR INSERT\r\n\tAS\r\n\tBEGIN\r\n\t\tPRINT 'From target'\r\n\tEND\r\n");
715+
differences.Tables[0].Triggers[0].Properties[1].Source.Should().Be($"CREATE TRIGGER [TriggerDifference]{Environment.NewLine}\tON [dbo].[TableDifference]{Environment.NewLine}\tINSTEAD OF INSERT{Environment.NewLine}\tAS{Environment.NewLine}\tBEGIN{Environment.NewLine}\t\tPRINT 'From source'{Environment.NewLine}\tEND{Environment.NewLine}");
716+
differences.Tables[0].Triggers[0].Properties[1].Target.Should().Be($"CREATE TRIGGER [TriggerDifference]{Environment.NewLine}\tON [dbo].[TableDifference]{Environment.NewLine}\tFOR INSERT{Environment.NewLine}\tAS{Environment.NewLine}\tBEGIN{Environment.NewLine}\t\tPRINT 'From target'{Environment.NewLine}\tEND{Environment.NewLine}");
717717
differences.Tables[0].Triggers[0].Source.Should().BeSameAs(differences.Tables[0].Source.Triggers[0]);
718718
differences.Tables[0].Triggers[0].Target.Should().BeSameAs(differences.Tables[0].Target.Triggers[0]);
719719
differences.Tables[0].Triggers[0].Type.Should().Be(SqlObjectDifferenceType.Different);
@@ -827,7 +827,7 @@ public async Task CompareAsync()
827827
differences.Tables[1].Target.Schema.Should().Be("dbo");
828828
differences.Tables[1].Target.Triggers.Should().HaveCount(1);
829829
differences.Tables[1].Target.Triggers[0].Name.Should().Be("TriggerTarget");
830-
differences.Tables[1].Target.Triggers[0].Code.Should().Be("CREATE TRIGGER [TriggerTarget]\r\n\tON [dbo].[TableTarget]\r\n\tFOR DELETE, INSERT, UPDATE\r\n\tAS\r\n\tBEGIN\r\n\t\tSET NOCOUNT ON\r\n\tEND\r\n");
830+
differences.Tables[1].Target.Triggers[0].Code.Should().Be($"CREATE TRIGGER [TriggerTarget]{Environment.NewLine}\tON [dbo].[TableTarget]{Environment.NewLine}\tFOR DELETE, INSERT, UPDATE{Environment.NewLine}\tAS{Environment.NewLine}\tBEGIN{Environment.NewLine}\t\tSET NOCOUNT ON{Environment.NewLine}\tEND{Environment.NewLine}");
831831
differences.Tables[1].Target.Triggers[0].IsInsteadOfTrigger.Should().BeFalse();
832832
differences.Tables[1].Target.UniqueConstraints.Should().HaveCount(1);
833833
differences.Tables[1].Target.UniqueConstraints[0].Columns.Should().HaveCount(1);
@@ -1047,7 +1047,7 @@ public async Task CompareAsync()
10471047
differences.Tables[4].Source.PrimaryKey.Type.Should().Be("CLUSTERED");
10481048
differences.Tables[4].Source.Triggers.Should().HaveCount(1);
10491049
differences.Tables[4].Source.Triggers[0].Name.Should().Be("TriggerSource");
1050-
differences.Tables[4].Source.Triggers[0].Code.Should().Be("CREATE TRIGGER [TriggerSource]\r\n\tON [dbo].[TableSource]\r\n\tFOR DELETE, INSERT, UPDATE\r\n\tAS\r\n\tBEGIN\r\n\t\tSET NOCOUNT ON\r\n\tEND\r\n");
1050+
differences.Tables[4].Source.Triggers[0].Code.Should().Be($"CREATE TRIGGER [TriggerSource]{Environment.NewLine}\tON [dbo].[TableSource]{Environment.NewLine}\tFOR DELETE, INSERT, UPDATE{Environment.NewLine}\tAS{Environment.NewLine}\tBEGIN{Environment.NewLine}\t\tSET NOCOUNT ON{Environment.NewLine}\tEND{Environment.NewLine}");
10511051
differences.Tables[4].Source.Triggers[0].IsInsteadOfTrigger.Should().BeFalse();
10521052
differences.Tables[4].Source.UniqueConstraints.Should().HaveCount(1);
10531053
differences.Tables[4].Source.UniqueConstraints[0].Columns.Should().HaveCount(1);
@@ -1092,8 +1092,8 @@ public async Task CompareAsync()
10921092
differences.Views[0].Target.Schema.Should().Be("dbo");
10931093
differences.Views[0].Properties.Should().HaveCount(1);
10941094
differences.Views[0].Properties[0].Name.Should().Be("Code");
1095-
differences.Views[0].Properties[0].Source.Should().Be("CREATE VIEW [dbo].[ViewDifference]\r\n\tAS SELECT * FROM [TableDifference] WHERE [Type] = 10\r\n");
1096-
differences.Views[0].Properties[0].Target.Should().Be("CREATE VIEW [dbo].[ViewDifference]\r\n\tAS SELECT * FROM [TableDifference] WHERE [Type] = 'The type'\r\n");
1095+
differences.Views[0].Properties[0].Source.Should().Be($"CREATE VIEW [dbo].[ViewDifference]{Environment.NewLine}\tAS SELECT * FROM [TableDifference] WHERE [Type] = 10{Environment.NewLine}");
1096+
differences.Views[0].Properties[0].Target.Should().Be($"CREATE VIEW [dbo].[ViewDifference]{Environment.NewLine}\tAS SELECT * FROM [TableDifference] WHERE [Type] = 'The type'{Environment.NewLine}");
10971097

10981098
differences.Views[1].Source.Should().BeNull();
10991099
differences.Views[1].Target.Name.Should().Be("ViewTarget");

0 commit comments

Comments
 (0)