2010-06-21 Jb Evain <jbevain@novell.com>

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

diff --git a/mcs/class/Npgsql/Test/DataAdapterTests.cs b/mcs/class/Npgsql/Test/DataAdapterTests.cs
old mode 100755 (executable)
new mode 100644 (file)
index 05bc980..31817eb
--- a/mcs/class/Npgsql/Test/DataAdapterTests.cs
+++ b/mcs/class/Npgsql/Test/DataAdapterTests.cs
@@ -39,22 +39,21 @@ namespace NpgsqlTests
        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();
                }
                
@@ -109,12 +108,13 @@ namespace NpgsqlTests
                        NpgsqlDataReader dr2 = new NpgsqlCommand("select * from tableb where field_serial > 4", _conn).ExecuteReader();
                        dr2.Read();
                        
-                       Assertion.AssertEquals(4, dr2[1]);
-                       Assertion.AssertEquals(7.3M, dr2[3]);
                        
+                       Assert.AreEqual(4, dr2[1]);
+                       Assert.AreEqual(7.3000000M, dr2[3]);
                        
                        new NpgsqlCommand("delete from tableb where field_serial > 4", _conn).ExecuteNonQuery();
                        
+                       
                                                
                }
                
@@ -131,12 +131,12 @@ namespace NpgsqlTests
                  
                  da.Fill(ds);
                  
-                 Assertion.AssertEquals(1, ds.Tables.Count);
-                 Assertion.AssertEquals(4, ds.Tables[0].Columns.Count);
-                 Assertion.AssertEquals("field_serial", ds.Tables[0].Columns[0].ColumnName);
-                 Assertion.AssertEquals("field_int2", ds.Tables[0].Columns[1].ColumnName);
-                 Assertion.AssertEquals("field_timestamp", ds.Tables[0].Columns[2].ColumnName);
-                 Assertion.AssertEquals("field_numeric", ds.Tables[0].Columns[3].ColumnName);
+                 Assert.AreEqual(1, ds.Tables.Count);
+                 Assert.AreEqual(4, ds.Tables[0].Columns.Count);
+                 Assert.AreEqual("field_serial", ds.Tables[0].Columns[0].ColumnName);
+                 Assert.AreEqual("field_int2", ds.Tables[0].Columns[1].ColumnName);
+                 Assert.AreEqual("field_timestamp", ds.Tables[0].Columns[2].ColumnName);
+                 Assert.AreEqual("field_numeric", ds.Tables[0].Columns[3].ColumnName);
                  
                }