Modified:
trunk/TestSuite/MySql.Data.Tests.csproj
trunk/TestSuite/Source/AsyncTests.cs
trunk/TestSuite/Source/BaseTest.cs
trunk/TestSuite/Source/BlobTests.cs
trunk/TestSuite/Source/CharacterSetTests.cs
trunk/TestSuite/Source/CommandBuilderTests.cs
trunk/TestSuite/Source/CommandTests.cs
trunk/TestSuite/Source/ConnectionStringBuilder.cs
trunk/TestSuite/Source/ConnectionTests.cs
trunk/TestSuite/Source/CultureTests.cs
trunk/TestSuite/Source/DataAdapterTests.cs
trunk/TestSuite/Source/DataReaderTests.cs
trunk/TestSuite/Source/DataTypeTests.cs
trunk/TestSuite/Source/DateTimeTests.cs
trunk/TestSuite/Source/EventTests.cs
trunk/TestSuite/Source/ExceptionTests.cs
trunk/TestSuite/Source/GetSchemaTests.cs
trunk/TestSuite/Source/InterfaceTests.cs
trunk/TestSuite/Source/LanguageTests.cs
trunk/TestSuite/Source/MicroPerfTests.cs
trunk/TestSuite/Source/MySqlHelperTests.cs
trunk/TestSuite/Source/ParameterTests.cs
trunk/TestSuite/Source/PerfMonTests.cs
trunk/TestSuite/Source/PoolingTests.cs
trunk/TestSuite/Source/PreparedStatements.cs
trunk/TestSuite/Source/ProcedureParameters.cs
trunk/TestSuite/Source/SimpleTransactions.cs
trunk/TestSuite/Source/StoredProcedure.cs
trunk/TestSuite/Source/StressTests.cs
trunk/TestSuite/Source/Syntax.cs
trunk/TestSuite/Source/Syntax2.cs
trunk/TestSuite/Source/Threading.cs
trunk/TestSuite/Source/TimeoutAndCancel.cs
trunk/TestSuite/Source/Transactions.cs
trunk/TestSuite/Source/UsageAdvisor.cs
Log:
moved test suite to using MbUnit.
Modified: trunk/TestSuite/MySql.Data.Tests.csproj
===================================================================
--- trunk/TestSuite/MySql.Data.Tests.csproj 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/MySql.Data.Tests.csproj 2007-10-19 20:08:55 UTC (rev 1036)
@@ -36,7 +36,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
+ <Reference Include="MbUnit.Framework, Version=2.41.232.0, Culture=neutral, PublicKeyToken=5e72ecd30bc408d5" />
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
Modified: trunk/TestSuite/Source/AsyncTests.cs
===================================================================
--- trunk/TestSuite/Source/AsyncTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/AsyncTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
Modified: trunk/TestSuite/Source/BaseTest.cs
===================================================================
--- trunk/TestSuite/Source/BaseTest.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/BaseTest.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -19,7 +19,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
using System;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Configuration;
using System.Data;
using MySql.Data.MySqlClient;
@@ -99,7 +99,7 @@
}
[TestFixtureSetUp]
- protected virtual void FixtureSetup()
+ public virtual void FixtureSetup()
{
// open up a root connection
string connStr = String.Format("server={0};user id={1};password={2};database=mysql;" +
@@ -129,7 +129,7 @@
}
[TestFixtureTearDown]
- protected virtual void TestFixtureTearDown()
+ public virtual void TestFixtureTearDown()
{
suExecSQL(String.Format("DROP DATABASE IF EXISTS `{0}`", database0));
suExecSQL(String.Format("DROP DATABASE IF EXISTS `{0}`", database1));
@@ -231,7 +231,7 @@
}
[SetUp]
- protected virtual void Setup()
+ public virtual void Setup()
{
try
{
@@ -254,7 +254,7 @@
}
[TearDown]
- protected virtual void Teardown()
+ public virtual void Teardown()
{
execSQL("DROP TABLE IF EXISTS test");
if (Version >= new Version(5, 0))
Modified: trunk/TestSuite/Source/BlobTests.cs
===================================================================
--- trunk/TestSuite/Source/BlobTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/BlobTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -22,7 +22,7 @@
using System.Data;
using System.Threading;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -33,7 +33,7 @@
public class BlobTests : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
@@ -396,7 +396,7 @@
#region Configs
#if !CF
- [Category("Compressed")]
+ [TestCategory("Compressed")]
public class BlobTestsSocketCompressed : BlobTests
{
protected override string GetConnectionInfo()
@@ -405,7 +405,7 @@
}
}
- [Category("Pipe")]
+ [TestCategory("Pipe")]
public class BlobTestsPipe : BlobTests
{
protected override string GetConnectionInfo()
@@ -414,8 +414,7 @@
}
}
- [Category("Compressed")]
- [Category("Pipe")]
+ [TestCategory("Compressed", "Pipe")]
public class BlobTestsPipeCompressed : BlobTests
{
protected override string GetConnectionInfo()
@@ -424,7 +423,7 @@
}
}
- [Category("SharedMemory")]
+ [TestCategory("SharedMemory")]
public class BlobTestsSharedMemory : BlobTests
{
protected override string GetConnectionInfo()
@@ -433,8 +432,7 @@
}
}
- [Category("Compressed")]
- [Category("SharedMemory")]
+ [TestCategory("Compressed", "SharedMemory")]
public class BlobTestsSharedMemoryCompressed : BlobTests
{
protected override string GetConnectionInfo()
Modified: trunk/TestSuite/Source/CharacterSetTests.cs
===================================================================
--- trunk/TestSuite/Source/CharacterSetTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/CharacterSetTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -23,7 +23,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
Modified: trunk/TestSuite/Source/CommandBuilderTests.cs
===================================================================
--- trunk/TestSuite/Source/CommandBuilderTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/CommandBuilderTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -20,7 +20,7 @@
using System;
using System.Data;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -28,7 +28,7 @@
public class CommandBuilderTests : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
Modified: trunk/TestSuite/Source/CommandTests.cs
===================================================================
--- trunk/TestSuite/Source/CommandTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/CommandTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Threading;
namespace MySql.Data.MySqlClient.Tests
@@ -30,7 +30,7 @@
public class CommandTests : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
@@ -418,7 +418,7 @@
}
#if !CF
- [Category("Pipe")]
+ [TestCategory("Pipe")]
public class CommandTestsPipe : CommandTests
{
protected override string GetConnectionInfo()
@@ -427,8 +427,7 @@
}
}
- [Category("Compressed")]
- [Category("Pipe")]
+ [TestCategory("Compressed", "Pipe")]
public class CommandTestsPipeCompressed : CommandTests
{
protected override string GetConnectionInfo()
@@ -437,7 +436,7 @@
}
}
- [Category("SharedMemory")]
+ [TestCategory("SharedMemory")]
public class CommandTestsSharedMemory : CommandTests
{
protected override string GetConnectionInfo()
@@ -446,8 +445,7 @@
}
}
- [Category("Compressed")]
- [Category("SharedMemory")]
+ [TestCategory("Compressed", "SharedMemory")]
public class CommandTestsSharedMemoryCompressed : CommandTests
{
protected override string GetConnectionInfo()
Modified: trunk/TestSuite/Source/ConnectionStringBuilder.cs
===================================================================
--- trunk/TestSuite/Source/ConnectionStringBuilder.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/ConnectionStringBuilder.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using System.IO;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
Modified: trunk/TestSuite/Source/ConnectionTests.cs
===================================================================
--- trunk/TestSuite/Source/ConnectionTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/ConnectionTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Configuration;
namespace MySql.Data.MySqlClient.Tests
Modified: trunk/TestSuite/Source/CultureTests.cs
===================================================================
--- trunk/TestSuite/Source/CultureTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/CultureTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -23,14 +23,14 @@
using System.IO;
using System.Globalization;
using System.Threading;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
[TestFixture]
public class CultureTests : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/DataAdapterTests.cs
===================================================================
--- trunk/TestSuite/Source/DataAdapterTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/DataAdapterTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -22,7 +22,7 @@
using MySql.Data.MySqlClient;
using MySql.Data.Types;
using System.Data;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -32,14 +32,14 @@
[TestFixture]
public class DataAdapterTests : BaseTest
{
- protected override void FixtureSetup()
+ public override void FixtureSetup()
{
csAdditions += ";logging=true;";
base.FixtureSetup();
}
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
@@ -859,48 +859,5 @@
Assert.Fail(ex.Message);
}
}
-
- [Test]
- public void TimingTest()
- {
- MySqlConnection c = new MySqlConnection("server=Ubuntu;user id=root;database=test");
- c.Open();
-
- MySqlCommand cmd = new MySqlCommand("DROP TABLE IF EXISTS test", c);
- cmd.ExecuteNonQuery();
-
- cmd.CommandText = "CREATE TABLE test (id INT, name VARCHAR(20), PRIMARY KEY(id))";
- cmd.ExecuteNonQuery();
-
- DataTable dt = new DataTable();
- MySqlDataAdapter da = new MySqlDataAdapter("SELECT * FROM test", c);
- MySqlCommandBuilder cb = new MySqlCommandBuilder(da);
- da.Fill(dt);
-
- for (int x = 0; x < 100000; x++)
- {
- DataRow row = dt.NewRow();
- row["id"] = x;
- row["name"] = "dummy string";
- dt.Rows.Add(row);
- }
-
- DateTime start = DateTime.Now;
- cmd.CommandText = "TRUNCATE TABLE test";
- try
- {
- for (int y = 0; y < 1; y++)
- {
- cmd.ExecuteNonQuery();
- da.Update(dt);
- }
- }
- catch (Exception ex)
- {
- Assert.Fail(ex.Message);
- }
- TimeSpan ts = DateTime.Now.Subtract(start);
- c.Close();
- }
}
}
Modified: trunk/TestSuite/Source/DataReaderTests.cs
===================================================================
--- trunk/TestSuite/Source/DataReaderTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/DataReaderTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -23,7 +23,7 @@
using System.Diagnostics;
using MySql.Data.MySqlClient;
using MySql.Data.Types;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -34,7 +34,7 @@
public class DataReaderTests : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/DataTypeTests.cs
===================================================================
--- trunk/TestSuite/Source/DataTypeTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/DataTypeTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -22,7 +22,7 @@
using MySql.Data.MySqlClient;
using MySql.Data.Types;
using System.Data;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -33,7 +33,7 @@
public class DataTypeTests : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
Modified: trunk/TestSuite/Source/DateTimeTests.cs
===================================================================
--- trunk/TestSuite/Source/DateTimeTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/DateTimeTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -25,16 +25,16 @@
using MySql.Data.MySqlClient;
using MySql.Data.Types;
using System.Globalization;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Text;
namespace MySql.Data.MySqlClient.Tests
{
- [NUnit.Framework.TestFixture]
+ [MbUnit.Framework.TestFixture]
public class DateTimeTests : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/EventTests.cs
===================================================================
--- trunk/TestSuite/Source/EventTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/EventTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -23,14 +23,14 @@
using System.IO;
using System.Globalization;
using System.Threading;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
[TestFixture]
public class EventTests : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/ExceptionTests.cs
===================================================================
--- trunk/TestSuite/Source/ExceptionTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/ExceptionTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -22,14 +22,14 @@
using System.Data;
using System.IO;
using System.Threading;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
[TestFixture]
public class ExceptionTests : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/GetSchemaTests.cs
===================================================================
--- trunk/TestSuite/Source/GetSchemaTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/GetSchemaTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,11 +21,11 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
- [NUnit.Framework.TestFixture]
+ [MbUnit.Framework.TestFixture]
public class GetSchemaTests : BaseTest
{
[Test]
Modified: trunk/TestSuite/Source/InterfaceTests.cs
===================================================================
--- trunk/TestSuite/Source/InterfaceTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/InterfaceTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,12 +21,12 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Data.Common;
namespace MySql.Data.MySqlClient.Tests
{
- [NUnit.Framework.TestFixture]
+ [MbUnit.Framework.TestFixture]
public class InterfaceTests : BaseTest
{
#if !CF
Modified: trunk/TestSuite/Source/LanguageTests.cs
===================================================================
--- trunk/TestSuite/Source/LanguageTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/LanguageTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -23,7 +23,7 @@
using System.IO;
using System.Globalization;
using System.Threading;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
Modified: trunk/TestSuite/Source/MicroPerfTests.cs
===================================================================
--- trunk/TestSuite/Source/MicroPerfTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/MicroPerfTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,14 +21,14 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
[TestFixture]
public class MicroPerfTests : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/MySqlHelperTests.cs
===================================================================
--- trunk/TestSuite/Source/MySqlHelperTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/MySqlHelperTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -23,7 +23,7 @@
using System.IO;
using System.Globalization;
using System.Threading;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Text;
namespace MySql.Data.MySqlClient.Tests
@@ -31,7 +31,7 @@
[TestFixture]
public class MySqlHelperTests : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/ParameterTests.cs
===================================================================
--- trunk/TestSuite/Source/ParameterTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/ParameterTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -32,7 +32,7 @@
public class ParameterTests : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/PerfMonTests.cs
===================================================================
--- trunk/TestSuite/Source/PerfMonTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/PerfMonTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -23,7 +23,7 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Diagnostics;
namespace MySql.Data.MySqlClient.Tests
@@ -34,14 +34,14 @@
[TestFixture]
public class PerfMonTests : BaseTest
{
- protected override void FixtureSetup()
+ public override void FixtureSetup()
{
pooling = false;
csAdditions = ";use performance monitor=true;";
base.FixtureSetup();
}
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test; CREATE TABLE Test (id INT, name VARCHAR(100))");
Modified: trunk/TestSuite/Source/PoolingTests.cs
===================================================================
--- trunk/TestSuite/Source/PoolingTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/PoolingTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
-
+
@@ -32,24 +32,24 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
@@ -63,23 +63,23 @@
-
+
-
+
-
+
-
+
@@ -89,7 +89,7 @@
-
+
@@ -116,7 +116,7 @@
-
+
@@ -126,7 +126,7 @@
-
+
@@ -138,7 +138,7 @@
-
+
@@ -146,14 +146,14 @@
-
+
-
-
+
+
@@ -172,185 +172,185 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
Modified: trunk/TestSuite/Source/PreparedStatements.cs
===================================================================
--- trunk/TestSuite/Source/PreparedStatements.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/PreparedStatements.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,14 +21,14 @@
using System;
using System.Data;
using System.IO;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
[TestFixture]
public class PreparedStatements : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
@@ -783,7 +783,7 @@
#region Configs
#if !CF
- [Category("Compressed")]
+ [TestCategory("Compressed")]
public class PreparedStatementsSocketCompressed : PreparedStatements
{
protected override string GetConnectionInfo()
@@ -792,7 +792,7 @@
}
}
- [Category("Pipe")]
+ [TestCategory("Pipe")]
public class PreparedStatementsPipe : PreparedStatements
{
protected override string GetConnectionInfo()
@@ -801,8 +801,7 @@
}
}
- [Category("Compressed")]
- [Category("Pipe")]
+ [TestCategory("Compressed", "Pipe")]
public class PreparedStatementsPipeCompressed : PreparedStatements
{
protected override string GetConnectionInfo()
@@ -811,7 +810,7 @@
}
}
- [Category("SharedMemory")]
+ [TestCategory("SharedMemory")]
public class PreparedStatementsSharedMemory : PreparedStatements
{
protected override string GetConnectionInfo()
@@ -820,8 +819,7 @@
}
}
- [Category("Compressed")]
- [Category("SharedMemory")]
+ [TestCategory("Compressed", "SharedMemory")]
public class PreparedStatementsSharedMemoryCompressed : PreparedStatements
{
protected override string GetConnectionInfo()
Modified: trunk/TestSuite/Source/ProcedureParameters.cs
===================================================================
--- trunk/TestSuite/Source/ProcedureParameters.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/ProcedureParameters.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
Modified: trunk/TestSuite/Source/SimpleTransactions.cs
===================================================================
--- trunk/TestSuite/Source/SimpleTransactions.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/SimpleTransactions.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using System.IO;
-using NUnit.Framework;
+using MbUnit.Framework;
#if NET20
using System.Data.Common;
#endif
@@ -31,7 +31,7 @@
[TestFixture]
public class SimpleTransactions : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/StoredProcedure.cs
===================================================================
--- trunk/TestSuite/Source/StoredProcedure.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/StoredProcedure.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using MySql.Data.MySqlClient;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Globalization;
using System.Threading;
using MySql.Data.Types;
@@ -38,7 +38,7 @@
private static string fillError = null;
[TestFixtureSetUp]
- protected override void FixtureSetup()
+ public override void FixtureSetup()
{
pooling = false;
csAdditions = ";procedure cache size=0;";
@@ -46,7 +46,7 @@
}
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
@@ -1342,5 +1342,25 @@
cmd.CommandType = CommandType.StoredProcedure;
Assert.AreEqual(1, cmd.ExecuteScalar());
}
+
+ [Test]
+ public void CallingFunction()
+ {
+ execSQL("DROP FUNCTION IF EXISTS spFunc");
+ execSQL(@"CREATE FUNCTION `GetSupplierBalance`(SupplierID_ INTEGER(11))
+ RETURNS double NOT DETERMINISTIC CONTAINS SQL SQL SECURITY DEFINER
+ COMMENT ''
+ BEGIN
+ RETURN 1.0;
+ END");
+
+ MySqlCommand command = new MySqlCommand("GetSupplierBalance", conn);
+ command.CommandType = CommandType.StoredProcedure;
+ command.Parameters.Add("?SupplierID_", MySqlDbType.Int32).Value = 1;
+ command.Parameters.Add("?Balance", MySqlDbType.Double).Direction = ParameterDirection.ReturnValue;
+ command.ExecuteNonQuery();
+ double balance = Convert.ToDouble(command.Parameters["?Balance"].Value);
+ Assert.AreEqual(1.0, balance);
+ }
}
}
Modified: trunk/TestSuite/Source/StressTests.cs
===================================================================
--- trunk/TestSuite/Source/StressTests.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/StressTests.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using MySql.Data.MySqlClient;
using System.Data;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Threading;
using System.Collections;
@@ -33,7 +33,7 @@
[TestFixture]
public class StressTests : BaseTest
{
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
@@ -144,7 +144,7 @@
#region Configs
#if !CF
- [Category("Compressed")]
+ [TestCategory("Compressed")]
public class StressTestsSocketCompressed : StressTests
{
protected override string GetConnectionInfo()
@@ -153,7 +153,7 @@
}
}
- [Category("Pipe")]
+ [TestCategory("Pipe")]
public class StressTestsPipe : StressTests
{
protected override string GetConnectionInfo()
@@ -162,8 +162,7 @@
}
}
- [Category("Compressed")]
- [Category("Pipe")]
+ [TestCategory("Compressed", "Pipe")]
public class StressTestsPipeCompressed : StressTests
{
protected override string GetConnectionInfo()
@@ -172,7 +171,7 @@
}
}
- [Category("SharedMemory")]
+ [TestCategory("SharedMemory")]
public class StressTestsSharedMemory : StressTests
{
protected override string GetConnectionInfo()
@@ -181,8 +180,7 @@
}
}
- [Category("Compressed")]
- [Category("SharedMemory")]
+ [TestCategory("Compressed", "SharedMemory")]
public class StressTestsSharedMemoryCompressed : StressTests
{
protected override string GetConnectionInfo()
Modified: trunk/TestSuite/Source/Syntax.cs
===================================================================
--- trunk/TestSuite/Source/Syntax.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/Syntax.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using System.IO;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -29,7 +29,7 @@
public class Syntax : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup ();
execSQL("DROP TABLE IF EXISTS Test");
Modified: trunk/TestSuite/Source/Syntax2.cs
===================================================================
--- trunk/TestSuite/Source/Syntax2.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/Syntax2.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using System.IO;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -29,7 +29,7 @@
public class Syntax2 : BaseTest
{
[SetUp]
- protected override void Setup()
+ public override void Setup()
{
base.Setup ();
execSQL("DROP TABLE IF EXISTS Test");
@@ -90,7 +90,7 @@
Assert.AreEqual(-1, cmd.LastInsertedId);
}
-/* [Category("NotWorking")]
+/* [TestCategory("NotWorking")]
[Test]
public void TestCase()
{
Modified: trunk/TestSuite/Source/Threading.cs
===================================================================
--- trunk/TestSuite/Source/Threading.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/Threading.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using MySql.Data.MySqlClient;
using System.Data;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Threading;
using System.Collections;
using System.Diagnostics;
Modified: trunk/TestSuite/Source/TimeoutAndCancel.cs
===================================================================
--- trunk/TestSuite/Source/TimeoutAndCancel.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/TimeoutAndCancel.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -22,7 +22,7 @@
using System.Data;
using System.IO;
using System.Threading;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
Modified: trunk/TestSuite/Source/Transactions.cs
===================================================================
--- trunk/TestSuite/Source/Transactions.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/Transactions.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -21,7 +21,7 @@
using System;
using System.Data;
using System.IO;
-using NUnit.Framework;
+using MbUnit.Framework;
using System.Transactions;
using System.Data.Common;
@@ -32,7 +32,7 @@
{
protected int baseProcessCount;
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
Modified: trunk/TestSuite/Source/UsageAdvisor.cs
===================================================================
--- trunk/TestSuite/Source/UsageAdvisor.cs 2007-10-17 17:07:00 UTC (rev 1035)
+++ trunk/TestSuite/Source/UsageAdvisor.cs 2007-10-19 20:08:55 UTC (rev 1036)
@@ -20,7 +20,7 @@
using System;
using System.Diagnostics;
-using NUnit.Framework;
+using MbUnit.Framework;
namespace MySql.Data.MySqlClient.Tests
{
@@ -28,13 +28,13 @@
public class UsageAdvisorTests : BaseTest
{
[TestFixtureSetUp]
- protected override void FixtureSetup()
+ public override void FixtureSetup()
{
csAdditions = ";Usage Advisor=true;";
base.FixtureSetup();
}
- protected override void Setup()
+ public override void Setup()
{
base.Setup();
execSQL("DROP TABLE IF EXISTS Test");
| Thread |
|---|
| • Connector/NET commit: r1036 - in trunk/TestSuite: . Source | rburnett | 19 Oct |
