From: mrj001 <62225294+mrj001@users.noreply.github.com>
Date: Mon, 13 Apr 2020 23:26:38 +0000 (-0600)
Subject: Issue incorrect exception message (#34416)
X-Git-Tag: submit/tizen/20210909.063632~8594
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=13dce8d53393a7b839f9401ffa827e7046d71ce0;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Issue incorrect exception message (#34416)

* Created unit test to trigger incorrect error message.  This also covers a previously uncovered branch.

* Added string resource for the fractionDigits error, and changed the error message being thrown when the derived type has a larger fractionDigits value than the parent type.
---

diff --git a/src/libraries/System.Private.Xml/src/Resources/Strings.resx b/src/libraries/System.Private.Xml/src/Resources/Strings.resx
index ca4b85c..e204228 100644
--- a/src/libraries/System.Private.Xml/src/Resources/Strings.resx
+++ b/src/libraries/System.Private.Xml/src/Resources/Strings.resx
@@ -1,4 +1,5 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
   <!-- 
     Microsoft ResX Schema 
     
@@ -1763,6 +1764,9 @@
   <data name="Sch_TotalDigitsMismatch" xml:space="preserve">
     <value>It is an error if the derived 'totalDigits' facet value is greater than the parent 'totalDigits' facet value.</value>
   </data>
+  <data name="Sch_FractionDigitsMismatch" xml:space="preserve">
+    <value>It is an error if the derived 'fractionDigits' facet value is greater than the parent 'fractionDigits' facet value.</value>
+  </data>
   <data name="Sch_FacetBaseFixed" xml:space="preserve">
     <value>Values that are declared as {fixed} in a base type can not be changed in a derived type.</value>
   </data>
@@ -3452,4 +3456,4 @@ Usage: dotnet {0} [--assembly &lt;assembly file path&gt;] [--type &lt;type name&
   <data name="CompilingScriptsNotSupported" xml:space="preserve">
     <value>Compiling JScript/CSharp scripts is not supported</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/FacetChecker.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/FacetChecker.cs
index fd0cffa..e04a2f1 100644
--- a/src/libraries/System.Private.Xml/src/System/Xml/Schema/FacetChecker.cs
+++ b/src/libraries/System.Private.Xml/src/System/Xml/Schema/FacetChecker.cs
@@ -338,7 +338,7 @@ namespace System.Xml.Schema
                 {
                     if (_derivedRestriction.FractionDigits > _datatype.Restriction.FractionDigits)
                     {
-                        throw new XmlSchemaException(SR.Sch_TotalDigitsMismatch, string.Empty);
+                        throw new XmlSchemaException(SR.Sch_FractionDigitsMismatch, string.Empty);
                     }
                 }
                 SetFlag(facet, RestrictionFlags.FractionDigits);
diff --git a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Compile.cs b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Compile.cs
index d169d98..80842b9 100644
--- a/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Compile.cs
+++ b/src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Compile.cs
@@ -149,5 +149,32 @@ namespace System.Xml.Tests
                 Assert.Equal(0, errorCount);
             }
         }
+
+        [Fact]
+        public void FractionDigitsMismatch_Throws()
+        {
+            string schema = @"<?xml version='1.0' encoding='utf-8' ?>
+<xs:schema elementFormDefault='qualified'
+           xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+    <xs:simpleType name='foo'>
+        <xs:restriction base='xs:decimal'>
+            <xs:fractionDigits value='8' fixed='true'/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name='bar'>
+        <xs:restriction base='foo'>
+            <xs:fractionDigits value='9'/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
+";
+
+            XmlSchemaSet ss = new XmlSchemaSet();
+            ss.Add(null, XmlReader.Create(new StringReader(schema)));
+
+            Exception ex = Assert.Throws<XmlSchemaException>(() => ss.Compile());
+            Assert.Contains("fractionDigits", ex.Message);
+            Assert.DoesNotContain("totalDigits", ex.Message);
+        }
     }
 }