Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Dec 25, 2023
1 parent 89251f8 commit 5d20020
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 19 deletions.

This file was deleted.

Binary file not shown.
2 changes: 1 addition & 1 deletion src/Verify/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
static class Extensions
{
public static string Extension(this FileStream file) =>
FileExtensions.GetExtension(file.Name);
Path.GetExtension(file.Name);

public static bool ContainsNewline(this CharSpan span) =>
span.IndexOfAny('\r', '\n') != -1;
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/FilePair.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ public readonly struct FilePair(string extension, string receivedPath, string ve
public string Extension { get; } = extension;
public string ReceivedPath { get; } = receivedPath;
public string VerifiedPath { get; } = verifiedPath;
public bool IsText { get; } = FileExtensions.IsText(extension);
public bool IsText { get; } = FileExtensions.IsTextExtension(extension);
}
4 changes: 2 additions & 2 deletions src/Verify/Guard.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ public static void AgainstBadExtension(string value, [CallerArgumentExpression("
{
AgainstNullOrEmpty(value, argumentName);

if (value.StartsWith('.'))
if (!value.StartsWith('.'))
{
throw new ArgumentException("Must not start with a period ('.').", argumentName);
throw new ArgumentException("Must start with a period ('.').", argumentName);
}
}
}
3 changes: 1 addition & 2 deletions src/Verify/Splitters/Settings_Extension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ public static void RegisterFileConverter(
AsyncConversion<Stream> conversion)
{
InnerVerifier.ThrowIfVerifyHasBeenRun();
Guard.AgainstBadExtension(fromExtension);
if (FileExtensions.IsText(fromExtension))
if (FileExtensions.IsTextExtension(fromExtension))
{
throw new("RegisterFileConverter is only supported for non-text extensions");
}
Expand Down
4 changes: 2 additions & 2 deletions src/Verify/Splitters/Settings_FileAppender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void AppendContentAsFile(StringBuilder content, string extension = "txt",

public void AppendContentAsFile(byte[] content, string extension = "txt", string? name = null)
{
if (FileExtensions.IsText(extension))
if (FileExtensions.IsTextExtension(extension))
{
appendedFiles.Add(new(extension, Encoding.UTF8.GetString(content), name));
}
Expand All @@ -62,7 +62,7 @@ public void AppendFile(FileStream stream, string? name = null) =>
public void AppendFile(Stream stream, string extension = "txt", string? name = null)
{
stream.MoveToStart();
if (FileExtensions.IsText(extension))
if (FileExtensions.IsTextExtension(extension))
{
using var reader = new StreamReader(stream, Encoding.UTF8);
appendedFiles.Add(new(extension, reader.ReadToEnd(), name));
Expand Down
10 changes: 3 additions & 7 deletions src/Verify/Target.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ internal bool TryGetStringBuilder([NotNullWhen(true)] out StringBuilder? value)

public Target(string extension, Stream data, string? name = null)
{
Guard.AgainstBadExtension(extension);

if (FileExtensions.IsText(extension))
if (FileExtensions.IsTextExtension(extension))
{
throw new("Dont pass a stream for text. Instead use `Target(string extension, string data)` or `Target(string extension, StringBuilder data, string? name)`.");
}
Expand All @@ -53,9 +51,8 @@ public Target(string extension, Stream data, string? name = null)

public Target(string extension, StringBuilder data, string? name = null)
{
Guard.AgainstBadExtension(extension);
Guard.AgainstEmpty(name);
if (!FileExtensions.IsText(extension))
if (!FileExtensions.IsTextExtension(extension))
{
throw new("Dont pass a text for a binary extension. Instead use `Target(string extension, Stream data, string? name)`.");
}
Expand All @@ -68,9 +65,8 @@ public Target(string extension, StringBuilder data, string? name = null)

public Target(string extension, string data, string? name = null)
{
Guard.AgainstBadExtension(extension);
Guard.AgainstEmpty(name, nameof(name));
if (!FileExtensions.IsText(extension))
if (!FileExtensions.IsTextExtension(extension))
{
throw new("Dont pass a text for a binary extension. Instead use `Target(string extension, Stream data, string? name)`.");
}
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Verifier/InnerVerifier.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public InnerVerifier(string sourceFile, VerifySettings settings)
ValidatePrefix(settings, directory);

var withoutExtension = Path.GetFileNameWithoutExtension(sourceFile);
verifiedFiles = [Path.Combine(directory, $"{withoutExtension}.verified.{FileExtensions.GetExtension(sourceFile)}")];
verifiedFiles = [Path.Combine(directory, $"{withoutExtension}.verified{Path.GetExtension(sourceFile)}")];

getFileNames = target =>
new(
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Verifier/InnerVerifier_Directory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static async Task<Target> TargetFromFile(string path, string relativePath, FileS
relativePath);
}

if (FileExtensions.IsText(extension))
if (FileExtensions.IsTextExtension(extension))
{
using var stream = openStream();
var builder = await stream.ReadStringBuilderWithFixedLines();
Expand Down
2 changes: 1 addition & 1 deletion src/Verify/Verifier/InnerVerifier_Stream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public async Task<VerifyResult> VerifyStream(Stream? stream, string extension, o

static async Task<Target> GetTarget(Stream stream, string extension)
{
if (FileExtensions.IsText(extension))
if (FileExtensions.IsTextExtension(extension))
{
return new(extension, await stream.ReadStringBuilderWithFixedLines());
}
Expand Down

0 comments on commit 5d20020

Please sign in to comment.