Skip to content

Commit

Permalink
2004-03-18 Atsushi Enomoto <atsushi@ximian.com>
Browse files Browse the repository at this point in the history 
	* XmlDataDocumentTest.cs : file path fixes.

svn path=/trunk/mcs/; revision=24280
  • Loading branch information
@atsushieno
atsushieno committed Mar 18, 2004
1 parent d4e180e commit 10aa5cb
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 29 deletions.
4 changes: 4 additions & 0 deletions mcs/class/System.Data/Test/System.Xml/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2004-03-18 Atsushi Enomoto <atsushi@ximian.com>

* XmlDataDocumentTest.cs : file path fixes.

2003-05-28 Ville Palo <vi64pa@kolumbus.fi>

* XmlDataDocumentTest.cs: fixed some tests. Now works better on ms.net
Expand Down
58 changes: 29 additions & 29 deletions mcs/class/System.Data/Test/System.Xml/XmlDataDocumentTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public void CloneNode ()
{
XmlDataDocument doc = new XmlDataDocument ();

doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");

XmlDataDocument doc2 = (XmlDataDocument)doc.CloneNode (false);

Expand All @@ -57,15 +57,15 @@ public void CloneNode ()
public void EditingXmlTree ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");

XmlElement Element = doc.GetElementFromRow (doc.DataSet.Tables [0].Rows [1]);
Element.FirstChild.InnerText = "64";
AssertEquals ("test#01", "64", doc.DataSet.Tables [0].Rows [1] [0]);

DataSet Set = new DataSet ();
Set.ReadXml ("System.Xml/region.xml");
Set.ReadXml ("Test/System.Xml/region.xml");
doc = new XmlDataDocument (Set);

Element = doc.GetElementFromRow (doc.DataSet.Tables [0].Rows [1]);
Expand All @@ -89,7 +89,7 @@ public void EditingXmlTree ()
[Test]
public void EditingDataSet ()
{
XmlReader Reader = new XmlTextReader ("System.Xml/region.xml");
XmlReader Reader = new XmlTextReader ("Test/System.Xml/region.xml");
XmlDataDocument Doc = new XmlDataDocument ();
Doc.DataSet.ReadXml (Reader);
AssertEquals ("test#01", "EndOfFile", Reader.ReadState.ToString ());
Expand All @@ -103,8 +103,8 @@ public void EditingDataSet ()
public void CreateElement1 ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");

XmlElement Element = doc.CreateElement ("prefix", "localname", "namespaceURI");
AssertEquals ("test#01", "prefix", Element.Prefix);
Expand Down Expand Up @@ -147,8 +147,8 @@ public void CreateElement1 ()
public void CreateElement2 ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");

XmlElement Element = doc.CreateElement ("ElementName");
AssertEquals ("test#01", "", Element.Prefix);
Expand All @@ -165,8 +165,8 @@ public void CreateElement2 ()
public void CreateElement3 ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");

XmlElement Element = doc.CreateElement ("ElementName", "namespace");
AssertEquals ("test#01", "", Element.Prefix);
Expand All @@ -183,8 +183,8 @@ public void CreateElement3 ()
public void Navigator ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");

XPathNavigator Nav = doc.CreateNavigator ();

Expand Down Expand Up @@ -218,10 +218,10 @@ public void Test1()
XmlDataDocument doc = new XmlDataDocument();

//Load the schema file.
doc.DataSet.ReadXmlSchema("System.Xml/store.xsd");
doc.DataSet.ReadXmlSchema("Test/System.Xml/store.xsd");
Console.WriteLine ("books: " + doc.DataSet.Tables.Count);
//Load the XML data.
doc.Load("System.Xml/2books.xml");
doc.Load("Test/System.Xml/2books.xml");

//Update the price on the first book using the DataSet methods.
DataTable books = doc.DataSet.Tables["book"];
Expand Down Expand Up @@ -290,9 +290,9 @@ public void Test2()
{
DataSet RegionDS = new DataSet ();
DataRow RegionRow;
RegionDS.ReadXmlSchema ("System.Xml/region.xsd");
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load("System.Xml/region.xml" );
DataDoc.Load("Test/System.Xml/region.xml" );


RegionRow = RegionDS.Tables[0].Rows[0];
Expand Down Expand Up @@ -429,8 +429,8 @@ public void Test3()
{
XmlDataDocument DataDoc = new XmlDataDocument ();
DataSet dataset = DataDoc.DataSet;
dataset.ReadXmlSchema ("System.Xml/region.xsd");
DataDoc.Load("System.Xml/region.xml" );
dataset.ReadXmlSchema ("Test/System.Xml/region.xsd");
DataDoc.Load("Test/System.Xml/region.xml" );

DataDoc.GetElementsByTagName ("Region") [0].RemoveAll ();

Expand Down Expand Up @@ -517,9 +517,9 @@ public void Test4 ()
{
DataSet RegionDS = new DataSet ();

RegionDS.ReadXmlSchema ("System.Xml/region.xsd");
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load("System.Xml/region.xml" );
DataDoc.Load("Test/System.Xml/region.xml" );
DataTable table = DataDoc.DataSet.Tables ["Region"];
DataRow newRow = table.NewRow ();
newRow [0] = "new row";
Expand Down Expand Up @@ -675,9 +675,9 @@ public void Test5 ()
{
DataSet RegionDS = new DataSet ();

RegionDS.ReadXmlSchema ("System.Xml/region.xsd");
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load("System.Xml/region.xml" );
DataDoc.Load("Test/System.Xml/region.xml" );
try {
DataDoc.DocumentElement.AppendChild (DataDoc.DocumentElement.FirstChild);
Fail ("#G01");
Expand Down Expand Up @@ -731,7 +731,7 @@ public void Test6 ()
{
DataSet RegionDS = new DataSet ();

RegionDS.ReadXmlSchema ("System.Xml/region.xsd");
RegionDS.ReadXmlSchema ("Test/System.Xml/region.xsd");
XmlDataDocument DataDoc = new XmlDataDocument (RegionDS);
DataDoc.Load("System.Xml/region.xml" );
DataDoc.DataSet.EnforceConstraints = false;
Expand Down Expand Up @@ -788,8 +788,8 @@ public void Test6 ()
public void GetElementFromRow ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
DataTable table = doc.DataSet.Tables ["Region"];

XmlElement element = doc.GetElementFromRow (table.Rows [2]);
Expand All @@ -809,8 +809,8 @@ public void GetElementFromRow ()
public void GetRowFromElement ()
{
XmlDataDocument doc = new XmlDataDocument ();
doc.DataSet.ReadXmlSchema ("System.Xml/region.xsd");
doc.Load ("System.Xml/region.xml");
doc.DataSet.ReadXmlSchema ("Test/System.Xml/region.xsd");
doc.Load ("Test/System.Xml/region.xml");
XmlElement root = doc.DocumentElement;

DataRow row = doc.GetRowFromElement((XmlElement)root.FirstChild);
Expand Down

0 comments on commit 10aa5cb

Please sign in to comment.