Skip to content

Commit 830f961

Browse files
committed
Resolve some unit test issues.
1 parent 22f1554 commit 830f961

File tree

2 files changed

+33
-18
lines changed

2 files changed

+33
-18
lines changed

src/Common/Storage/Commands.Storage.Test/File/Cmdlet/GetAzureStorageFileTest.cs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,33 +76,34 @@ public void GetFileFromSubDirectoryTest_UsingShareObjectWithPath()
7676
{
7777
var share = this.MockChannel.GetShareReference(ShareName);
7878
var dir = share.GetRootDirectoryReference().GetDirectoryReference("dir");
79-
var listItems = Enumerable.Range(0, 10).Select(x => dir.GetFileReference(string.Format("file{0}", x))).Cast<IListFileItem>()
80-
.Concat(Enumerable.Range(0, 5).Select(x => dir.GetDirectoryReference(string.Format("dir{0}", x)))).ToArray();
8179

82-
this.ListFilesAndAssertResults(
83-
() => this.CmdletInstance.RunCmdlet(
84-
Constants.ShareParameterSetName,
85-
new KeyValuePair<string, object>("Share", share),
86-
new KeyValuePair<string, object>("Path", dir.Name)),
87-
listItems,
88-
dir);
80+
this.MockChannel.SetsAvailableDirectories(dir.Name);
81+
82+
this.CmdletInstance.RunCmdlet(
83+
Constants.ShareNameParameterSetName,
84+
new KeyValuePair<string, object>("ShareName", ShareName),
85+
new KeyValuePair<string, object>("Path", dir.Name));
86+
87+
List<IListFileItem> fileList = new List<IListFileItem>();
88+
fileList.Add(dir);
89+
this.MockCmdRunTime.OutputPipeline.AssertListFileItems(fileList);
8990
}
9091

9192
[TestMethod]
9293
public void GetFileFromSubDirectoryTest_UsingShareNameWithPath()
9394
{
9495
var share = this.MockChannel.GetShareReference(ShareName);
9596
var dir = share.GetRootDirectoryReference().GetDirectoryReference("dir");
96-
var listItems = Enumerable.Range(0, 10).Select(x => dir.GetFileReference(string.Format("file{0}", x))).Cast<IListFileItem>()
97-
.Concat(Enumerable.Range(0, 5).Select(x => dir.GetDirectoryReference(string.Format("dir{0}", x)))).ToArray();
97+
this.MockChannel.SetsAvailableDirectories(dir.Name);
9898

99-
this.ListFilesAndAssertResults(
100-
() => this.CmdletInstance.RunCmdlet(
99+
this.CmdletInstance.RunCmdlet(
101100
Constants.ShareNameParameterSetName,
102101
new KeyValuePair<string, object>("ShareName", ShareName),
103-
new KeyValuePair<string, object>("Path", dir.Name)),
104-
listItems,
105-
dir);
102+
new KeyValuePair<string, object>("Path", dir.Name));
103+
104+
List<IListFileItem> fileList = new List<IListFileItem>();
105+
fileList.Add(dir);
106+
this.MockCmdRunTime.OutputPipeline.AssertListFileItems(fileList);
106107
}
107108

108109
[TestMethod]

src/Common/Storage/Commands.Storage.Test/Service/MockStorageFileManagement.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,26 @@ public void SetSharePermissions(CloudFileShare share, FileSharePermissions permi
171171

172172
public Task FetchFileAttributesAsync(CloudFile file, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken token)
173173
{
174-
throw new NotImplementedException();
174+
if (this.availableDirectoryNames.Contains(file.Name))
175+
{
176+
return TaskEx.FromResult(true);
177+
}
178+
else
179+
{
180+
throw new MockupException("FileNotFound");
181+
}
175182
}
176183

177184
public Task FetchDirectoryAttributesAsync(CloudFileDirectory directory, AccessCondition accessCondition, FileRequestOptions options, OperationContext operationContext, CancellationToken cancellationToken)
178185
{
179-
throw new NotImplementedException();
186+
if (this.availableDirectoryNames.Contains(directory.Name))
187+
{
188+
return TaskEx.FromResult(true);
189+
}
190+
else
191+
{
192+
throw new MockupException("DirectoryNotFound");
193+
}
180194
}
181195

182196
public Task AbortCopyAsync(CloudFile file, string copyId, AccessCondition accessCondition, FileRequestOptions requestOptions, OperationContext operationContext, CancellationToken cancellationToken)

0 commit comments

Comments
 (0)