Explorar el Código

2004-04-24 Atsushi Enomoto <[email protected]>

	Updated all nist_dom tests.
	* Don't check locale-dependent message. Just check type name.

svn path=/trunk/mcs/; revision=25935
Atsushi Eno hace 22 años
padre
commit
0bbdf65532

+ 3 - 3
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs

@@ -764,7 +764,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlNode testNode = null;
             System.Xml.XmlAttribute readOnlyAttribute = null;
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0014A");
             try
@@ -785,9 +785,9 @@ namespace nist_dom.fundamental
                 {
                     readOnlyAttribute.Value = "ABCD";
                 }
-                catch(System.Exception ex)
+                catch (ArgumentException ex)
                 {
-                    computedValue = ex.Message;
+                    computedValue = ex.GetType ().FullName;
                 }
             }
             catch(System.Exception ex)

+ 5 - 0
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/ChangeLog

@@ -1,3 +1,8 @@
+2004-04-24  Atsushi Enomoto <[email protected]>
+
+	* Attr.cs : Don't check locale-dependent message.
+	  Just check type name.
+
 2004-03-31  Atsushi Enomoto <[email protected]>
 
 	* Added nist_dom tests by Mainsoft hackers.

+ 5 - 0
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/CharacterData/ChangeLog

@@ -1,3 +1,8 @@
+2004-04-24  Atsushi Enomoto <[email protected]>
+
+	* CharacterData.cs : Don't check locale-dependent message.
+	  Just check type name.
+
 2004-03-31  Atsushi Enomoto <[email protected]>
 
 	* Added nist_dom tests by Mainsoft hackers.

+ 14 - 14
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/CharacterData/CharacterData.cs

@@ -1160,7 +1160,7 @@ namespace nist_dom.fundamental
 			string computedValue = "";
 			System.Xml.XmlNode testNode = null;
 			System.Xml.XmlText readOnlyText = null;
-			string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+			string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
 			testResults results = new testResults("Core0021C");
 			try
@@ -1179,12 +1179,12 @@ namespace nist_dom.fundamental
 				{
 					readOnlyText.Data = "ABCD";
 				}
-				catch(System.Exception ex) 
+				catch (ArgumentException ex) 
 				{
-					computedValue = ex.Message; 
+					computedValue = ex.GetType ().FullName; 
 				}
 			}
-			catch(System.Exception ex)
+			catch(InvalidOperationException ex)
 			{
 				computedValue = "Exception " + ex.Message;
 			}
@@ -1222,7 +1222,7 @@ namespace nist_dom.fundamental
 			string computedValue = "";
 			System.Xml.XmlNode testNode = null;
 			System.Xml.XmlCharacterData readOnlyNode = null;
-			string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+			string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
 			testResults results = new testResults("Core0022C");
 			try
@@ -1242,9 +1242,9 @@ namespace nist_dom.fundamental
 				{
 					readOnlyNode.AppendData("002");
 				}
-				catch(System.Exception ex) 
+				catch(ArgumentException ex) 
 				{
-					computedValue = ex.Message; 
+					computedValue = ex.GetType ().FullName; 
 				}
 			}
 			catch(System.Exception ex)
@@ -1284,7 +1284,7 @@ namespace nist_dom.fundamental
 			string computedValue = "";
 			System.Xml.XmlNode testNode = null;
 			System.Xml.XmlCharacterData readOnlyNode = null;
-			string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+			string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
 			testResults results = new testResults("Core0023C");
 			try
@@ -1304,9 +1304,9 @@ namespace nist_dom.fundamental
 				{
 					readOnlyNode.InsertData(2,"ABCD");
 				}
-				catch(System.Exception ex) 
+				catch(ArgumentException ex) 
 				{
-					computedValue = ex.Message; 
+					computedValue = ex.GetType ().FullName; 
 				}
 			}
 			catch(System.Exception ex)
