projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 68fcef6)
2008-06-17 Atsushi Enomoto <atsushi@ximian.com>
authorAtsushi Eno <atsushieno@gmail.com>
Tue, 17 Jun 2008 10:18:50 +0000 (10:18 -0000)
committerAtsushi Eno <atsushieno@gmail.com>
Tue, 17 Jun 2008 10:18:50 +0000 (10:18 -0000)
* TestFile3.xml, TestFile5.xml : they do not match what should be
  actually written and causes svn diff mess.

svn path=/trunk/mcs/; revision=105975

mcs/class/System.Data/Test/System.Data/ChangeLog patch | blob | history
mcs/class/System.Data/Test/System.Data/TestFile3.xml patch | blob | history
mcs/class/System.Data/Test/System.Data/TestFile5.xml patch | blob | history

diff --git a/mcs/class/System.Data/Test/System.Data/ChangeLog b/mcs/class/System.Data/Test/System.Data/ChangeLog
index 8811a754a1f0cb1100b806ae07485989d313c663..3d7cd18f71bbccaaa03ad997311e3d67cdc17f07 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-17  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * TestFile3.xml, TestFile5.xml : they do not match what should be
+         actually written and causes svn diff mess.
+
 2008-06-16  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DataColumnTest.cs : fixed Defaults3() case. After changing some
diff --git a/mcs/class/System.Data/Test/System.Data/TestFile3.xml b/mcs/class/System.Data/Test/System.Data/TestFile3.xml
index c7037079aa5888b2509617ba112f952068d9701f..40d61ae937d6298728b15ee22e71765b42743042 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/TestFile3.xml
+++ b/mcs/class/System.Data/Test/System.Data/TestFile3.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema id="XmlSchemaDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-  <xs:element name="XmlSchemaDataSet" msdata:IsDataSet="true" msdata:MainDataTable="ParentTable" msdata:UseCurrentLocale="true">
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="ParentTable">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="id" type="xs:int" />
-              <xs:element name="ParentItem" type="xs:string" minOccurs="0" />
-              <xs:element name="DepartmentID" type="xs:int" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:choice>
-    </xs:complexType>
-    <xs:unique name="Constraint1">
-      <xs:selector xpath=".//ParentTable" />
-      <xs:field xpath="id" />
-    </xs:unique>
-    <xs:unique name="Constraint2" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//ParentTable" />
-      <xs:field xpath="id" />
-      <xs:field xpath="DepartmentID" />
-    </xs:unique>
-  </xs:element>
+<?xml version="1.0"?>\r
+<xs:schema id="XmlSchemaDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
+  <xs:element name="XmlSchemaDataSet" msdata:IsDataSet="true" msdata:MainDataTable="ParentTable" msdata:UseCurrentLocale="true">\r
+    <xs:complexType>\r
+      <xs:choice minOccurs="0" maxOccurs="unbounded">\r
+        <xs:element name="ParentTable">\r
+          <xs:complexType>\r
+            <xs:sequence>\r
+              <xs:element name="id" type="xs:int" />\r
+              <xs:element name="ParentItem" type="xs:string" minOccurs="0" />\r
+              <xs:element name="DepartmentID" type="xs:int" />\r
+            </xs:sequence>\r
+          </xs:complexType>\r
+        </xs:element>\r
+      </xs:choice>\r
+    </xs:complexType>\r
+    <xs:unique name="Constraint1">\r
+      <xs:selector xpath=".//ParentTable" />\r
+      <xs:field xpath="id" />\r
+    </xs:unique>\r
+    <xs:unique name="Constraint2" msdata:PrimaryKey="true">\r
+      <xs:selector xpath=".//ParentTable" />\r
+      <xs:field xpath="id" />\r
+      <xs:field xpath="DepartmentID" />\r
+    </xs:unique>\r
+  </xs:element>\r
 </xs:schema>
