Skip to content

Commit 069a200

Browse files
Fix unit tests previously failed.
1 parent ee26a2c commit 069a200

4 files changed

Lines changed: 9 additions & 4 deletions

File tree

src/Testing.Databases.SqlServer/SqlServer.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,12 @@ private static string BuildCreateDatabaseSqlCommand(string name, SqlDatabaseCrea
114114
{
115115
if (!string.IsNullOrEmpty(settings.DataFileName))
116116
{
117+
var logFileName = Path.Combine(
118+
Path.GetDirectoryName(settings.DataFileName),
119+
$"{Path.GetFileNameWithoutExtension(settings.DataFileName)}_log.ldf");
120+
117121
sql.Append($"ON (NAME = '{name}', FILENAME = '{settings.DataFileName}')");
122+
sql.Append($"LOG ON (NAME = '{name}_log', FILENAME = '{logFileName}')");
118123
}
119124
}
120125

tests/Testing.Databases.SqlServer.Dac.Tests/SqlServerDacExtensionsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void DeployDacPackage_WithSpecificDataFileName()
7676
result.Rows[0]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileName.mdf"));
7777
result.Rows[0]["type_desc"].Should().Be("ROWS");
7878

79-
result.Rows[1]["name"].Should().Be("TheSpecificDataFileName_log");
79+
result.Rows[1]["name"].Should().Be("SqlServerDacExtensionsTest_DeployDacPackage_WithSpecificDataFileName_log");
8080
result.Rows[1]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileName_log.ldf"));
8181
result.Rows[1]["type_desc"].Should().Be("LOG");
8282

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void Initialize_WithSpecificDataFileName()
160160
result.Rows[0]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileName.mdf"));
161161
result.Rows[0]["type_desc"].Should().Be("ROWS");
162162

163-
result.Rows[1]["name"].Should().Be("TheSpecificDataFileName_log");
163+
result.Rows[1]["name"].Should().Be("SqlServerDatabaseInitializerTest_Initialize_WithSpecificDataFileName_log");
164164
result.Rows[1]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileName_log.ldf"));
165165
result.Rows[1]["type_desc"].Should().Be("LOG");
166166

tests/Testing.Databases.SqlServer.Tests/SqlServerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public async Task CreateAndDelete_WithSpecificDataFileName()
8181
result.Rows[0]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileName.mdf"));
8282
result.Rows[0]["type_desc"].Should().Be("ROWS");
8383

84-
result.Rows[1]["name"].Should().Be("TheSpecificDataFileName_log");
84+
result.Rows[1]["name"].Should().Be("CreateAndDeleteDB_WithSpecificDataFileName_log");
8585
result.Rows[1]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileName_log.ldf"));
8686
result.Rows[1]["type_desc"].Should().Be("LOG");
8787

@@ -142,7 +142,7 @@ public async Task CreateAndDeleteAsync_WithSpecificDataFileName()
142142
result.Rows[0]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileNameAsync.mdf"));
143143
result.Rows[0]["type_desc"].Should().Be("ROWS");
144144

145-
result.Rows[1]["name"].Should().Be("TheSpecificDataFileNameAsync_log");
145+
result.Rows[1]["name"].Should().Be("CreateAndDeleteDB_WithSpecificDataFileNameAsync_log");
146146
result.Rows[1]["physical_name"].Should().Be(Path.Combine(otherDataPath.Path, "TheSpecificDataFileNameAsync_log.ldf"));
147147
result.Rows[1]["type_desc"].Should().Be("LOG");
148148

0 commit comments

Comments
 (0)