@@ -1346,7 +1346,7 @@ namespace nist_dom.fundamental
 			string computedValue = "";
 			System.Xml.XmlCharacterData readOnlyNode = null;
 			System.Xml.XmlNode testNode = null;
-			string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+			string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
 			testResults results = new testResults("Core0024C");
 			try
@@ -1369,7 +1369,7 @@ namespace nist_dom.fundamental
 				}
 				catch(System.Exception ex) 
 				{
-					computedValue = ex.Message; 
+					computedValue = ex.GetType ().FullName; 
 				}
 			}
 			catch(System.Exception ex)
@@ -1409,7 +1409,7 @@ namespace nist_dom.fundamental
 			string computedValue = "";
 			System.Xml.XmlCharacterData readOnlyNode = null;
 			System.Xml.XmlNode testNode = null;
-			string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+			string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
 			testResults results = new testResults("Core0025C");
 			try
@@ -1432,7 +1432,7 @@ namespace nist_dom.fundamental
 				}
 				catch(System.Exception ex) 
 				{
-					computedValue = ex.Message; 
+					computedValue = ex.GetType ().FullName; 
 				}
 			}
 			catch(System.Exception ex)

+ 5 - 0
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Document/ChangeLog

@@ -1,3 +1,8 @@
+2004-04-24  Atsushi Enomoto <[email protected]>
+
+	* Document.cs : Don't check locale-dependent message.
+	  Just check type name.
+
 2004-03-31  Atsushi Enomoto <[email protected]>
 
 	* Added nist_dom tests by Mainsoft hackers.

+ 11 - 11
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Document/Document.cs

@@ -958,13 +958,13 @@ namespace nist_dom.fundamental
             }
             catch(System.Exception ex)
             {
-                computedValue = ex.Message;
+                computedValue = ex.GetType ().FullName;
             }
 
             //
             // Write out results.
             //
-            results.expected = expectedValue;
+            results.expected = typeof (ArgumentException).FullName; // MS.NET BUG: It never raise an error.
             results.actual = computedValue;
 
             util.resetData();
@@ -1016,13 +1016,13 @@ namespace nist_dom.fundamental
             }
             catch(System.Exception ex)
             {
-                computedValue = ex.Message;
+                computedValue = ex.GetType ().FullName;
             }
 
             //
             // Write out results.
             //
-            results.expected = expectedValue;
+            results.expected = typeof (ArgumentException).FullName; // MS.NET BUG: It never raises an error.
             results.actual = computedValue;
 
             util.resetData();
