Skip to content

Commit

Permalink
fix assembly
Browse files Browse the repository at this point in the history
  • Loading branch information
@SimonCropp
SimonCropp committed Sep 25, 2021
1 parent d72dae0 commit 1ced0b6
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>
<PropertyGroup>
<NoWarn>CS1591;CS0649;xUnit1026;xUnit1013</NoWarn>
<Version>12.0.0-beta.6</Version>
<Version>12.0.0-beta.7</Version>
<AssemblyVersion>1.0.0</AssemblyVersion>
<PackageTags>Json, Testing, Verify, Snapshot, Approvals</PackageTags>
<Description>Enables verification of complex models and documents.</Description>
Expand Down
19 changes: 0 additions & 19 deletions src/Verify.Expecto/ModuleInitializer.cs
View file

This file was deleted.

3 changes: 2 additions & 1 deletion src/Verify.Expecto/Verifier.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ static void ThrowNotSupported(string api)
throw new($"Expect does not support `{api}()`. Change the `name` parameter instead.");
}

static async Task Verify(VerifySettings? settings, string sourceFile, string name, Func<InnerVerifier, Task> verify)
static async Task Verify(VerifySettings? settings, Assembly assembly, string sourceFile, string name, Func<InnerVerifier, Task> verify)
{
TargetAssembly.Assign(assembly);
settings ??= new();
Guard.AgainstNullOrEmpty(sourceFile, nameof(sourceFile));
using var verifier = GetVerifier(settings, sourceFile, name);
Expand Down
11 changes: 8 additions & 3 deletions src/Verify.Expecto/Verifier_File.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ public static Task Verify(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.Verify(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.Verify(target));
}

public static Task Verify(
Expand All @@ -19,8 +20,10 @@ public static Task Verify(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
var assembly = Assembly.GetCallingAssembly()!;
return Verify(
settings,
assembly,
sourceFile,
name,
async _ =>
Expand All @@ -36,7 +39,8 @@ public static Task VerifyFile(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.VerifyFile(path));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.VerifyFile(path));
}

public static Task VerifyFile(
Expand All @@ -45,7 +49,8 @@ public static Task VerifyFile(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.VerifyFile(path));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.VerifyFile(path));
}
}
}
21 changes: 14 additions & 7 deletions src/Verify.Expecto/Verifier_Json.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ public static Task Verify<T>(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.Verify(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.Verify(target));
}

public static Task Verify<T>(
Expand All @@ -20,7 +21,8 @@ public static Task Verify<T>(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.Verify(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.Verify(target));
}

public static Task Verify<T>(
Expand All @@ -29,7 +31,8 @@ public static Task Verify<T>(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.Verify(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.Verify(target));
}

public static Task Verify<T>(
Expand All @@ -38,7 +41,8 @@ public static Task Verify<T>(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.Verify(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.Verify(target));
}

public static Task VerifyJson(
Expand All @@ -47,7 +51,8 @@ public static Task VerifyJson(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.VerifyJson(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.VerifyJson(target));
}

public static Task VerifyJson(
Expand All @@ -56,7 +61,8 @@ public static Task VerifyJson(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.VerifyJson(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.VerifyJson(target));
}

public static Task VerifyJson(
Expand All @@ -65,7 +71,8 @@ public static Task VerifyJson(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.VerifyJson(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.VerifyJson(target));
}
}
}
18 changes: 12 additions & 6 deletions src/Verify.Expecto/Verifier_Throws.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ public static Task Throws(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.Throws(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.Throws(target));
}

public static Task Throws(
Expand All @@ -19,7 +20,8 @@ public static Task Throws(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.Throws(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.Throws(target));
}

public static Task ThrowsTask(
Expand All @@ -28,7 +30,8 @@ public static Task ThrowsTask(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.ThrowsTask(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.ThrowsTask(target));
}

public static Task ThrowsTask<T>(
Expand All @@ -37,7 +40,8 @@ public static Task ThrowsTask<T>(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.ThrowsTask(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.ThrowsTask(target));
}

public static Task ThrowsValueTask(
Expand All @@ -46,7 +50,8 @@ public static Task ThrowsValueTask(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.ThrowsValueTask(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.ThrowsValueTask(target));
}

public static Task ThrowsValueTask<T>(
Expand All @@ -55,7 +60,8 @@ public static Task ThrowsValueTask<T>(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.ThrowsValueTask(target));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.ThrowsValueTask(target));
}
}
}
3 changes: 2 additions & 1 deletion src/Verify.Expecto/Verifier_Tuple.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ public static Task VerifyTuple(
VerifySettings? settings = null,
[CallerFilePath] string sourceFile = "")
{
return Verify(settings, sourceFile, name, _ => _.VerifyTuple(expression));
var assembly = Assembly.GetCallingAssembly()!;
return Verify(settings, assembly, sourceFile, name, _ => _.VerifyTuple(expression));
}
}
}
Expand Down

0 comments on commit 1ced0b6

Please sign in to comment.