Skip to content

Commit f6de914

Browse files
committed
fixed up things
1 parent 436201c commit f6de914

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

source/StoneAge.Data.FileSystem.Tests/DocumentTEsts.cs renamed to source/StoneAge.Data.FileSystem.Tests/DocumentTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void GivenFullFilePath_ExpectFileNameExtracted()
4949
var input = "a message in a file";
5050

5151
var sut = new DocumentBuilder()
52-
.Using_Name_From_Path("c:\\tmp\\test.txt")
52+
.Using_Name_From_Path(@"c:\tmp\test.txt")
5353
.With_String(input)
5454
.Create_Document();
5555
//---------------Act----------------------

source/StoneAge.Data.FileSystem.Tests/FileSystemTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.IO;
43
using System.Linq;
54
using System.Threading.Tasks;
@@ -217,7 +216,7 @@ public void WhenDirectoryExist_ExpectContents()
217216
//---------------Act----------------------
218217
var result = sut.List(path);
219218
//---------------Assert-----------------------
220-
result.Count().Should().BeGreaterOrEqualTo(1);
219+
result.Count().Should().BeGreaterThanOrEqualTo(1);
221220
}
222221

223222
[Test]
@@ -467,9 +466,10 @@ public async Task GivenFileExist_ExpectDocumentWithBytesReturned()
467466
//---------------Assert-----------------------
468467
var expectedFirst = "GlobalRank,TldRank,Domain,TLD,RefSubNets,RefIPs,IDN_Domain,IDN_TLD,PrevGlobalRank,PrevTldRank,PrevRefSubNets,PrevRefIPs";
469468
var expectedLast = "1000000,499336,alexandrevicenzi.com,com,341,364,alexandrevicenzi.com,com,982364,490355,345,368";
470-
actual.Count().Should().Be(1000001);
471-
actual.FirstOrDefault().Should().BeEquivalentTo(expectedFirst);
472-
actual.LastOrDefault().Should().BeEquivalentTo(expectedLast);
469+
var enumerable = actual as string[] ?? actual.ToArray();
470+
enumerable.Count().Should().Be(1000001);
471+
enumerable.FirstOrDefault().Should().BeEquivalentTo(expectedFirst);
472+
enumerable.LastOrDefault().Should().BeEquivalentTo(expectedLast);
473473
}
474474

475475
[Test]
@@ -482,7 +482,7 @@ public void GivenFileDoesExist_ExpectException()
482482
//---------------Act----------------------
483483
var actual = Assert.ThrowsAsync<FileNotFoundException>(async ()=>await sut.ReadAllLines(path));
484484
//---------------Assert-----------------------
485-
actual.Message.Should().NotBeEmpty();
485+
actual?.Message.Should().NotBeEmpty();
486486
}
487487

488488
[Test]
@@ -493,7 +493,7 @@ public void GivenNullPath_ExpectException()
493493
//---------------Act----------------------
494494
var actual = Assert.ThrowsAsync<ArgumentNullException>(async () => await sut.ReadAllLines(null));
495495
//---------------Assert-----------------------
496-
actual.Message.Should().NotBeEmpty();
496+
actual?.Message.Should().NotBeEmpty();
497497
}
498498
}
499499

source/StoneAge.Data.FileSystem/FileSystem.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace StoneAge.FileStore
99
{
1010
public class FileSystem : IFileSystem
1111
{
12-
public static IDocument NullDocument = new Document{Name = "NullDocument"};
12+
public static readonly IDocument NullDocument = new Document{Name = "NullDocument"};
1313

1414
public async Task<WriteFileResult> Write(string directory, IDocument file)
1515
{
@@ -21,6 +21,12 @@ public async Task<WriteFileResult> Write(string directory, IDocument file)
2121
result.ErrorMessages.Add("No file name provided");
2222
return result;
2323
}
24+
25+
if (string.IsNullOrWhiteSpace(directory))
26+
{
27+
result.ErrorMessages.Add("No directory provided");
28+
return result;
29+
}
2430

2531
result = Ensure_Directory_Is_Created(directory);
2632

@@ -161,6 +167,12 @@ public async Task<WriteFileResult> Append(string directory, IDocument file)
161167
result.ErrorMessages.Add("No file name provided");
162168
return result;
163169
}
170+
171+
if (string.IsNullOrWhiteSpace(directory))
172+
{
173+
result.ErrorMessages.Add("No directory provided");
174+
return result;
175+
}
164176

165177
result = Ensure_Directory_Is_Created(directory);
166178

0 commit comments

Comments
 (0)