@@ -1051,7 +1051,7 @@ namespace nist_dom.fundamental
 	public void core0021D()
         {
             string computedValue = "";
-            string expectedValue = util.INVALID_CHARACTER_ERR;
+            string expectedValue = "System.Xml.XmlException";//util.INVALID_CHARACTER_ERR;
             System.Xml.XmlDocument testNode = null;
             System.Xml.XmlEntityReference invalidEntRef = null;
 
@@ -1072,9 +1072,9 @@ namespace nist_dom.fundamental
             {
                 invalidEntRef =  testNode.CreateEntityReference("invalid^Name");
             }
-            catch(System.Exception ex)
+            catch(XmlException ex)
             {
-                computedValue = ex.Message;
+                computedValue = ex.GetType ().FullName;
             }
             //
             // Write out results.
@@ -1109,7 +1109,7 @@ namespace nist_dom.fundamental
 	public void core0022D()
         {
             string computedValue = "";
-            string expectedValue = util.INVALID_CHARACTER_ERR;
+            string expectedValue = "System.Xml.XmlException";//util.INVALID_CHARACTER_ERR;
             System.Xml.XmlDocument testNode = null;
             System.Xml.XmlProcessingInstruction invalidPI = null;
 
@@ -1130,9 +1130,9 @@ namespace nist_dom.fundamental
             {
                 invalidPI =  testNode.CreateProcessingInstruction("invalid^target","data");
             }
-            catch(System.Exception ex)
+            catch(XmlException ex)
             {
-                computedValue = ex.Message;
+                computedValue = ex.GetType ().FullName;
             }
 
             //
@@ -1283,7 +1283,7 @@ namespace nist_dom.fundamental
 	public void core0025D()
         {
             string computedValue = "";
-            string expectedValue = util.NOT_SUPPORTED_ERR;
+            string expectedValue = "";//util.NOT_SUPPORTED_ERR;
             System.Xml.XmlDocument testNode = null;
             System.Xml.XmlEntityReference invalidEntRef = null;
 

+ 5 - 0
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Element/ChangeLog

@@ -1,3 +1,8 @@
+2004-04-24  Atsushi Enomoto <[email protected]>
+
+	* Element.cs : Don't check locale-dependent message.
+	  Just check type name.
+
 2004-03-31  Atsushi Enomoto <[email protected]>
 
 	* Added nist_dom tests by Mainsoft hackers.

+ 11 - 11
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Element/Element.cs

@@ -1415,7 +1415,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlEntity entityNode = null;
             System.Xml.XmlElement entityDesc = null;
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0024E");
             try
@@ -1437,7 +1437,7 @@ namespace nist_dom.fundamental
                 }
                 catch(System.Exception ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -1475,7 +1475,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlEntity entityNode = null;
             System.Xml.XmlElement entityDesc = null;
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0025E");
             try
@@ -1496,7 +1496,7 @@ namespace nist_dom.fundamental
                 }
                 catch(System.Exception ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -1536,7 +1536,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlEntity entityNode = null;
             System.Xml.XmlElement entityDesc = null;
             System.Xml.XmlAttribute newAttr = (System.Xml.XmlAttribute)util.createNode(util.ATTRIBUTE_NODE,"newAttribute");
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0026E");
             try
@@ -1557,7 +1557,7 @@ namespace nist_dom.fundamental
                 }
                 catch(System.Exception ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -1597,7 +1597,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlEntity entityNode = null;
             System.Xml.XmlElement entityDesc = null;
             System.Xml.XmlAttribute oldAttribute = null;
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0027E");
             try
@@ -1620,7 +1620,7 @@ namespace nist_dom.fundamental
                 }
                 catch(System.Exception ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -1795,7 +1795,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlElement addressElement = null;
             System.Xml.XmlAttribute oldAttribute = (System.Xml.XmlAttribute)util.createNode(util.ATTRIBUTE_NODE,"oldAttribute");
-            string expectedValue = util.NOT_FOUND1_ERR;
+            string expectedValue = "System.ArgumentException";//util.NOT_FOUND1_ERR;
 
             testResults results = new testResults("Core0030E");
             try
@@ -1814,9 +1814,9 @@ namespace nist_dom.fundamental
                 {
                     addressElement.RemoveAttributeNode(oldAttribute);//.node.
                 }
-                catch(System.Exception ex) 
+                catch(ArgumentException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)

+ 5 - 0
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/NamedNodeMap/ChangeLog

@@ -1,3 +1,8 @@
+2004-04-24  Atsushi Enomoto <[email protected]>
+
+	* NamedNodeMap.cs : Don't check locale-dependent message. 
+	  Just check type name.
+
 2004-03-31  Atsushi Enomoto <[email protected]>
 
 	* Added nist_dom tests by Mainsoft hackers.

+ 5 - 5
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/NamedNodeMap/NamedNodeMap.cs

@@ -1042,7 +1042,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlNode testNode = null;
             System.Xml.XmlNode entityDesc;
             System.Xml.XmlAttribute newAttrNode = (System.Xml.XmlAttribute)util.createNode(util.ATTRIBUTE_NODE,"newAttribute");
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0019M");
 
@@ -1060,9 +1060,9 @@ namespace nist_dom.fundamental
             {
                 entityDesc.Attributes.SetNamedItem(newAttrNode);
             }
-            catch(System.Exception ex) 
+            catch(ArgumentException ex) 
             {
-                computedValue = ex.Message; 
+                computedValue = ex.GetType ().FullName; 
             }
 
 
@@ -1099,7 +1099,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlAttribute inUseAttribute = null;
             System.Xml.XmlElement firstEmployee = null;
             System.Xml.XmlNode testNode = null;
-            string expectedValue = util.INUSE_ATTRIBUTE_ERR;
+            string expectedValue = "System.ArgumentException";//util.INUSE_ATTRIBUTE_ERR;
 
             testResults results = new testResults("Core0020M");
             try
@@ -1123,7 +1123,7 @@ namespace nist_dom.fundamental
                 }
                 catch (System.Exception ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
 
             }

+ 4 - 0
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Node/ChangeLog

@@ -1,3 +1,7 @@
+2004-04-24  Atsushi Enomoto <[email protected]>
+
+	* Node.cs : Don't check locale-dependent message. Just check type name.
+
 2004-03-31  Atsushi Enomoto <[email protected]>
 
 	* Added nist_dom tests by Mainsoft hackers.

+ 27 - 27
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Node/Node.cs

@@ -265,7 +265,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlNode testNode = null;
             System.Xml.XmlNode entRefNode = null;
-            int expectedValue = util.ENTITY_REFERENCE_NODE;
+            string expectedValue = XmlNodeType.EntityReference.ToString ();//util.ENTITY_REFERENCE_NODE;
 
             testResults results = new testResults("Core0005NO");
             try
@@ -4239,7 +4239,7 @@ namespace nist_dom.fundamental
                 else
                     expectedValue = "street domestic";
             }
-            catch(System.Exception ex)
+            catch(Exception ex)
             {
                 computedValue = "Exception " + ex.Message;
             }
@@ -4276,7 +4276,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlEntity testNode = null;
             System.Xml.XmlText entityDesc = null;
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0087NO");
             try
@@ -4298,7 +4298,7 @@ namespace nist_dom.fundamental
                 }
                 catch(System.Exception ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -4341,7 +4341,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlEntityReference entityRefNode = null;
             System.Xml.XmlNode refChild = null;
             System.Xml.XmlElement newChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"newChild");
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.InvalidOperationException";//util.NO_MODIFICATION_ALLOWED_ERR;
  
             testResults results = new testResults("Core0088NO");
             try