\ No newline at end of file
diff --git a/mcs/class/System.Data/Test/System.Data/TestFile5.xml b/mcs/class/System.Data/Test/System.Data/TestFile5.xml
index 9a612627d5117a98f1912e99023a43654741838f..3223ce3c001f99be069a6fddfc143599e8ac0886 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data/TestFile5.xml
+++ b/mcs/class/System.Data/Test/System.Data/TestFile5.xml
@@ -1,111 +1 @@
-<NewDataSet>
-  <xs:schema id="NewDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xs:element name="NewDataSet" msdata:IsDataSet="true" msdata:MainDataTable="Parent" msdata:UseCurrentLocale="true">
-      <xs:complexType>
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="Parent">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="col1" type="xs:int" minOccurs="0" />
-                <xs:element name="col2" type="xs:string" minOccurs="0" />
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="Child1">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="col3" type="xs:int" minOccurs="0" />
-                <xs:element name="col4" type="xs:string" minOccurs="0" />
-                <xs:element name="col5" type="xs:int" minOccurs="0" />
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-          <xs:element name="Child2">
-            <xs:complexType>
-              <xs:sequence>
-                <xs:element name="col6" type="xs:int" minOccurs="0" />
-                <xs:element name="col7" type="xs:string" minOccurs="0" />
-              </xs:sequence>
-            </xs:complexType>
-          </xs:element>
-        </xs:choice>
-      </xs:complexType>
-      <xs:unique name="Constraint1">
-        <xs:selector xpath=".//Parent" />
-        <xs:field xpath="col1" />
-      </xs:unique>
-      <xs:unique name="Child1_Constraint1" msdata:ConstraintName="Constraint1">
-        <xs:selector xpath=".//Child1" />
-        <xs:field xpath="col5" />
-      </xs:unique>
-      <xs:keyref name="Relation1" refer="Constraint1">
-        <xs:selector xpath=".//Child1" />
-        <xs:field xpath="col3" />
-      </xs:keyref>
-      <xs:keyref name="Relation2" refer="Child1_Constraint1">
-        <xs:selector xpath=".//Child2" />
-        <xs:field xpath="col6" />
-      </xs:keyref>
-    </xs:element>
-  </xs:schema>
-  <Parent>
-    <col1>1</col1>
-    <col2>P_</col2>
-  </Parent>
-  <Parent>
-    <col1>2</col1>
-    <col2>P_</col2>
-  </Parent>
-  <Child1>
-    <col3>1</col3>
-    <col4>C1_</col4>
-    <col5>3</col5>
-  </Child1>
-  <Child1>
-    <col3>1</col3>
-    <col4>C1_</col4>
-    <col5>4</col5>
-  </Child1>
-  <Child1>
-    <col3>2</col3>
-    <col4>C1_</col4>
-    <col5>5</col5>
-  </Child1>
-  <Child1>
-    <col3>2</col3>
-    <col4>C1_</col4>
-    <col5>6</col5>
-  </Child1>
-  <Child2>
-    <col6>3</col6>
-    <col7>C2_</col7>
-  </Child2>
-  <Child2>
-    <col6>3</col6>
-    <col7>C2_</col7>
-  </Child2>
-  <Child2>
-    <col6>4</col6>
-    <col7>C2_</col7>
-  </Child2>
-  <Child2>
-    <col6>4</col6>
-    <col7>C2_</col7>
-  </Child2>
-  <Child2>
-    <col6>5</col6>
-    <col7>C2_</col7>
-  </Child2>
-  <Child2>
-    <col6>5</col6>
-    <col7>C2_</col7>
-  </Child2>
-  <Child2>
-    <col6>6</col6>
-    <col7>C2_</col7>
-  </Child2>
-  <Child2>
-    <col6>6</col6>
-    <col7>C2_</col7>
-  </Child2>
-</NewDataSet>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?><start><xs:schema id="NewDataSet" xmlns="" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"><xs:element name="NewDataSet" msdata:IsDataSet="true" msdata:MainDataTable="Parent" msdata:UseCurrentLocale="true"><xs:complexType><xs:choice minOccurs="0" maxOccurs="unbounded"><xs:element name="Parent"><xs:complexType><xs:sequence><xs:element name="col1" type="xs:int" minOccurs="0" /><xs:element name="col2" type="xs:string" minOccurs="0" /></xs:sequence></xs:complexType></xs:element></xs:choice></xs:complexType><xs:unique name="Constraint1"><xs:selector xpath=".//Parent" /><xs:field xpath="col1" /></xs:unique></xs:element></xs:schema><diffgr:diffgram xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:diffgr="urn:schemas-microsoft-com:xml-diffgram-v1"><NewDataSet><Parent diffgr:id="Parent1" msdata:rowOrder="0" diffgr:hasChanges="inserted"><col1>1</col1><col2>P_</col2></Parent><Parent diffgr:id="Parent2" msdata:rowOrder="1" diffgr:hasChanges="inserted"><col1>2</col1><col2>P_</col2></Parent></NewDataSet></diffgr:diffgram></start>
\ No newline at end of file
my mono mirror. check out Moved to http://github.com/mono/mono