ensure SQL server tests run only agains SQL server

svn path=/branches/mainsoft/gh1.7/mcs/; revision=59922

11 files changed, 92 insertions, 6 deletions

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
index c86de4650e9..584b2b93619 100755
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
@@ -315,6 +315,11 @@ namespace MonoTests.System.Data.OleDb
 		[Test]
 		public void testBug3965()
 		{
+			// testing only SQLServerr
+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {
+				Log("This test is relevant only for MSSQLServer!");
+				return;
+			}
 			Exception exp=null;
 			BeginCase("Test for bug #3965");
 			OleDbConnection con = new OleDbConnection("Provider=SQLOLEDB.1;Data Source=TESTDIR;User ID=ghuser;Password=ghuser;Persist Security Info=True;Initial Catalog=default_grasshopper_db;Packet Size=4096;Connect Timeout=60");
@@ -488,4 +493,4 @@ namespace MonoTests.System.Data.OleDb
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteReader_.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteReader_.cs
index 6758defde80..eab9d2a315b 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteReader_.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteReader_.cs
@@ -43,10 +43,10 @@ namespace MonoTests.System.Data.SqlClient
 				return;

 			}

 

-			TestCheckSqlStatementThatDeclaresLocalVariableAndUsesIt();

+			DoTestCheckSqlStatementThatDeclaresLocalVariableAndUsesIt();

 		}

 

-		public void TestCheckSqlStatementThatDeclaresLocalVariableAndUsesIt()

+		public void DoTestCheckSqlStatementThatDeclaresLocalVariableAndUsesIt()

 		{

 			SqlConnection conn = new SqlConnection(ConnectedDataProvider.ConnectionStringSQLClient);

 			SqlDataReader rdr=null;

@@ -83,4 +83,4 @@ namespace MonoTests.System.Data.SqlClient
 		}

 

 	}

-}
\ No newline at end of file
+}

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteXmlReader_.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteXmlReader_.cs
index 80395211d06..03207f7d84c 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteXmlReader_.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_ExecuteXmlReader_.cs
@@ -44,6 +44,12 @@ namespace MonoTests.System.Data.SqlClient
 		[Category("NotWorking")]

 		public void run()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			Exception exp = null;

 

 			// Start Sub Test

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_Parameters.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_Parameters.cs
index ae6a87f682b..75f61767e37 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_Parameters.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommand/SqlCommand_Parameters.cs
@@ -44,7 +44,7 @@ namespace MonoTests.System.Data.SqlClient
 			}

 

 			CommandParameterTreatBitAsBoolean();

-			TestparametersBindByNameOnMSSQLServer();

+			DoTestparametersBindByNameOnMSSQLServer();

 		

 		}

 

@@ -95,7 +95,7 @@ namespace MonoTests.System.Data.SqlClient
 		/// <summary>

 		/// Binding parameters in MSSQLServer should be done by parameter name, regardless of their order.

 		/// </summary>

-		public void TestparametersBindByNameOnMSSQLServer()