@@ -4363,9 +4363,9 @@ namespace nist_dom.fundamental
                 {
                     entityRefNode.InsertBefore(newChild,refChild);
                 }
-                catch(System.Exception ex) 
+                catch(InvalidOperationException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -4407,7 +4407,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlEntityReference entityRefNode = null;
             System.Xml.XmlNode oldChild = null;
             System.Xml.XmlElement newChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"newChild");
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0089NO");
             try
@@ -4429,9 +4429,9 @@ namespace nist_dom.fundamental
                 {
                     entityRefNode.ReplaceChild(newChild,oldChild);
                 }
-                catch(System.Exception ex) 
+                catch(ArgumentException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -4470,7 +4470,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlEntityReference entityRefNode = null;
             System.Xml.XmlNode testNode = null;
             System.Xml.XmlNode oldChild = null;
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0090NO");
             try
@@ -4492,9 +4492,9 @@ namespace nist_dom.fundamental
                 {
                     entityRefNode.RemoveChild(oldChild);
                 }
-                catch(System.Exception ex) 
+                catch(ArgumentException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -4536,7 +4536,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlEntityReference entityRefNode = null;
             System.Xml.XmlNode testNode = null;
             System.Xml.XmlElement newChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"newChild");
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.InvalidOperationException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0091NO");
             try
@@ -4557,9 +4557,9 @@ namespace nist_dom.fundamental
                 {
                     entityRefNode.AppendChild(newChild);
                 }
-                catch(System.Exception ex) 
+                catch(InvalidOperationException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -4786,7 +4786,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlNode newChild = null;
             System.Xml.XmlNode oldChild = null;
             System.Xml.XmlElement testNode = null;
-            string expectedValue = "System.ArgumentException";
+            string expectedValue = "System.InvalidOperationException";
 
             testResults results = new testResults("Core0095NO");
             try
@@ -4807,7 +4807,7 @@ namespace nist_dom.fundamental
                 {
                     testNode.ReplaceChild(newChild,oldChild);//.node.
                 }
-                catch(System.Exception ex) 
+                catch(InvalidOperationException ex) 
                 {
                     computedValue = ex.GetType().ToString(); 
                 }
@@ -4971,7 +4971,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlElement newChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"newChild");
             System.Xml.XmlElement refChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"refChild");
             System.Xml.XmlNode testNode = null;
