Skip to content

Commit 3d0628f

Browse files
AndrewShepherdoskarb
authored andcommitted
Test case adjustment: Supports connection strings set via connection.connection_string_name property (#517)
1 parent 9b7a5a3 commit 3d0628f

File tree

1 file changed

+28
-2
lines changed
  • src/NHibernate.Test/NHSpecificTest/NH2420

1 file changed

+28
-2
lines changed

src/NHibernate.Test/NHSpecificTest/NH2420/Fixture.cs

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22
using System.Data;
33
using System.Data.Odbc;
44
using System.Data.SqlClient;
5+
using System.Configuration;
56
using System.Transactions;
67
using NHibernate.Dialect;
78
using NHibernate.Driver;
89
using NHibernate.Engine;
910
using NUnit.Framework;
1011

12+
using Environment = NHibernate.Cfg.Environment;
13+
1114
namespace NHibernate.Test.NHSpecificTest.NH2420
1215
{
1316
[TestFixture]
@@ -23,12 +26,35 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
2326
return (dialect is MsSql2005Dialect);
2427
}
2528

29+
private string FetchConnectionStringFromConfiguration()
30+
{
31+
string connectionString;
32+
if (cfg.Properties.TryGetValue(Environment.ConnectionString, out connectionString))
33+
{
34+
Assert.IsNotNullOrEmpty(connectionString);
35+
return connectionString;
36+
}
37+
string connectionStringName;
38+
if (cfg.Properties.TryGetValue(Environment.ConnectionStringName, out connectionStringName))
39+
{
40+
var connectionStringSettings = ConfigurationManager.ConnectionStrings[connectionStringName];
41+
Assert.IsNotNull(connectionStringSettings);
42+
connectionString = connectionStringSettings.ConnectionString;
43+
Assert.IsNotNullOrEmpty(connectionString);
44+
return connectionString;
45+
}
46+
else
47+
{
48+
Assert.Fail("Unable to find a connection string or connection string name");
49+
return string.Empty;
50+
}
51+
}
52+
2653
[Test]
2754
public void ShouldBeAbleToReleaseSuppliedConnectionAfterDistributedTransaction()
2855
{
29-
string connectionString = cfg.GetProperty("connection.connection_string");
56+
string connectionString = FetchConnectionStringFromConfiguration();
3057
ISession s;
31-
3258
using (var ts = new TransactionScope())
3359
{
3460
// Enlisting DummyEnlistment as a durable resource manager will start

0 commit comments

Comments
 (0)