Connector/NET commit: r863 - branches/5.1/TestSuite/Source

[rburnett]

Modified:
   branches/5.1/TestSuite/Source/CultureTests.cs
   branches/5.1/TestSuite/Source/CursorTests.cs
   branches/5.1/TestSuite/Source/GetSchemaTests.cs
   branches/5.1/TestSuite/Source/MicroPerfTests.cs
   branches/5.1/TestSuite/Source/PreparedStatements.cs
Log:
cleaning up some syntax issues

Modified: branches/5.1/TestSuite/Source/CultureTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/CultureTests.cs	2007-08-10 21:31:02 UTC (rev 862)
+++ branches/5.1/TestSuite/Source/CultureTests.cs	2007-08-10 21:31:37 UTC (rev 863)
@@ -37,6 +37,8 @@
             execSQL("CREATE TABLE Test (id INT NOT NULL, name VARCHAR(250), PRIMARY
KEY(id))");
         }
 
+#if !CF
+
 		[Test]
 		public void TestFloats() 
 		{
@@ -158,5 +160,6 @@
             Thread.CurrentThread.CurrentCulture = curCulture;
             Thread.CurrentThread.CurrentUICulture = curUICulture;
         }
+#endif
     }
 }

Modified: branches/5.1/TestSuite/Source/CursorTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/CursorTests.cs	2007-08-10 21:31:02 UTC (rev 862)
+++ branches/5.1/TestSuite/Source/CursorTests.cs	2007-08-10 21:31:37 UTC (rev 863)
@@ -32,7 +32,7 @@
 	[TestFixture]
 	public class CursorTests : BaseTest
 	{
-		protected override void TestFixtureSetUp()
+		protected override void FixtureSetup()
 		{
 			Open();
 

Modified: branches/5.1/TestSuite/Source/GetSchemaTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/GetSchemaTests.cs	2007-08-10 21:31:02 UTC (rev 862)
+++ branches/5.1/TestSuite/Source/GetSchemaTests.cs	2007-08-10 21:31:37 UTC (rev 863)
@@ -46,7 +46,7 @@
 			Assert.AreEqual("IndexColumns", dt.Rows[10][0]);
 			Assert.AreEqual("Indexes", dt.Rows[11][0]);
 
-			if (Is50)
+			if (version >= new Version(5, 0))
 			{
 				Assert.AreEqual("Views", dt.Rows[12][0]);
 				Assert.AreEqual("ViewColumns", dt.Rows[13][0]);
@@ -224,10 +224,11 @@
 			Assert.AreEqual("TINYINT", dt.Rows[3]["DATA_TYPE"].ToString().ToUpper());
 		}
 
-		[Category("5.0")]
 		[Test]
 		public void Procedures()
 		{
+			if (version < new Version(5, 0)) return;
+
 			execSQL("DROP PROCEDURE IF EXISTS spTest");
 			execSQL("CREATE PROCEDURE spTest (id int) BEGIN SELECT 1; END");
 
@@ -240,10 +241,11 @@
 			Assert.AreEqual("spTest", dt.Rows[0][3]);
 		}
 
-		[Category("5.0")]
 		[Test]
 		public void Functions()
 		{
+			if (version < new Version(5, 0)) return;
+
 			execSQL("DROP FUNCTION IF EXISTS spFunc");
 			execSQL("CREATE FUNCTION spFunc (id int) RETURNS INT BEGIN RETURN 1; END");
 
@@ -256,10 +258,11 @@
 			Assert.AreEqual("spFunc", dt.Rows[0][3]);
 		}
 
-		[Category("5.0")]
 		[Test]
 		public void ProcedureParameters()
 		{
+			if (version < new Version(5, 0)) return;
+
 			execSQL("DROP PROCEDURE IF EXISTS spTest");
 			execSQL("CREATE PROCEDURE spTest (id int, name varchar(50)) BEGIN SELECT 1; END");
 
@@ -309,10 +312,11 @@
 			Assert.AreEqual("YES", dt.Rows[1]["IS_RESULT"]);
 		}
 
-		[Category("5.0")]
 		[Test]
 		public void Indexes()
 		{
+			if (version < new Version(5, 0)) return;
+
 			execSQL("DROP TABLE IF EXISTS test");
 			execSQL("CREATE TABLE test (id int, PRIMARY KEY(id))");
 			string[] restrictions = new string[4];
@@ -385,10 +389,11 @@
 			Assert.AreEqual(2, dt.Rows[1]["ORDINAL_POSITION"]);
 		}
 
-		[Category("5.0")]
 		[Test]
 		public void Views()
 		{
+			if (version < new Version(5, 0)) return;
+
 			execSQL("DROP VIEW IF EXISTS vw");
 			execSQL("CREATE VIEW vw AS SELECT Now() as theTime");
 
@@ -401,10 +406,11 @@
 			Assert.AreEqual("vw", dt.Rows[0]["TABLE_NAME"]);
 		}
 
-		[Category("5.0")]
 		[Test]
 		public void ViewColumns()
 		{
+			if (version < new Version(5, 0)) return;
+
 			execSQL("DROP VIEW IF EXISTS vw");
 			execSQL("CREATE VIEW vw AS SELECT Now() as theTime");
 
@@ -420,9 +426,10 @@
 		}
 
 		[Test]
-		[Category("5.0")]
 		public void SingleProcedureParameters()
 		{
+			if (version < new Version(5, 0)) return;
+
 			execSQL("DROP PROCEDURE IF EXISTS spTest");
 			execSQL("CREATE PROCEDURE spTest(id int, IN id2 INT(11), " +
 				"INOUT io1 VARCHAR(20), OUT out1 FLOAT) BEGIN END");
@@ -600,10 +607,11 @@
 			Assert.AreEqual("id", row["REFERENCED_COLUMN_NAME"]);
 		}
 
-		[Category("5.0")]
 		[Test]
 		public void Triggers()
 		{
+			if (version < new Version(5, 0)) return;
+
 			try
 			{
 				suExecSQL("DROP TRIGGER trigger1");

Modified: branches/5.1/TestSuite/Source/MicroPerfTests.cs
===================================================================
--- branches/5.1/TestSuite/Source/MicroPerfTests.cs	2007-08-10 21:31:02 UTC (rev 862)
+++ branches/5.1/TestSuite/Source/MicroPerfTests.cs	2007-08-10 21:31:37 UTC (rev 863)
@@ -35,7 +35,6 @@
             execSQL("CREATE TABLE Test (id int NOT NULL, name VARCHAR(100))");
         }
 
-        [Explicit]
         [Test]
         public void Connect1000Times()
         {

Modified: branches/5.1/TestSuite/Source/PreparedStatements.cs
===================================================================
--- branches/5.1/TestSuite/Source/PreparedStatements.cs	2007-08-10 21:31:02 UTC (rev 862)
+++ branches/5.1/TestSuite/Source/PreparedStatements.cs	2007-08-10 21:31:37 UTC (rev 863)
@@ -746,7 +746,6 @@
             }
         }
 
-        [Category("5.0")]
         [Test]
         public void ClosingCommandsProperly()
         {