Author: anagappan
Date: 2007-10-19 07:49:41 -0400 (Fri, 19 Oct 2007)
New Revision: 87822
Modified:
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs
Log:
2007-10-19 Nagappan A <[EMAIL PROTECTED]>
* SqlCommandBuilderTest.cs: Fixed compilation warnings.
Modified:
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
===================================================================
---
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
2007-10-19 11:24:21 UTC (rev 87821)
+++
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
2007-10-19 11:49:41 UTC (rev 87822)
@@ -1,3 +1,7 @@
+2007-10-19 Nagappan A <[EMAIL PROTECTED]>
+
+ * SqlCommandBuilderTest.cs: Fixed compilation warnings.
+
2007-07-31 Nagappan A <[EMAIL PROTECTED]>
* SqlConnectionTest.cs (InterfaceTransactionTest): Fixes bug
Modified:
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs
===================================================================
---
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs
2007-10-19 11:24:21 UTC (rev 87821)
+++
trunk/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlCommandBuilderTest.cs
2007-10-19 11:49:41 UTC (rev 87822)
@@ -250,9 +250,9 @@
[Test]
public void GetUpdateDeleteCommandBoolTest_CheckParameters ()
{
- IDbConnection conn =
ConnectionManager.Singleton.Connection;
try {
ConnectionManager.Singleton.OpenConnection ();
+ IDbConnection conn =
ConnectionManager.Singleton.Connection;
SqlDataAdapter adapter = new SqlDataAdapter
("select id, type_varchar from string_family",
(SqlConnection)conn);
SqlCommandBuilder cb = new SqlCommandBuilder
(adapter);
@@ -276,9 +276,9 @@
[ExpectedException (typeof (DBConcurrencyException))]
public void GetUpdateCommandDBConcurrencyExceptionTest ()
{
- IDbConnection conn =
ConnectionManager.Singleton.Connection;
try {
ConnectionManager.Singleton.OpenConnection ();
+ IDbConnection conn =
ConnectionManager.Singleton.Connection;
string selectQuery = "select id, fname from
employee where id = 1";
SqlDataAdapter da = new SqlDataAdapter
(selectQuery, (SqlConnection) conn);
DataSet ds = new DataSet ();
@@ -300,9 +300,9 @@
[ExpectedException (typeof (DBConcurrencyException))]
public void GetDeleteCommandDBConcurrencyExceptionTest ()
{
- IDbConnection conn =
ConnectionManager.Singleton.Connection;
try {
ConnectionManager.Singleton.OpenConnection ();
+ IDbConnection conn =
ConnectionManager.Singleton.Connection;
string selectQuery = "select id, fname from
employee where id = 1";
SqlDataAdapter da = new SqlDataAdapter
(selectQuery, (SqlConnection) conn);
DataSet ds = new DataSet ();
@@ -323,9 +323,9 @@
[Test]
public void GetDeleteCommandTest ()
{
- IDbConnection conn =
ConnectionManager.Singleton.Connection;
try {
ConnectionManager.Singleton.OpenConnection ();
+ IDbConnection conn =
ConnectionManager.Singleton.Connection;
string selectQuery = "select id, fname, lname,
id+1 as next_id from employee where id = 1";
SqlDataAdapter da = new SqlDataAdapter
(selectQuery, (SqlConnection) conn);
DataSet ds = new DataSet ();
@@ -349,36 +349,30 @@
[Test]
public void DefaultPropertiesTest ()
{
- SqlCommandBuilder cb = new SqlCommandBuilder ();
-#if NET_1_0
- Assert.AreEqual
(ConflictOption.CompareAllSearchableValues, cb.ConflictDetection);
- Assert.AreEqual ("", cb.QuotePrefix, "#5");
- Assert.AreEqual ("", cb.QuoteSuffix, "#6");
-#endif
-#if NET_2_0
- Assert.AreEqual ("[", cb.QuotePrefix, "#5");
- Assert.AreEqual ("]", cb.QuoteSuffix, "#6");
- Assert.AreEqual (".", cb.CatalogSeparator, "#2");
- //Assert.AreEqual ("", cb.DecimalSeparator, "#3");
- Assert.AreEqual (".", cb.SchemaSeparator, "#4");
- Assert.AreEqual (CatalogLocation.Start,
cb.CatalogLocation, "#1");
- IDbConnection conn =
ConnectionManager.Singleton.Connection;
try {
- conn.Open ();
- cb = new SqlCommandBuilder ();
+ ConnectionManager.Singleton.OpenConnection ();
+ //IDbConnection conn =
ConnectionManager.Singleton.Connection;
+ SqlCommandBuilder cb = new SqlCommandBuilder ();
#if NET_2_0
+ Assert.AreEqual ("[", cb.QuotePrefix, "#5");
+ Assert.AreEqual ("]", cb.QuoteSuffix, "#6");
+ Assert.AreEqual (".", cb.CatalogSeparator,
"#2");
+ //Assert.AreEqual ("", cb.DecimalSeparator,
"#3");
+ Assert.AreEqual (".", cb.SchemaSeparator, "#4");
+ Assert.AreEqual (CatalogLocation.Start,
cb.CatalogLocation, "#1");
Assert.AreEqual ("[monotest]",
cb.QuoteIdentifier ("monotest"), "#7");
Assert.AreEqual ("\"monotest\"",
cb.UnquoteIdentifier ("\"monotest\""), "#8");
+ //Assert.AreEqual
(cb.ConflictOption.CompareAllSearchableValues, cb.ConflictDetection);
#else
- Assert.AreEqual ("\"monotest\"",
cb.QuoteIdentifier ("monotest"), "#7");
- Assert.AreEqual ("monotest",
cb.UnquoteIdentifier ("\"monotest\""), "#8");
+ Assert.AreEqual ("", cb.QuotePrefix, "#5");
+ Assert.AreEqual ("", cb.QuoteSuffix, "#6");
+ //Assert.AreEqual ("\"monotest\"",
cb.QuoteIdentifier ("monotest"), "#7");
+ //Assert.AreEqual ("monotest",
cb.UnquoteIdentifier ("\"monotest\""), "#8");
#endif
- conn.Close ();
} finally {
ConnectionManager.Singleton.CloseConnection ();
}
// FIXME: test SetAllValues
-#endif // NET_2_0
}
// FIXME: Add tests for examining RowError
@@ -387,7 +381,9 @@
[Test]
public void CheckParameters_BuiltCommand ()
{
- using (IDbConnection conn =
ConnectionManager.Singleton.Connection) {
+ try {
+ ConnectionManager.Singleton.OpenConnection ();
+ IDbConnection conn =
ConnectionManager.Singleton.Connection;
SqlDataAdapter adapter = new SqlDataAdapter
("select id,type_varchar from string_family", (SqlConnection)conn);
SqlCommandBuilder cb = new
SqlCommandBuilder(adapter);
DataSet ds = new DataSet ();
@@ -409,6 +405,9 @@
Assert.AreEqual (2,
cb.GetInsertCommand().Parameters.Count, "#3");
}
+ finally {
+ ConnectionManager.Singleton.CloseConnection ();
+ }
}
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
