New test.

[mono.git] / mcs / class / Npgsql / Test / ConnectionTests.cs

diff --git a/mcs/class/Npgsql/Test/ConnectionTests.cs b/mcs/class/Npgsql/Test/ConnectionTests.cs
old mode 100755 (executable)
new mode 100644 (file)
index b39fe68..eff6537
--- a/mcs/class/Npgsql/Test/ConnectionTests.cs
+++ b/mcs/class/Npgsql/Test/ConnectionTests.cs
@@ -35,8 +35,7 @@ namespace NpgsqlTests
        [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 @@ namespace NpgsqlTests
                        //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();
                }
                
                
@@ -59,7 +59,7 @@ namespace NpgsqlTests
                {
                        try{
                                _conn.Open();
-                               //Assertion.AssertEquals("ConnectionOpen", ConnectionState.Open, _conn.State);
+                               //Assert.AreEqual("ConnectionOpen", ConnectionState.Open, _conn.State);
                        } catch (Exception e)
                        {
                                Console.WriteLine(e.ToString());
@@ -79,7 +79,7 @@ namespace NpgsqlTests
                        
                        String result = (String)command.ExecuteScalar();
                        
-                       Assertion.AssertEquals("template1", result);
+                       Assert.AreEqual("template1", result);
                                
                }