tst: memfs-dotnet: fix stream_getstreaminfo_test

This commit is contained in:
Bill Zissimopoulos 2017-05-08 22:17:17 -07:00
parent 5839d46b7a
commit 05abb93e4b

View File

@ -948,13 +948,15 @@ namespace memfs
FileNode FileNode = (FileNode)FileNode0; FileNode FileNode = (FileNode)FileNode0;
IEnumerator<String> Enumerator = (IEnumerator<String>)Context; IEnumerator<String> Enumerator = (IEnumerator<String>)Context;
if (null == Enumerator)
{
if (null != FileNode.MainFileNode) if (null != FileNode.MainFileNode)
FileNode = FileNode.MainFileNode; FileNode = FileNode.MainFileNode;
if (null == Enumerator) List<String> StreamFileNames = new List<String>();
{ if (0 == (FileNode.FileInfo.FileAttributes & (UInt32)FileAttributes.Directory))
List<String> StreamFileNames = StreamFileNames.Add(FileNode.FileName);
new List<String>(FileNodeMap.GetStreamFileNames(FileNode)); StreamFileNames.AddRange(FileNodeMap.GetStreamFileNames(FileNode));
Context = Enumerator = StreamFileNames.GetEnumerator(); Context = Enumerator = StreamFileNames.GetEnumerator();
} }
@ -966,11 +968,7 @@ namespace memfs
{ {
int Index = FullFileName.IndexOf(':'); int Index = FullFileName.IndexOf(':');
if (0 > Index) if (0 > Index)
{
if (0 != (FileNode.FileInfo.FileAttributes & (UInt32)FileAttributes.Directory))
continue;
StreamName = ""; StreamName = "";
}
else else
StreamName = FullFileName.Substring(Index + 1); StreamName = FullFileName.Substring(Index + 1);
StreamSize = StreamFileNode.FileInfo.FileSize; StreamSize = StreamFileNode.FileInfo.FileSize;