未验证 提交 cc649aca 编写于 作者: K Krzysztof Wicher 提交者: GitHub

Fix XNodeReaderFunctionalTests (#65500)

* Fix XNodeReaderFunctionalTests

* cleanup Flush/Dispose

* cleanup few more flushes
上级 90b7be39
......@@ -120,13 +120,15 @@ static void initXmlFileCacheIfNotYet()
{
if (s_XmlFileInMemoryCache == null)
{
s_XmlFileInMemoryCache = new MyDict<string, MemoryStream>();
MyDict<string, MemoryStream> cache = new MyDict<string, MemoryStream>();
foreach (Tuple<string, byte[]> file in GetDataFiles())
{
var ms = new MemoryStream(file.Item2);
s_XmlFileInMemoryCache[NormalizeFilePath(file.Item1)] = ms;
cache[NormalizeFilePath(file.Item1)] = ms;
}
s_XmlFileInMemoryCache = cache;
}
}
}
......
......@@ -482,12 +482,15 @@ public void RunBase64DoesnNotRunIntoOverflow()
string base64str = Convert.ToBase64String(bits);
string fileName = "bug105376_" + Variation.Params[0].ToString() + ".xml";
FilePathUtil.addStream(fileName, new MemoryStream());
StreamWriter sw = new StreamWriter(FilePathUtil.getStream(fileName));
sw.Write("<root><base64>");
sw.Write(base64str);
sw.Write("</base64></root>");
sw.Flush();
var ms = new MemoryStream();
{
using var sw = new StreamWriter(ms, leaveOpen: true);
sw.Write("<root><base64>");
sw.Write(base64str);
sw.Write("</base64></root>");
}
FilePathUtil.addStream(fileName, ms);
XmlReader DataReader = GetReader(fileName);
......@@ -943,14 +946,17 @@ public void ReadBase64DoesNotRunIntoOverflow2()
string base64str = Convert.ToBase64String(bits);
string fileName = "bug105376_" + Variation.Params[0].ToString() + ".xml";
FilePathUtil.addStream(fileName, new MemoryStream());
StreamWriter sw = new StreamWriter(FilePathUtil.getStream(fileName));
sw.Write("<root><base64>");
sw.Write(base64str);
sw.Write("</base64></root>");
sw.Flush();
var ms = new MemoryStream();
{
using var sw = new StreamWriter(ms, leaveOpen: true);
sw.Write("<root><base64>");
sw.Write(base64str);
sw.Write("</base64></root>");
}
XmlReader DataReader = GetReader(fileName);
FilePathUtil.addStream(fileName, ms);
using XmlReader DataReader = GetReader(fileName);
int SIZE = (totalfilesize - 30);
int SIZE64 = SIZE * 3 / 4;
......@@ -974,8 +980,6 @@ public void ReadBase64DoesNotRunIntoOverflow2()
readSize = 0;
currentSize = DataReader.ReadElementContentAsBase64(base64, startPos, readSize);
TestLog.Compare(currentSize, 0, "Read other than Zero Bytes");
DataReader.Dispose();
}
//[Variation("SubtreeReader inserted attributes don't work with ReadContentAsBase64")]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册