-            string expectedValue = util.NOT_FOUND2_ERR;
+            string expectedValue = "System.ArgumentException";//util.NOT_FOUND2_ERR;
 
             testResults results = new testResults("Core0098NO");
             try
@@ -4991,9 +4991,9 @@ namespace nist_dom.fundamental
                 {
                     testNode.InsertBefore(newChild,refChild);//.node.
                 }
-                catch(System.Exception ex) 
+                catch(ArgumentException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -5032,7 +5032,7 @@ namespace nist_dom.fundamental
             System.Xml.XmlElement newChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"newChild");
             System.Xml.XmlElement oldChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"oldChild");
             System.Xml.XmlNode testNode = null;
-            string expectedValue = util.NOT_FOUND2_ERR;
+            string expectedValue = "System.ArgumentException";//util.NOT_FOUND2_ERR;
 
             testResults results = new testResults("Core0099NO");
             try
@@ -5051,9 +5051,9 @@ namespace nist_dom.fundamental
                 {
                     testNode.ReplaceChild(newChild,oldChild);//.node.
                 }
-                catch(System.Exception ex) 
+                catch(ArgumentException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)
@@ -5091,7 +5091,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlElement oldChild = (System.Xml.XmlElement)util.createNode(util.ELEMENT_NODE,"oldChild");
             System.Xml.XmlNode testNode = null;
-            string expectedValue = util.NOT_FOUND3_ERR;
+            string expectedValue = typeof (ArgumentException).FullName;//util.NOT_FOUND3_ERR;
 
             testResults results = new testResults("Core0100NO");
             try
@@ -5110,9 +5110,9 @@ namespace nist_dom.fundamental
                 {
                     testNode.RemoveChild(oldChild);//.node.
                 }
-                catch(System.Exception ex) 
+                catch(ArgumentException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
             }
             catch(System.Exception ex)

+ 4 - 0
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Text/ChangeLog

@@ -1,3 +1,7 @@
+2004-04-24  Atsushi Enomoto <[email protected]>
+
+	* Text.cs : Don't check locale-dependent message. Just check type name.
+
 2004-03-31  Atsushi Enomoto <[email protected]>
 
 	* Added nist_dom tests by Mainsoft hackers.

+ 3 - 3
mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Text/Text.cs

@@ -546,7 +546,7 @@ namespace nist_dom.fundamental
             string computedValue = "";
             System.Xml.XmlNode testNode = null;
             System.Xml.XmlText readOnlyText = null;
-            string expectedValue = util.NO_MODIFICATION_ALLOWED_ERR;
+            string expectedValue = "System.ArgumentException";//util.NO_MODIFICATION_ALLOWED_ERR;
 
             testResults results = new testResults("Core0009T");
             try
@@ -565,9 +565,9 @@ namespace nist_dom.fundamental
                 {
                     readOnlyText.SplitText(5);
                 }
-                catch(System.Exception ex) 
+                catch(ArgumentException ex) 
                 {
-                    computedValue = ex.Message; 
+                    computedValue = ex.GetType ().FullName; 
                 }
 
             }