Merge pull request #14863 from sepidehMS/FixTreeManipulationOuterloopFails

Fix XLinqTests.TreeManipulation outerloop failures

2 files changed, 7 insertions, 9 deletions

diff --git a/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs b/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs
index 4c10ff7e3b..7a3ae67461 100644
--- a/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs
+++ b/src/System.Private.Xml.Linq/src/System/Xml/Linq/XContainer.cs
@@ -869,7 +869,7 @@ namespace System.Xml.Linq
             }
             if (r.ReadState != ReadState.Interactive) throw new InvalidOperationException(SR.InvalidOperation_ExpectedInteractive);
 
-            ContentReader cr = new ContentReader(this);
+            ContentReader cr = new ContentReader(this, r, o);
             while (cr.ReadContentFrom(this, r, o) && r.Read()) ;
         }
 
@@ -894,7 +894,7 @@ namespace System.Xml.Linq
             }
             if (r.ReadState != ReadState.Interactive) throw new InvalidOperationException(SR.InvalidOperation_ExpectedInteractive);
  
-            ContentReader cr = new ContentReader(this);
+            ContentReader cr = new ContentReader(this, r, o);
             do
             {
                 cancellationToken.ThrowIfCancellationRequested();
diff --git a/src/System.Private.Xml.Linq/tests/TreeManipulation/LoadFromStream.cs b/src/System.Private.Xml.Linq/tests/TreeManipulation/LoadFromStream.cs
index dc249919df..a8ea8c5b7c 100644
--- a/src/System.Private.Xml.Linq/tests/TreeManipulation/LoadFromStream.cs
+++ b/src/System.Private.Xml.Linq/tests/TreeManipulation/LoadFromStream.cs
@@ -41,15 +41,13 @@ namespace XLinqTests
             AddChild(new TestVariation(LoadOptionsPWS) { Attribute = new VariationAttribute("XDocument.Load(), Load options, preserveWhitespace, Stream") { Param = "Stream", Priority = 0 } });
             AddChild(new TestVariation(LoadOptionsPWS) { Attribute = new VariationAttribute("XDocument.Load(), Load options, preserveWhitespace, Uri") { Param = "Uri", Priority = 0 } });
             AddChild(new TestVariation(LoadOptionsBU) { Attribute = new VariationAttribute("XDocument.Load(), Load options, BaseUri, Uri") { Param = "Uri", Priority = 0 } });
-            // TODO [ActiveIssue(14856)]: Re-enable when fixed
-            //AddChild(new TestVariation(LoadOptionsLI) { Attribute = new VariationAttribute("XDocument.Load(), Load options, LineInfo, Uri") { Param = "Uri", Priority = 0 } });
-            //AddChild(new TestVariation(LoadOptionsLI) { Attribute = new VariationAttribute("XDocument.Load(), Load options, LineInfo, Stream") { Param = "Stream", Priority = 0 } });
+            AddChild(new TestVariation(LoadOptionsLI) { Attribute = new VariationAttribute("XDocument.Load(), Load options, LineInfo, Uri") { Param = "Uri", Priority = 0 } });
+            AddChild(new TestVariation(LoadOptionsLI) { Attribute = new VariationAttribute("XDocument.Load(), Load options, LineInfo, Stream") { Param = "Stream", Priority = 0 } });
             AddChild(new TestVariation(XE_LoadOptionsPWS) { Attribute = new VariationAttribute("XElement.Load(), Load options, preserveWhitespace, Uri") { Param = "Uri", Priority = 0 } });
             AddChild(new TestVariation(XE_LoadOptionsPWS) { Attribute = new VariationAttribute("XElement.Load(), Load options, preserveWhitespace, Stream") { Param = "Stream", Priority = 0 } });
             AddChild(new TestVariation(XE_LoadOptionsBU) { Attribute = new VariationAttribute("XElement.Load(), Load options, BaseUri, Uri") { Param = "Uri", Priority = 0 } });
-            // TODO [ActiveIssue(14856)]: Re-enable when fixed
-            //AddChild(new TestVariation(XE_LoadOptionsLI) { Attribute = new VariationAttribute("XElement.Load(), Load options, LineInfo, Stream") { Param = "Stream", Priority = 0 } });
-            //AddChild(new TestVariation(XE_LoadOptionsLI) { Attribute = new VariationAttribute("XElement.Load(), Load options, LineInfo, Uri") { Param = "Uri", Priority = 0 } });
+            AddChild(new TestVariation(XE_LoadOptionsLI) { Attribute = new VariationAttribute("XElement.Load(), Load options, LineInfo, Stream") { Param = "Stream", Priority = 0 } });
+            AddChild(new TestVariation(XE_LoadOptionsLI) { Attribute = new VariationAttribute("XElement.Load(), Load options, LineInfo, Uri") { Param = "Uri", Priority = 0 } });
             AddChild(new TestVariation(SaveOptionsTests) { Attribute = new VariationAttribute("XDocument.Save(), SaveOptions.DisableFormatting | SaveOptions.OmitDuplicateNamespaces") { Param = 3, Priority = 1 } });
             AddChild(new TestVariation(SaveOptionsTests) { Attribute = new VariationAttribute("XDocument.Save(), SaveOptions.OmitDuplicateNamespaces") { Param = 2, Priority = 1 } });
             AddChild(new TestVariation(SaveOptionsTests) { Attribute = new VariationAttribute("XDocument.Save(), SaveOptions.None") { Param = 0, Priority = 1 } });
@@ -437,7 +435,7 @@ namespace XLinqTests
                         return XElement.Load(s, lo);
                     }
                 default:
-                    throw new TestFailedException("TEST FAILED: don't know how to create XDocument");
+                    throw new TestFailedException("TEST FAILED: don't know how to create XElement");
             }
         }
         #endregion