Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@@ -38,6 +38,7 @@ using NUnit.Framework;
namespace MonoTests.System.Data.Odbc
{
[TestFixture]
[Category("NotWorking")] // needs https://github.com/dotnet/corefx/pull/22499
public class OdbcCommandBuilderTest
{
[Test]

View File

@@ -131,6 +131,7 @@ namespace MonoTests.System.Data.Odbc
}
[Test]
[Category("NotWorking")] //GetSchema is not implemented in corefx for ODBC
public void GetSchema_Connection_Closed ()
{
OdbcConnection cn = new OdbcConnection ();

View File

@@ -31,9 +31,8 @@
using System;
using System.Data;
using System.Data.Odbc;
using System.Data.OleDb;
using NUnit.Framework;
using SqlCommand = System.Data.SqlClient.SqlCommand;
namespace MonoTests.System.Data.Odbc
{
@@ -307,7 +306,7 @@ namespace MonoTests.System.Data.Odbc
Assert.IsNull (da.DeleteCommand, "#A3");
try {
da.DeleteCommand = new OleDbCommand ();
da.DeleteCommand = new SqlCommand ();
Assert.Fail ("#B1");
} catch (InvalidCastException ex) {
Assert.AreEqual (typeof (InvalidCastException), ex.GetType (), "#B2");
@@ -364,7 +363,7 @@ namespace MonoTests.System.Data.Odbc
Assert.IsNull (da.InsertCommand, "#A3");
try {
da.InsertCommand = new OleDbCommand ();
da.InsertCommand = new SqlCommand ();
Assert.Fail ("#B1");
} catch (InvalidCastException ex) {
Assert.AreEqual (typeof (InvalidCastException), ex.GetType (), "#B2");
@@ -403,7 +402,7 @@ namespace MonoTests.System.Data.Odbc
Assert.IsNull (da.SelectCommand, "#A3");
try {
da.SelectCommand = new OleDbCommand ();
da.SelectCommand = new SqlCommand ();
Assert.Fail ("#B1");
} catch (InvalidCastException ex) {
Assert.AreEqual (typeof (InvalidCastException), ex.GetType (), "#B2");
@@ -480,7 +479,7 @@ namespace MonoTests.System.Data.Odbc
Assert.IsNull (da.UpdateCommand, "#A3");
try {
da.UpdateCommand = new OleDbCommand ();
da.UpdateCommand = new SqlCommand ();
Assert.Fail ("#B1");
} catch (InvalidCastException ex) {
Assert.AreEqual (typeof (InvalidCastException), ex.GetType (), "#B2");