Author: benm
Date: 2005-06-27 15:28:24 -0400 (Mon, 27 Jun 2005)
New Revision: 46593
Modified:
trunk/mcs/class/Npgsql/Npgsql_test.dll.sources
trunk/mcs/class/Npgsql/Test/CommandTests.cs
trunk/mcs/class/Npgsql/Test/ConnectionTests.cs
trunk/mcs/class/Npgsql/Test/DataAdapterTests.cs
trunk/mcs/class/Npgsql/Test/DataReaderTests.cs
Log:
use test configuration thingy
Modified: trunk/mcs/class/Npgsql/Npgsql_test.dll.sources
===================================================================
--- trunk/mcs/class/Npgsql/Npgsql_test.dll.sources 2005-06-27 19:28:10 UTC
(rev 46592)
+++ trunk/mcs/class/Npgsql/Npgsql_test.dll.sources 2005-06-27 19:28:24 UTC
(rev 46593)
@@ -2,3 +2,4 @@
ConnectionTests.cs
DataAdapterTests.cs
DataReaderTests.cs
+../../../build/common/TestConfiguration.cs
Modified: trunk/mcs/class/Npgsql/Test/CommandTests.cs
===================================================================
--- trunk/mcs/class/Npgsql/Test/CommandTests.cs 2005-06-27 19:28:10 UTC (rev
46592)
+++ trunk/mcs/class/Npgsql/Test/CommandTests.cs 2005-06-27 19:28:24 UTC (rev
46593)
@@ -32,12 +32,10 @@
namespace NpgsqlTests
{
-
[TestFixture]
public class CommandTests
{
- private NpgsqlConnection _conn = null;
- private String
_connString = "Server=localhost;User
ID=npgsql_tests;Password=npgsql_tests;Database=npgsql_tests;maxpoolsize=2";
+ NpgsqlConnection _conn = null;
[SetUp]
protected void SetUp()
@@ -45,13 +43,13 @@
//NpgsqlEventLog.Level = LogLevel.None;
//NpgsqlEventLog.Level = LogLevel.Debug;
//NpgsqlEventLog.LogName = "NpgsqlTests.LogFile";
- _conn = new NpgsqlConnection(_connString);
+ _conn = new NpgsqlConnection
(TestConfiguration.NpgsqlConnectionString);
}
[TearDown]
protected void TearDown()
{
- if (_conn.State != ConnectionState.Closed)
+ if (_conn != null && _conn.State !=
ConnectionState.Closed)
_conn.Close();
}
Modified: trunk/mcs/class/Npgsql/Test/ConnectionTests.cs
===================================================================
--- trunk/mcs/class/Npgsql/Test/ConnectionTests.cs 2005-06-27 19:28:10 UTC
(rev 46592)
+++ trunk/mcs/class/Npgsql/Test/ConnectionTests.cs 2005-06-27 19:28:24 UTC
(rev 46593)
@@ -35,8 +35,7 @@
[TestFixture]
public class ConnectionTests
{
- private NpgsqlConnection _conn = null;
- private String
_connString = "Server=localhost;User
ID=npgsql_tests;Password=npgsql_tests;Database=npgsql_tests;maxpoolsize=2;";
+ NpgsqlConnection _conn;
[SetUp]
protected void SetUp()
@@ -44,13 +43,14 @@
//NpgsqlEventLog.Level = LogLevel.None;
//NpgsqlEventLog.Level = LogLevel.Debug;
//NpgsqlEventLog.LogName = "NpgsqlTests.LogFile";
- _conn = new NpgsqlConnection(_connString);
+ _conn = new NpgsqlConnection
(TestConfiguration.NpgsqlConnectionString);
}
[TearDown]
protected void TearDown()
{
- _conn.Close();
+ if (_conn != null)
+ _conn.Close();
}
Modified: trunk/mcs/class/Npgsql/Test/DataAdapterTests.cs
===================================================================
--- trunk/mcs/class/Npgsql/Test/DataAdapterTests.cs 2005-06-27 19:28:10 UTC
(rev 46592)
+++ trunk/mcs/class/Npgsql/Test/DataAdapterTests.cs 2005-06-27 19:28:24 UTC
(rev 46593)
@@ -39,22 +39,21 @@
public class DataAdapterTests
{
- private NpgsqlConnection _conn = null;
- private String
_connString = "Server=localhost;User
ID=npgsql_tests;Password=npgsql_tests;Database=npgsql_tests;maxpoolsize=2;";
-
+ NpgsqlConnection _conn;
+
[SetUp]
protected void SetUp()
{
//NpgsqlEventLog.Level = LogLevel.None;
//NpgsqlEventLog.Level = LogLevel.Debug;
//NpgsqlEventLog.LogName = "NpgsqlTests.LogFile";
- _conn = new NpgsqlConnection(_connString);
+ _conn = new
NpgsqlConnection(TestConfiguration.NpgsqlConnectionString);
}
[TearDown]
protected void TearDown()
{
- if (_conn.State != ConnectionState.Closed)
+ if (_conn != null && _conn.State !=
ConnectionState.Closed)
_conn.Close();
}
Modified: trunk/mcs/class/Npgsql/Test/DataReaderTests.cs
===================================================================
--- trunk/mcs/class/Npgsql/Test/DataReaderTests.cs 2005-06-27 19:28:10 UTC
(rev 46592)
+++ trunk/mcs/class/Npgsql/Test/DataReaderTests.cs 2005-06-27 19:28:24 UTC
(rev 46593)
@@ -36,8 +36,7 @@
public class DataReaderTests
{
- private NpgsqlConnection _conn = null;
- private String
_connString = "Server=localhost;User
ID=npgsql_tests;Password=npgsql_tests;Database=npgsql_tests;maxpoolsize=2;";
+ NpgsqlConnection _conn;
[SetUp]
protected void SetUp()
@@ -45,13 +44,13 @@
//NpgsqlEventLog.Level = LogLevel.None;
//NpgsqlEventLog.Level = LogLevel.Debug;
//NpgsqlEventLog.LogName = "NpgsqlTests.LogFile";
- _conn = new NpgsqlConnection(_connString);
+ _conn = new NpgsqlConnection
(TestConfiguration.NpgsqlConnectionString);
}
[TearDown]
protected void TearDown()
{
- if (_conn.State != ConnectionState.Closed)
+ if (_conn != null &&_conn.State !=
ConnectionState.Closed)
_conn.Close();
}
@@ -405,7 +404,7 @@
_conn.Open();
- NpgsqlDataAdapter da = new NpgsqlDataAdapter("select *
from tablea", _connString);
+ NpgsqlDataAdapter da = new NpgsqlDataAdapter("select *
from tablea", TestConfiguration.NpgsqlConnectionString);
DataSet ds = new DataSet();
@@ -423,7 +422,7 @@
_conn.Open();
- NpgsqlDataAdapter da = new NpgsqlDataAdapter("select *
from tableb", _connString);
+ NpgsqlDataAdapter da = new NpgsqlDataAdapter("select *
from tableb", TestConfiguration.NpgsqlConnectionString);
DataSet ds = new DataSet();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
