Fix issue #51778 and add more test coverage for xs:restrictions.

[lovettchris]

Fixes #51778

Implemented a simple fix which is to remove the check below:

 || derivdSequence.Items.Count > baseChoice.Items.Count)

from the following method as it is actually bogus. In the xsd:restriction case the number of immediate child particles in the sequence or in the choice cannot be compared like this since GetMappingParticle is actually recursive.

        private bool IsSequenceFromChoice(XmlSchemaSequence derivedSequence, XmlSchemaChoice baseChoice)
        {
            decimal minOccurs, maxOccurs;
            minOccurs = derivedSequence.MinOccurs * derivedSequence.Items.Count;
            if (derivedSequence.MaxOccurs == decimal.MaxValue)
            {
                maxOccurs = decimal.MaxValue;
            }
            else
            {
                maxOccurs = derivedSequence.MaxOccurs * derivedSequence.Items.Count;
            }
            if (!IsValidOccurrenceRangeRestriction(minOccurs, maxOccurs, baseChoice.MinOccurs, baseChoice.MaxOccurs)
                 || derivdSequence.Items.Count > baseChoice.Items.Count)
            {
                return false;
            }
            for (int i = 0; i < derivedSequence.Items.Count; ++i)
            {
                if (GetMappingParticle((XmlSchemaParticle)derivedSequence.Items[i], baseChoice.Items) < 0)
                    return false;
            }
            return true;
        }

[ghost]

Tagging subscribers to this area: @buyaa-n, @krwq
See info in area-owners.md if you want to be subscribed.

Issue Details

---

Implemented a simple fix which is to remove the check below:

 || derivdSequence.Items.Count > baseChoice.Items.Count)

from the following method as it is actually bogus. In the xsd:restriction case the number of immediate child particles in the sequence or in the choice cannot be compared like this since GetMappingParticle is actually recursive.

        private bool IsSequenceFromChoice(XmlSchemaSequence derivedSequence, XmlSchemaChoice baseChoice)
        {
            decimal minOccurs, maxOccurs;
            minOccurs = derivedSequence.MinOccurs * derivedSequence.Items.Count;
            if (derivedSequence.MaxOccurs == decimal.MaxValue)
            {
                maxOccurs = decimal.MaxValue;
            }
            else
            {
                maxOccurs = derivedSequence.MaxOccurs * derivedSequence.Items.Count;
            }
            if (!IsValidOccurrenceRangeRestriction(minOccurs, maxOccurs, baseChoice.MinOccurs, baseChoice.MaxOccurs)
                 || derivdSequence.Items.Count > baseChoice.Items.Count)
            {
                return false;
            }
            for (int i = 0; i < derivedSequence.Items.Count; ++i)
            {
                if (GetMappingParticle((XmlSchemaParticle)derivedSequence.Items[i], baseChoice.Items) < 0)
                    return false;
            }
            return true;
        }

Author:	lovettchris
Assignees:	-
Labels:	area-System.Xml
Milestone:	-

[danmoseley]

Thanks @lovettchris !

[danmoseley]

Some tests failed eg

10:29:14] info: System.Xml.Schema.XmlSchemaException : Invalid particle derivation by restriction - 'The derived sequence particle at (22, 6) is not a valid restriction of the base choice particle at (7, 4) according to Sequence:Choice -- MapAndSum.'.

https://dev.azure.com/dnceng/public/_build/results?buildId=1105728&view=ms.vss-test-web.build-test-results-tab

[lovettchris]

Yeah, I missed a fix, but at least this proves the new tests I added are working and show that schema validation is broken in this case 🙂 The next build should succeed.

…

________________________________ From: Dan Moseley ***@***.***> Sent: Saturday, April 24, 2021 9:38 AM To: dotnet/runtime ***@***.***> Cc: Chris Lovett ***@***.***>; Mention ***@***.***> Subject: Re: [dotnet/runtime] Fix issue #51778 and add more test coverage for xs:restrictions. (#51779) Some tests failed eg 10:29:14] info: System.Xml.Schema.XmlSchemaException : Invalid particle derivation by restriction - 'The derived sequence particle at (22, 6) is not a valid restriction of the base choice particle at (7, 4) according to Sequence:Choice -- MapAndSum.'. https://dev.azure.com/dnceng/public/_build/results?buildId=1105728&view=ms.vss-test-web.build-test-results-tab<https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdev.azure.com%2Fdnceng%2Fpublic%2F_build%2Fresults%3FbuildId%3D1105728%26view%3Dms.vss-test-web.build-test-results-tab&data=04%7C01%7Cclovett%40microsoft.com%7Ca421b6dfbac14a3053b408d9073f7053%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637548791311820421%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=lpZ8YykzdE65KFZmM1C7d1RhOGnzkKutzEp%2BA5EnFos%3D&reserved=0> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fdotnet%2Fruntime%2Fpull%2F51779%23issuecomment-826118993&data=04%7C01%7Cclovett%40microsoft.com%7Ca421b6dfbac14a3053b408d9073f7053%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637548791311830375%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=A3GXmxBDf2nDOiMcn%2FD9GsgcE0j7G0rB9vZZDhhxkJ4%3D&reserved=0>, or unsubscribe<https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAEOXFKRB42HQEJG4FUJJDO3TKLXZTANCNFSM43P5VDVQ&data=04%7C01%7Cclovett%40microsoft.com%7Ca421b6dfbac14a3053b408d9073f7053%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637548791311830375%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=XqXPw6qmHOfh1aPOjmfZl5cYZjbeFUSXCkkcFzwgEnU%3D&reserved=0>.

[lovettchris]

Hmmm, I seem to be hitting some unrelated tests failures, see above, complaining about System.IO.FileSystem.Watcher.Tests in job 550598f7-547a-4211-b618-e4799eb70970 has failed? And an infrustructure issue saying "##[error].packages/microsoft.dotnet.helix.sdk/6.0.0-beta.21222.1/tools/Microsoft.DotNet.Helix.Sdk.MultiQueue.targets(78,5): error : (NETCORE_ENGINEERING_TELEMETRY=Test) Work item System.IO.FileSystem.Watcher.Tests in job 550598f7-547a-4211-b618-e4799eb70970 has failed." ?

[danmoseley]

That test failure is #30056 which @carlossanlop is working on a fix for. So your PR validation is clean. Just need @krwq to sign off.

[krwq]

Thank you @lovettchris!