+		public void DoTestparametersBindByNameOnMSSQLServer()

 		{

 			SqlConnection conn = new SqlConnection(ConnectedDataProvider.ConnectionStringSQLClient);

 			SqlDataReader rdr;

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommandBuilder/SqlCommandBuilder_DeriveParameters_S.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommandBuilder/SqlCommandBuilder_DeriveParameters_S.cs
index 26edce3672e..503cc2e59f9 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommandBuilder/SqlCommandBuilder_DeriveParameters_S.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlCommandBuilder/SqlCommandBuilder_DeriveParameters_S.cs
@@ -39,6 +39,12 @@ namespace MonoTests.System.Data.SqlClient
 		[SetUp]

 		public void setUp()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			if (con == null)

 			{

 				con = new SqlConnection(ConnectedDataProvider.ConnectionStringSQLClient);

@@ -49,6 +55,12 @@ namespace MonoTests.System.Data.SqlClient
 		[TearDown]

 		public void tearDown()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			if (con.State == ConnectionState.Open)

 			{

 				con.Close();

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_BeginTransaction_S.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_BeginTransaction_S.cs
index 4f775281c62..f6c4d6b60c8 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_BeginTransaction_S.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_BeginTransaction_S.cs
@@ -17,6 +17,12 @@ namespace MonoTests.System.Data.SqlClient
 		[SetUp]

 		public void SetUp()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			Exception exp = null;

 			BeginCase("Setup");

 			try

@@ -32,6 +38,12 @@ namespace MonoTests.System.Data.SqlClient
 		[TearDown]

 		public void TearDown()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			if (con != null)

 			{

 				if (con.State == ConnectionState.Open) con.Close();

@@ -66,6 +78,12 @@ namespace MonoTests.System.Data.SqlClient
 		[Test] 

 		public void run()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			Exception exp = null;

 

 			#region		---- Bug 2716 - MSSQL - SqlCommand.Transaction ---- 

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_InfoMessage.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_InfoMessage.cs
index 6079e5d908d..41f9802313a 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_InfoMessage.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_InfoMessage.cs
@@ -41,6 +41,12 @@ namespace MonoTests.System.Data.SqlClient
 		[Category("NotWorking")]

 		public void run()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			Exception exp = null;

 

 			// Start Sub Test

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_StateChange.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_StateChange.cs
index cde4cdc10a6..15312b3ffe3 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_StateChange.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlConnection/SqlConnection_StateChange.cs
@@ -32,6 +32,11 @@ namespace MonoTests.System.Data.SqlClient
 		[Test] 

 		public void run()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

 			

 			Exception exp = null;

 

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_Direction.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_Direction.cs
index 9b5bd175056..d8ead8bf657 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_Direction.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_Direction.cs
@@ -43,6 +43,12 @@ namespace MonoTests.System.Data.SqlClient
 		[TestFixtureSetUp]

 		public void TestSetup()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			BeginCase("Test Setup");

 			SqlConnection con = new SqlConnection(ConnectedDataProvider.ConnectionStringSQLClient);

 			StringBuilder createTestSpBuilder = new StringBuilder();

@@ -79,6 +85,12 @@ namespace MonoTests.System.Data.SqlClient
 		[TestFixtureTearDown()]

 		public void TestTearDown()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			BeginCase("Test Teardown");

 			SqlConnection con = new SqlConnection(ConnectedDataProvider.ConnectionStringSQLClient);

 			StringBuilder createTestSpBuilder = new StringBuilder();

@@ -109,6 +121,12 @@ namespace MonoTests.System.Data.SqlClient
 		[Test]

 		public void TestBug4703()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			try

 			{

 				BeginCase("Test Bug 4703 - DateTime output parameter of stored procedure contains incorrect time ( always 12:00 AM )");

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_ctor_SO.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_ctor_SO.cs
index 51cb250218d..e00f8289f54 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_ctor_SO.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_ctor_SO.cs
@@ -41,6 +41,11 @@ namespace MonoTests.System.Data.SqlClient
 		[Test(Description="Create an SqlParameter with value of type bool (true)")]

 		public void CreateParamWithTypeBoolTrue()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

 			exp = null;

 

 			try

@@ -65,6 +70,11 @@ namespace MonoTests.System.Data.SqlClient
 		[Test(Description="Create an SqlParameter with value of type bool (false)")]

 		public void CreateParamWithTypeBoolFalse()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

 			exp = null;

 

 			try

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_set_DbType_D.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_set_DbType_D.cs
index 834e48a5fe5..caec84bf4d5 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_set_DbType_D.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient.jvm/SqlParameter/SqlParameter_set_DbType_D.cs
@@ -41,6 +41,12 @@ namespace MonoTests.System.Data.SqlClient
 		[Test]

 		public void TestBug4689()

 		{

+			if (ConnectedDataProvider.GetDbType() != DataBaseServer.SQLServer) {

+				//All tests in this class are only for MSSQLServer.

+				Log(string.Format("All tests in this class are only for MSSQLServer and cannot be tested on {0}", ConnectedDataProvider.GetDbType()));

+				return;

+			}

+

 			try

 			{

 				// Every Sub Test must begin with BeginCase