mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.20.0.180

Browse Source 
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mcs/class/System.Data/Makefile
View File

@@ -25,6 +25,12 @@ ifdef MONO_FEATURE_APPLETLS
LIB_MCS_FLAGS += -d:MONO_FEATURE_APPLETLS
endif
ifdef ENABLE_GSS
ifndef NO_GSS
LIB_MCS_FLAGS += -d:ENABLE_GSS
endif
endif
ifndef PROFILE_DISABLE_BTLS
ifdef HAVE_BTLS
LIB_MCS_FLAGS += -d:MONO_FEATURE_BTLS
@@ -37,8 +43,20 @@ RESX_RESOURCE_STRING = \
../../../external/corefx/src/System.Data.SqlClient/src/Resources/Strings.resx \
../../../external/corefx/src/System.Data.Odbc/src/Resources/Strings.resx
TEST_RESOURCE_FILES = \
$(wildcard Test/System.Data/*.xml) \
$(wildcard Test/System.Data/*.xsd) \
$(wildcard Test/System.Xml/*.xml) \
$(wildcard Test/System.Xml/*.xsd) \
$(wildcard Test/System.Data/schemas/*.xml) \
$(wildcard Test/System.Data/schemas/*.xsd) \
$(wildcard Test/System.Data/binserialize/*.bin) \
$(wildcard Test/ProviderTests/sql/*.sql) \
Test/Mono.Data.SqlExpressions/dateComparisonTest.xml \
Test/System.Data.Common/SqliteTest.db
TEST_LIB_REFS = System.Core Mono.Data.Sqlite
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:618,169,612,219,168 $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
TEST_NUNITLITE_APP_CONFIG_GLOBAL=Test/test-config-file
@@ -46,14 +64,7 @@ USE_XTEST_REMOTE_EXECUTOR = YES
XTEST_LIB_REFS = System System.Core System.Xml Facades/System.Text.Encoding.CodePages Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation Facades/System.Text.RegularExpressions
EXTRA_DISTFILES = \
$(wildcard Test/System.Data/*.xml) \
$(wildcard Test/System.Data/*.xsd) \
$(wildcard Test/System.Xml/*.xml) \
$(wildcard Test/System.Xml/*.xsd) \
$(wildcard Test/System.Data/schemas/*.xsd) \
Test/test-config-file \
Test/System.Data/binserialize/*.bin \
Test/ProviderTests/sql/*.sql \
SqliteTest.db
$(TEST_RESOURCE_FILES) \
Test/test-config-file
include ../../build/library.make

1
mcs/class/System.Data/System.Data_test.dll.sources
View File

@@ -1,3 +1,4 @@
../../test-helpers/TestResourceHelper.cs
System.Data.Test.Utils/DataProvider.cs
System.Data.SqlTypes/SqlBinaryTest.cs
System.Data.SqlTypes/SqlBooleanTest.cs

4
mcs/class/System.Data/Test/Mono.Data.SqlExpressions/DateComparisonTest.cs
View File

@@ -2,6 +2,8 @@ using System;
using System.Data;
using NUnit.Framework;
using MonoTests.Helpers;
namespace Monotests_Mono.Data.SqlExpressions
{
[TestFixture]
@@ -13,7 +15,7 @@ namespace Monotests_Mono.Data.SqlExpressions
public void SetUp()
{
dataSet = new DataSet();
dataSet.ReadXml("Test/Mono.Data.SqlExpressions/dateComparisonTest.xml", XmlReadMode.InferSchema);
dataSet.ReadXml(TestResourceHelper.GetFullPathOfResource ("Test/Mono.Data.SqlExpressions/dateComparisonTest.xml"), XmlReadMode.InferSchema);
}
[Test]

6
mcs/class/System.Data/Test/ProviderTests/Common/ConnectionManager.cs
View File

@@ -41,6 +41,8 @@ using System.Linq;
using System.Text.RegularExpressions;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data.Connected
{
public class ConnectionManager
@@ -128,7 +130,7 @@ namespace MonoTests.System.Data.Connected
sql.ConnectionString = sql.ConnectionString.Replace(sql.Connection.Database, DatabaseName);
sql.CloseConnection();
string query = File.ReadAllText(@"Test/ProviderTests/sql/sqlserver.sql");
string query = File.ReadAllText(TestResourceHelper.GetFullPathOfResource ("Test/ProviderTests/sql/sqlserver.sql"));
var queries = SplitSqlStatements(query);
foreach (var subQuery in queries)
@@ -144,7 +146,7 @@ namespace MonoTests.System.Data.Connected
odbc.Connection.ChangeDatabase(DatabaseName);
odbc.ConnectionString += $"database={DatabaseName}";
string query = File.ReadAllText("Test/ProviderTests/sql/MySQL_5.sql");
string query = File.ReadAllText(TestResourceHelper.GetFullPathOfResource ("Test/ProviderTests/sql/MySQL_5.sql"));
var groups = query.Replace("delimiter ", "")
.Split(new[] { "//\n" }, StringSplitOptions.RemoveEmptyEntries);

4
mcs/class/System.Data/Test/System.Data.Common/DbDataAdapterTest.cs
View File

@@ -39,6 +39,8 @@ using Mono.Data.Sqlite;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data.Common
{
[TestFixture]
@@ -194,7 +196,7 @@ namespace MonoTests.System.Data.Common
[Category ("NotWorking")] // Requires newer sqlite than is on wrench
public void XimarinBugzillaBug853Test()
{
const string connectionString = "URI = file:./SqliteTest.db; Version = 3";//will be in System.Data directory
string connectionString = "URI = file:" + TestResourceHelper.GetFullPathOfResource ("Test/System.Data.Common/SqliteTest.db") + "; Version = 3";//will be in System.Data directory
SqliteConnection dbConnection = new SqliteConnection(connectionString);
dbConnection.Open();
SqliteCommand ClearTableEntry=new SqliteCommand("DELETE FROM Primus;",dbConnection);

0
mcs/class/System.Data/SqliteTest.db → mcs/class/System.Data/Test/System.Data.Common/SqliteTest.db
View File

12
mcs/class/System.Data/Test/System.Data/BinarySerializationTest.cs
View File

@@ -11,6 +11,8 @@ using System.Threading;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -151,7 +153,7 @@ public class BinarySerializationTest
tb1.Rows[1].Delete();
BinaryFormatter bf = new BinaryFormatter ();
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb1.bin", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/binserialize/BS-tb1.bin"), FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int)fs.Length);
r.Close ();
@@ -285,7 +287,7 @@ public class BinarySerializationTest
BinaryFormatter bf = new BinaryFormatter ();
tb1.RemotingFormat = SerializationFormat.Xml;
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb2.bin", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/binserialize/BS-tb2.bin"), FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int)fs.Length);
r.Close ();
@@ -342,7 +344,7 @@ public class BinarySerializationTest
//tb1.Rows.Add (new object[] {3, dateTime});
BinaryFormatter bf = new BinaryFormatter ();
tb1.RemotingFormat = SerializationFormat.Binary;
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb3.bin", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/binserialize/BS-tb3.bin"), FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int) fs.Length);
r.Close ();
@@ -477,7 +479,7 @@ public class BinarySerializationTest
//SerializeDataSet
BinaryFormatter bf = new BinaryFormatter ();
ds.RemotingFormat = SerializationFormat.Xml;
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb4.bin", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/binserialize/BS-tb4.bin"), FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int) fs.Length);
r.Close ();
@@ -711,7 +713,7 @@ public class BinarySerializationTest
//SerializeDataSet
BinaryFormatter bf = new BinaryFormatter ();
ds.RemotingFormat = SerializationFormat.Xml;
FileStream fs = new FileStream ("Test/System.Data/binserialize/BS-tb5.bin", FileMode.Open, FileAccess.Read);
FileStream fs = new FileStream (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/binserialize/BS-tb5.bin"), FileMode.Open, FileAccess.Read);
BinaryReader r = new BinaryReader (fs);
byte [] serializedStream = r.ReadBytes ((int)fs.Length);
r.Close ();

4
mcs/class/System.Data/Test/System.Data/DataRelationTest.cs
View File

@@ -35,6 +35,8 @@ using NUnit.Framework;
using System;
using System.Data;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -382,7 +384,7 @@ namespace MonoTests.System.Data
public void RelationFromSchema ()
{
DataSet Set = new DataSet ();
Set.ReadXmlSchema ("Test/System.Data/store.xsd");
Set.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/store.xsd"));
DataTable Table = Set.Tables [0];
Assert.That (Table.CaseSensitive, Is.False, "test#01");

40
mcs/class/System.Data/Test/System.Data/DataSetReadXmlSchemaTest.cs
View File

@@ -38,6 +38,8 @@ using System.Threading;
using System.Xml;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -499,19 +501,19 @@ namespace MonoTests.System.Data
public void TestSampleFileNoTables ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test001.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test001.xsd"));
AssertDataSet ("001", ds, "NewDataSet", 0, 0);
ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test002.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test002.xsd"));
AssertDataSet ("002", ds, "NewDataSet", 0, 0);
ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test003.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test003.xsd"));
AssertDataSet ("003", ds, "NewDataSet", 0, 0);
ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test004.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test004.xsd"));
AssertDataSet ("004", ds, "NewDataSet", 0, 0);
}
@@ -519,7 +521,7 @@ namespace MonoTests.System.Data
public void TestSampleFileSimpleTables ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test005.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test005.xsd"));
AssertDataSet ("005", ds, "NewDataSet", 1, 0);
DataTable dt = ds.Tables [0];
AssertDataTable ("tab", dt, "foo", 2, 0, 0, 0, 0, 0);
@@ -527,7 +529,7 @@ namespace MonoTests.System.Data
AssertDataColumn ("text", dt.Columns [1], "foo_text", false, false, 0, 1, "foo_text", MappingType.SimpleContent, typeof (long), DBNull.Value, String.Empty, -1, String.Empty, 1, String.Empty, false, false);
ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test006.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test006.xsd"));
AssertDataSet ("006", ds, "NewDataSet", 1, 0);
dt = ds.Tables [0];
AssertDataTable ("tab", dt, "foo", 2, 0, 0, 0, 0, 0);
@@ -540,7 +542,7 @@ namespace MonoTests.System.Data
{
// Nested simple type element
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test007.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test007.xsd"));
AssertDataSet ("007", ds, "NewDataSet", 2, 1);
DataTable dt = ds.Tables [0];
AssertDataTable ("tab1", dt, "uno", 1, 0, 0, 1, 1, 1);
@@ -553,7 +555,7 @@ namespace MonoTests.System.Data
// External simple type element
ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test008.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test008.xsd"));
AssertDataSet ("008", ds, "NewDataSet", 2, 1);
dt = ds.Tables [0];
AssertDataTable ("tab1", dt, "uno", 1, 0, 0, 1, 1, 1);
@@ -571,7 +573,7 @@ namespace MonoTests.System.Data
public void TestSampleFileValueConstraints ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test009.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test009.xsd"));
AssertDataSet ("009", ds, "NewDataSet", 2, 1);
DataTable dt = ds.Tables [0];
@@ -606,7 +608,7 @@ namespace MonoTests.System.Data
DataSet ds = new DataSet ();
XmlTextReader xtr = null;
try {
xtr = new XmlTextReader ("Test/System.Data/schemas/test010.xsd");
xtr = new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test010.xsd"));
xtr.XmlResolver = null;
ds.ReadXmlSchema (xtr);
} finally {
@@ -625,7 +627,7 @@ namespace MonoTests.System.Data
public void TestSampleFileComplexTables2 ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test011.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test011.xsd"));
AssertDataSet ("011", ds, "NewDataSet", 2, 1);
DataTable dt = ds.Tables [0];
@@ -645,7 +647,7 @@ namespace MonoTests.System.Data
public void TestSampleFileComplexTables3 ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test013.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test013.xsd"));
AssertDataSet ("013", ds, "root", 1, 0);
DataTable dt = ds.Tables [0];
@@ -659,14 +661,14 @@ namespace MonoTests.System.Data
public void TestSampleFileXPath ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test103.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test103.xsd"));
}
[Test]
public void TestAnnotatedRelation1 ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test101.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test101.xsd"));
AssertDataSet ("101", ds, "root", 2, 1);
DataTable dt = ds.Tables [0];
AssertDataTable ("parent_table", dt, "p", 2, 0, 0, 1, 0, 0);
@@ -683,7 +685,7 @@ namespace MonoTests.System.Data
public void TestAnnotatedRelation2 ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test102.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test102.xsd"));
AssertDataSet ("102", ds, "ds", 2, 1);
DataTable dt = ds.Tables [0];
AssertDataTable ("parent_table", dt, "p", 2, 0, 0, 1, 0, 0);
@@ -700,7 +702,7 @@ namespace MonoTests.System.Data
public void RepeatableSimpleElement ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test012.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test012.xsd"));
AssertDataSet ("012", ds, "NewDataSet", 2, 1);
DataTable dt = ds.Tables [0];
AssertDataTable ("parent", dt, "Foo", 1, 0, 0, 1, 1, 1);
@@ -718,7 +720,7 @@ namespace MonoTests.System.Data
public void TestMoreThanOneRepeatableColumns ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test014.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test014.xsd"));
AssertDataSet ("014", ds, "NewDataSet", 3, 2);
DataTable dt = ds.Tables [0];
@@ -757,7 +759,7 @@ namespace MonoTests.System.Data
public void ReadConstraints ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test015.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test015.xsd"));
Assert.AreEqual (0, ds.Relations.Count, "#1");
Assert.AreEqual (1, ds.Tables [0].Constraints.Count, "#2" );
@@ -769,7 +771,7 @@ namespace MonoTests.System.Data
public void ReadAnnotatedRelations_MultipleColumns ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/test016.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test016.xsd"));
Assert.AreEqual (1, ds.Relations.Count, "#1");
Assert.AreEqual ("rel", ds.Relations [0].RelationName, "#2");

4
mcs/class/System.Data/Test/System.Data/DataSetReadXmlTest.cs
View File

@@ -37,6 +37,8 @@ using System.Xml.Serialization;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -781,7 +783,7 @@ namespace MonoTests.System.Data
}
DataSet dataSet2 = new DataSet();
dataSet2.ReadXml("Test/System.Data/schemas/b582732.xml", XmlReadMode.ReadSchema);
dataSet2.ReadXml(TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/b582732.xml"), XmlReadMode.ReadSchema);
Assert.AreEqual (dataSet1.ExtendedProperties["DS1"], dataSet2.ExtendedProperties["DS1"],
"DSExtProp#1: DS extended properties mismatch");

2
mcs/class/System.Data/Test/System.Data/DataSetTest.cs.REMOVED.git-id
View File

@@ -1 +1 @@
560620c3c2a145b950445cc2976533cf251b9134
cb15d8ba56678e66fd3473fef709b88a22cb9f48

2
mcs/class/System.Data/Test/System.Data/DataSetTest2.cs.REMOVED.git-id
View File

@@ -1 +1 @@
e785bce6e510e38a87bfcec7c30e698ad193ce0b
090f6babf4967ffa56e3c3b9e8a865c9dff0a6f6

4
mcs/class/System.Data/Test/System.Data/DataSetTypedDataSetTest.cs
View File

@@ -38,6 +38,8 @@ using System.Xml.Schema;
using System.IO;
using System.Globalization;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -57,7 +59,7 @@ namespace MonoTests.System.Data
Assert.AreEqual(typeof(myTypedDataSet), ds.GetType() ,"TDS1" );
// fill dataset
ds.ReadXml("Test/System.Data/TypedDataSet.xml");
ds.ReadXml(TestResourceHelper.GetFullPathOfResource ("Test/System.Data/TypedDataSet.xml"));
// check DataSet named property "Orders"
myTypedDataSet.OrdersDataTable tblOrders = null;

46
mcs/class/System.Data/Test/System.Data/DataTableReadXmlSchemaTest.cs
View File

@@ -39,6 +39,8 @@ using System.Threading;
using System.Xml;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -413,7 +415,7 @@ namespace MonoTests.System.Data
{
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("foo"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test005.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test005.xsd"));
AssertDataSet ("005", ds, "NewDataSet", 1, 0);
DataTable dt = ds.Tables [0];
AssertDataTable ("tab", dt, "foo", 2, 0, 0, 0, 0, 0);
@@ -422,7 +424,7 @@ namespace MonoTests.System.Data
ds = new DataSet ();
ds.Tables.Add (new DataTable ("foo"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test006.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test006.xsd"));
AssertDataSet ("006", ds, "NewDataSet", 1, 0);
dt = ds.Tables [0];
AssertDataTable ("tab", dt, "foo", 2, 0, 0, 0, 0, 0);
@@ -437,7 +439,7 @@ namespace MonoTests.System.Data
// Nested simple type element
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("uno"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test007.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test007.xsd"));
}
[Test]
@@ -447,7 +449,7 @@ namespace MonoTests.System.Data
// External simple type element
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("uno"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test008.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test008.xsd"));
}
[Test]
@@ -458,7 +460,7 @@ namespace MonoTests.System.Data
ds.Tables.Add( new DataTable("foo"));
XmlTextReader xtr = null;
try {
xtr = new XmlTextReader ("Test/System.Data/schemas/test010.xsd");
xtr = new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test010.xsd"));
xtr.XmlResolver = null;
ds.Tables[0].ReadXmlSchema (xtr);
} finally {
@@ -479,13 +481,13 @@ namespace MonoTests.System.Data
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("e"));
ds.Tables.Add (new DataTable ("root"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test011.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test011.xsd"));
DataTable dt = ds.Tables[0];
AssertDataTable ("root", dt, "e", 3, 0, 0, 0, 0, 0);
AssertDataColumn ("attr", dt.Columns [0], "a", true, false, 0, 1, "a", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, "http://xsdtesting", 0, String.Empty, false, false);
AssertDataColumn ("simple", dt.Columns [1], "e_text", false, false, 0, 1, "e_text", MappingType.SimpleContent, typeof (decimal), DBNull.Value, String.Empty, -1, "", 1, String.Empty, false, false);
AssertDataColumn ("hidden", dt.Columns [2], "root_Id", true, false, 0, 1, "root_Id", MappingType.Hidden, typeof (int), DBNull.Value, String.Empty, -1, "", 2, String.Empty, false, false);
ds.Tables[1].ReadXmlSchema ("Test/System.Data/schemas/test011.xsd");
ds.Tables[1].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test011.xsd"));
}
[Test]
@@ -493,7 +495,7 @@ namespace MonoTests.System.Data
{
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("e"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test013.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test013.xsd"));
DataTable dt = ds.Tables [0];
AssertDataTable ("root", dt, "e", 2, 0, 0, 0, 0, 0);
AssertDataColumn ("attr", dt.Columns [0], "a", true, false, 0, 1, "a", MappingType.Attribute, typeof (string), DBNull.Value, String.Empty, -1, String.Empty, 0, String.Empty, false, false);
@@ -506,7 +508,7 @@ namespace MonoTests.System.Data
{
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("Track"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test103.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test103.xsd"));
}
[Test]
@@ -516,8 +518,8 @@ namespace MonoTests.System.Data
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("p"));
ds.Tables.Add (new DataTable ("c"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test101.xsd");
ds.Tables[1].ReadXmlSchema ("Test/System.Data/schemas/test101.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test101.xsd"));
ds.Tables[1].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test101.xsd"));
DataTable dt = ds.Tables [0];
AssertDataTable ("parent_table", dt, "p", 2, 0, 0, 1, 0, 0);
@@ -537,8 +539,8 @@ namespace MonoTests.System.Data
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("p"));
ds.Tables.Add (new DataTable ("c"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test102.xsd");
ds.Tables[1].ReadXmlSchema ("Test/System.Data/schemas/test102.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test102.xsd"));
ds.Tables[1].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test102.xsd"));
DataTable dt = ds.Tables [0];
AssertDataTable ("parent_table", dt, "p", 2, 0, 0, 1, 0, 0);
@@ -558,8 +560,8 @@ namespace MonoTests.System.Data
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ("Foo"));
ds.Tables.Add (new DataTable ("Bar"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test012.xsd");
ds.Tables[1].ReadXmlSchema ("Test/System.Data/schemas/test012.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test012.xsd"));
ds.Tables[1].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test012.xsd"));
AssertDataSet ("012", ds, "NewDataSet", 2, 1);
DataTable dt = ds.Tables [0];
@@ -582,9 +584,9 @@ namespace MonoTests.System.Data
ds.Tables.Add (new DataTable ("root"));
ds.Tables.Add (new DataTable ("x"));
ds.Tables.Add (new DataTable ("y"));
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test014.xsd");
ds.Tables[1].ReadXmlSchema ("Test/System.Data/schemas/test014.xsd");
ds.Tables[2].ReadXmlSchema ("Test/System.Data/schemas/test014.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test014.xsd"));
ds.Tables[1].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test014.xsd"));
ds.Tables[2].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test014.xsd"));
AssertDataSet ("014", ds, "NewDataSet", 3, 2);
DataTable dt = ds.Tables [0];
@@ -612,8 +614,8 @@ namespace MonoTests.System.Data
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ());
ds.Tables.Add (new DataTable ());
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test015.xsd");
ds.Tables[1].ReadXmlSchema ("Test/System.Data/schemas/test015.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test015.xsd"));
ds.Tables[1].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test015.xsd"));
Assert.AreEqual (0, ds.Relations.Count, "#1");
Assert.AreEqual (1, ds.Tables [0].Constraints.Count, "#2" );
Assert.AreEqual (0, ds.Tables [1].Constraints.Count, "#3" );
@@ -627,8 +629,8 @@ namespace MonoTests.System.Data
DataSet ds = new DataSet ();
ds.Tables.Add (new DataTable ());
ds.Tables.Add (new DataTable ());
ds.Tables[0].ReadXmlSchema ("Test/System.Data/schemas/test016.xsd");
ds.Tables[1].ReadXmlSchema ("Test/System.Data/schemas/test016.xsd");
ds.Tables[0].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test016.xsd"));
ds.Tables[1].ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/test016.xsd"));
Assert.AreEqual (1, ds.Relations.Count, "#1");
Assert.AreEqual ("rel", ds.Relations [0].RelationName, "#2");
Assert.AreEqual (2, ds.Relations [0].ParentColumns.Length, "#3");

2
mcs/class/System.Data/Test/System.Data/DataTableTest.cs.REMOVED.git-id
View File

@@ -1 +1 @@
12aeaa4ad4d536103f019c69e9ab187d19cfd6fe
ec78ea8650efd71487f1f860931a3c13055e73c7

4
mcs/class/System.Data/Test/System.Data/TypedDataSetGeneratorTest.cs
View File

@@ -37,6 +37,8 @@ using System.Data;
using NUnit.Framework;
using Microsoft.CSharp;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -91,7 +93,7 @@ namespace MonoTests.System.Data
public void RelationConnectsSameTable ()
{
DataSet ds = new DataSet ();
ds.ReadXmlSchema ("Test/System.Data/schemas/bug77248.xsd");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/schemas/bug77248.xsd"));
CodeNamespace cns = new CodeNamespace ();
TypedDataSetGenerator.Generate (ds, cns, gen);
CodeCompileUnit ccu = new CodeCompileUnit ();

6
mcs/class/System.Data/Test/System.Data/XmlDataReaderTest.cs
View File

@@ -32,6 +32,8 @@ using System.Xml.Serialization;
using System.Xml.Schema;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data
{
[TestFixture]
@@ -41,8 +43,8 @@ namespace MonoTests.System.Data
public void XmlLoadTest ()
{
DataSet ds = new DataSet();
ds.ReadXmlSchema ("Test/System.Data/TestReadXmlSchema1.xml");
ds.ReadXml ("Test/System.Data/TestReadXml1.xml");
ds.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/TestReadXmlSchema1.xml"));
ds.ReadXml (TestResourceHelper.GetFullPathOfResource ("Test/System.Data/TestReadXml1.xml"));
}
// Test for Bug#377146

62
mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs
View File

@@ -42,6 +42,8 @@ using System.Xml.XPath;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.Data.Xml
{
[TestFixture]
@@ -114,8 +116,8 @@ namespace MonoTests.System.Data.Xml
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XmlDataDocument doc2 = (XmlDataDocument)doc.CloneNode (false);
@@ -136,15 +138,15 @@ namespace MonoTests.System.Data.Xml
public void EditingXmlTree ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XmlElement Element = doc.GetElementFromRow (doc.DataSet.Tables [0].Rows [1]);
Element.FirstChild.InnerText = "64";
Assert.AreEqual ("64", doc.DataSet.Tables [0].Rows [1] [0], "test#01");
DataSet Set = new DataSet ();
Set.ReadXml ("Test/System.Xml/region.xml");
Set.ReadXml (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
doc = new XmlDataDocument (Set);
Element = doc.GetElementFromRow (doc.DataSet.Tables [0].Rows [1]);
@@ -168,7 +170,7 @@ namespace MonoTests.System.Data.Xml
{
string xml = "<Root><Region><RegionID>1</RegionID><RegionDescription>Eastern" + Environment.NewLine + " </RegionDescription></Region><Region><RegionID>2</RegionID><RegionDescription>Western" + Environment.NewLine + " </RegionDescription></Region><Region><RegionID>3</RegionID><RegionDescription>Northern" + Environment.NewLine + " </RegionDescription></Region><Region><RegionID>4</RegionID><RegionDescription>Southern" + Environment.NewLine + " </RegionDescription></Region><MoreData><Column1>12</Column1><Column2>Hi There</Column2></MoreData><MoreData><Column1>12</Column1><Column2>Hi There</Column2></MoreData></Root>";
XmlReader Reader = new XmlTextReader ("Test/System.Xml/region.xml");
XmlReader Reader = new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XmlDataDocument Doc = new XmlDataDocument ();
Doc.DataSet.ReadXml (Reader);
StringWriter sw = new StringWriter ();
@@ -189,8 +191,8 @@ namespace MonoTests.System.Data.Xml
public void CreateElement1 ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XmlElement Element = doc.CreateElement ("prefix", "localname", "namespaceURI");
Assert.AreEqual ("prefix", Element.Prefix, "test#01");
@@ -232,8 +234,8 @@ namespace MonoTests.System.Data.Xml
public void CreateElement2 ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XmlElement Element = doc.CreateElement ("ElementName");
Assert.AreEqual (string.Empty, Element.Prefix, "test#01");
@@ -250,8 +252,8 @@ namespace MonoTests.System.Data.Xml
public void CreateElement3 ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XmlElement Element = doc.CreateElement ("ElementName", "namespace");
Assert.AreEqual (string.Empty, Element.Prefix, "test#01");
@@ -268,8 +270,8 @@ namespace MonoTests.System.Data.Xml
public void Navigator ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XPathNavigator Nav = doc.CreateNavigator ();
@@ -301,9 +303,9 @@ namespace MonoTests.System.Data.Xml
XmlDataDocument doc = new XmlDataDocument();
//Load the schema file.
doc.DataSet.ReadXmlSchema("Test/System.Xml/store.xsd");
doc.DataSet.ReadXmlSchema(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/store.xsd"));
//Load the XML data.
doc.Load("Test/System.Xml/2books.xml");
doc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/2books.xml"));
//Update the price on the first book using the DataSet methods.
DataTable books = doc.DataSet.Tables["book"];
@@ -371,10 +373,10 @@ namespace MonoTests.System.Data.Xml
{
DataSet RegionDS = new DataSet ();
DataRow RegionRow;
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
RegionDS.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
Assert.AreEqual (1, RegionDS.Tables.Count, "Was read correct?");
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load("Test/System.Xml/region.xml" );
DataDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml") );
RegionRow = RegionDS.Tables[0].Rows[0];
@@ -509,8 +511,8 @@ namespace MonoTests.System.Data.Xml
{
XmlDataDocument DataDoc = new XmlDataDocument ();
DataSet dataset = DataDoc.DataSet;
dataset.ReadXmlSchema ("Test/System.Xml/region.xsd");
DataDoc.Load("Test/System.Xml/region.xml" );
dataset.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
DataDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml") );
DataDoc.GetElementsByTagName ("Region") [0].RemoveAll ();
@@ -601,9 +603,9 @@ namespace MonoTests.System.Data.Xml
{
DataSet RegionDS = new DataSet ();
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
RegionDS.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load ("Test/System.Xml/region.xml");
DataDoc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
Assert.IsTrue (RegionDS.EnforceConstraints);
DataTable table = DataDoc.DataSet.Tables ["Region"];
DataRow newRow = table.NewRow ();
@@ -764,9 +766,9 @@ namespace MonoTests.System.Data.Xml
{
DataSet RegionDS = new DataSet ();
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
RegionDS.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load("Test/System.Xml/region.xml" );
DataDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml") );
try {
DataDoc.DocumentElement.AppendChild (DataDoc.DocumentElement.FirstChild);
Assert.Fail ("#G01");
@@ -819,9 +821,9 @@ namespace MonoTests.System.Data.Xml
{
DataSet RegionDS = new DataSet ();
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
RegionDS.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load("Test/System.Xml/region.xml" );
DataDoc.Load(TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml") );
DataDoc.DataSet.EnforceConstraints = false;
XmlElement newNode = DataDoc.CreateElement ("Region");
@@ -873,8 +875,8 @@ namespace MonoTests.System.Data.Xml
public void GetElementFromRow ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
DataTable table = doc.DataSet.Tables ["Region"];
XmlElement element = doc.GetElementFromRow (table.Rows [2]);
@@ -894,8 +896,8 @@ namespace MonoTests.System.Data.Xml
public void GetRowFromElement ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
doc.DataSet.ReadXmlSchema (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xsd"));
doc.Load (TestResourceHelper.GetFullPathOfResource ("Test/System.Xml/region.xml"));
XmlElement root = doc.DocumentElement;
DataRow row = doc.GetRowFromElement((XmlElement)root.FirstChild);

5
mcs/class/System.Data/corefx.unix.sources
View File

@@ -4,10 +4,9 @@
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeDeleteContext.cs
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeFreeCredentials.cs
../../../external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs
corefx/Interop.NetSecurityNative.cs
#../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs
../../../external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs
corefx/Interop.Libraries.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeDeleteNegoContext.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs

11
mcs/class/System.Data/corefx/Interop.Libraries.cs Normal file
View File

@@ -0,0 +1,11 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
internal static partial class Interop
{
internal static partial class Libraries
{
internal const string NetSecurityNative = "System.Net.Security.Native";
}
}

Some files were not shown because too many files have changed in this diff Show More