Fixing tests so the names are accurate, and update the results accordingly

Author: Sam Knutson

README.md

@@ -35,8 +35,8 @@ I tested three versions: .NET Framework 4.5.1 and 4.5.2 (to reproduce deanf1's r
 | XPathNavigatorTest: IsSafeByDefault | No | Yes | Yes |
 | XPathNavigatorTest: IsSafeWithXmlReader | Yes | Yes | Yes |
 | XmlDictionaryReaderTest: IsSafeByDefault | Yes | Yes | Yes |
-| XmlDictionaryReaderTest: IsSafeWithDtdProcessing | No | No | No |
-| XmlDictionaryReaderTest: IsSafeWithDtdProcessingAndUrlResolver | No | Yes | Yes |
+| XmlDictionaryReaderTest: IsSafeWithDtdProcessing | No | Yes | Yes |
+| XmlDictionaryReaderTest: IsSafeWithDtdProcessingAndUrlResolver | No | No | No |
 | XmlDocumentTest: IsSafeByDefault | No | Yes | Yes |
 | XmlDocumentTest: IsSafeWithNullXmlResolver | Yes | Yes | Yes |
 | XmlDocumentTest: IsSafeWithUrlResolver | No | No | No |

dotnet-core/DotNetCoreXxeTests/Tests/XmlDictionaryReaderTest.cs

@@ -27,7 +27,6 @@ public void IsSafeWithDtdProcessing()
         {
             XmlReaderSettings settings = new XmlReaderSettings();
             settings.DtdProcessing = DtdProcessing.Parse;
-            settings.XmlResolver = new XmlUrlResolver();
             XmlReader reader = XmlReader.Create(new MemoryStream(Encoding.ASCII.GetBytes(Util.XmlWithPayload)), settings, Util.ResourceFolderPath);
             XmlDictionaryReader target = XmlDictionaryReader.CreateDictionaryReader(reader);
             string stringifiedTarget = ToString(target);
@@ -39,6 +38,7 @@ public void IsSafeWithDtdProcessingAndUrlResolver()
         {
             XmlReaderSettings settings = new XmlReaderSettings();
             settings.DtdProcessing = DtdProcessing.Parse;
+            settings.XmlResolver = new XmlUrlResolver();
             XmlReader reader = XmlReader.Create(new MemoryStream(Encoding.ASCII.GetBytes(Util.XmlWithPayload)), settings, Util.ResourceFolderPath);
             XmlDictionaryReader target = XmlDictionaryReader.CreateDictionaryReader(reader);
             string stringifiedTarget = ToString(target);

dotnet-framework/Tests/XmlDictionaryReaderTest.cs

@@ -27,7 +27,6 @@ public void IsSafeWithDtdProcessing()
         {
             XmlReaderSettings settings = new XmlReaderSettings();
             settings.DtdProcessing = DtdProcessing.Parse;
-            settings.XmlResolver = new XmlUrlResolver();
             XmlReader reader = XmlReader.Create(new MemoryStream(Encoding.ASCII.GetBytes(Util.XmlWithPayload)), settings, Util.ResourceFolderPath);
             XmlDictionaryReader target = XmlDictionaryReader.CreateDictionaryReader(reader);
             string stringifiedTarget = ToString(target);
@@ -39,6 +38,7 @@ public void IsSafeWithDtdProcessingAndUrlResolver()
         {
             XmlReaderSettings settings = new XmlReaderSettings();
             settings.DtdProcessing = DtdProcessing.Parse;
+            settings.XmlResolver = new XmlUrlResolver();
             XmlReader reader = XmlReader.Create(new MemoryStream(Encoding.ASCII.GetBytes(Util.XmlWithPayload)), settings, Util.ResourceFolderPath);
             XmlDictionaryReader target = XmlDictionaryReader.CreateDictionaryReader(reader);
             string stringifiedTarget = ToString(target);