Update to verify 4 (#143)

SimonCropp · web-flow · commit eca7306a4fcd · 2020-05-24T16:07:38.000+10:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;CS8632</NoWarn>
-    <Version>1.1.0</Version>
+    <Version>1.2.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFramework, Verify</PackageTags>
     <Description>Extends Verify (https://github.com/VerifyTests/Verify) to allow verification of EntityFramework bits.</Description>
diff --git a/src/Verify.EntityFramework/Converters/QueryableConverter.cs b/src/Verify.EntityFramework/Converters/QueryableConverter.cs
@@ -36,8 +36,9 @@ public override bool CanConvert(Type type)
         return IsQueryable(type);
     }
 
-    public static bool IsQueryable(Type type)
+    public static bool IsQueryable(object target)
     {
+        var type = target.GetType();
         if (!type.IsGenericType)
         {
             return false;
diff --git a/src/Verify.EntityFramework/Verify.EntityFramework.csproj b/src/Verify.EntityFramework/Verify.EntityFramework.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.4" />
-    <PackageReference Include="Verify" Version="3.1.0" />
+    <PackageReference Include="Verify" Version="4.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.4" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
diff --git a/src/Verify.EntityFramework/VerifyEntityFramework.cs b/src/Verify.EntityFramework/VerifyEntityFramework.cs
@@ -7,7 +7,10 @@ public static class VerifyEntityFramework
     {
         public static void Enable()
         {
-            SharedVerifySettings.RegisterFileConverter("txt", QueryableToSql, QueryableConverter.IsQueryable);
+            SharedVerifySettings.RegisterFileConverter(
+                "txt",
+                QueryableToSql,
+                QueryableConverter.IsQueryable);
             SharedVerifySettings.ModifySerialization(settings =>
             {
                 settings.AddExtraSettings(serializer =>
diff --git a/src/Verify.EntityFrameworkClassic.Tests/CoreTests.cs b/src/Verify.EntityFrameworkClassic.Tests/CoreTests.cs
@@ -121,14 +121,15 @@ public async Task Queryable()
     }
     #endregion
 
-    public CoreTests(ITestOutputHelper output) :
-        base(output)
+    static CoreTests()
     {
+        sqlInstance = new SqlInstance<SampleDbContext>(
+            constructInstance: connection => new SampleDbContext(connection),
+            storage: Storage.FromSuffix<SampleDbContext>("Tests"));
     }
 
-    static CoreTests()
+    public CoreTests(ITestOutputHelper output) :
+        base(output)
     {
-        sqlInstance = new SqlInstance<SampleDbContext>(
-            constructInstance: connection => new SampleDbContext(connection),instanceSuffix:"Tests");
     }
 }
diff --git a/src/Verify.EntityFrameworkClassic.Tests/Snippets/DbContextBuilder.cs b/src/Verify.EntityFrameworkClassic.Tests/Snippets/DbContextBuilder.cs
@@ -10,7 +10,7 @@ static DbContextBuilder()
         sqlInstance = new SqlInstance<SampleDbContext>(
             buildTemplate: CreateDb,
             constructInstance: connection => new SampleDbContext(connection),
-            instanceSuffix: "Classic");
+            storage: Storage.FromSuffix<SampleDbContext>("Classic"));
     }
 
     static SqlInstance<SampleDbContext> sqlInstance;
diff --git a/src/Verify.EntityFrameworkClassic/Converters/QueryableConverter.cs b/src/Verify.EntityFrameworkClassic/Converters/QueryableConverter.cs
@@ -35,14 +35,8 @@ public override bool CanConvert(Type type)
         return IsQueryable(type);
     }
 
-    public static bool IsQueryable(Type type)
+    public static bool IsQueryable(object target)
     {
-        if (!type.IsGenericType)
-        {
-            return false;
-        }
-
-        var genericType = type.GetGenericTypeDefinition();
-        return genericType == typeof(IQueryable<>);
+        return target is IQueryable;
     }
 }
diff --git a/src/Verify.EntityFrameworkClassic/Verify.EntityFrameworkClassic.csproj b/src/Verify.EntityFrameworkClassic/Verify.EntityFrameworkClassic.csproj
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="EntityFramework" Version="6.4.4" />
-    <PackageReference Include="Verify" Version="3.1.0" />
+    <PackageReference Include="Verify" Version="4.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="ProjectDefaults" Version="1.0.42" PrivateAssets="All" />
diff --git a/src/Verify.EntityFrameworkClassic/VerifyEntityFrameworkClassic.cs b/src/Verify.EntityFrameworkClassic/VerifyEntityFrameworkClassic.cs
@@ -7,7 +7,10 @@ public static class VerifyEntityFrameworkClassic
     {
         public static void Enable()
         {
-            SharedVerifySettings.RegisterFileConverter("txt", QueryableToSql, QueryableConverter.IsQueryable);
+            SharedVerifySettings.RegisterFileConverter(
+                "txt",
+                QueryableToSql,
+                QueryableConverter.IsQueryable);
             SharedVerifySettings.ModifySerialization(settings =>
             {
                 settings.AddExtraSettings(serializer =>

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,9 @@ public override bool CanConvert(Type type)`
`36`	`36`	`return IsQueryable(type);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public static bool IsQueryable(Type type)`
	`39`	`+ public static bool IsQueryable(object target)`
`40`	`40`	`{`
	`41`	`+ var type = target.GetType();`
`41`	`42`	`if (!type.IsGenericType)`
`42`	`43`	`{`
`43`	`44`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,10 @@ public static class VerifyEntityFramework`
`7`	`7`	`{`
`8`	`8`	`public static void Enable()`
`9`	`9`	`{`
`10`		`- SharedVerifySettings.RegisterFileConverter("txt", QueryableToSql, QueryableConverter.IsQueryable);`
	`10`	`+ SharedVerifySettings.RegisterFileConverter(`
	`11`	`+ "txt",`
	`12`	`+ QueryableToSql,`
	`13`	`+ QueryableConverter.IsQueryable);`
`11`	`14`	`SharedVerifySettings.ModifySerialization(settings =>`
`12`	`15`	`{`
`13`	`16`	`settings.AddExtraSettings(serializer =>`
Original file line number	Diff line number	Diff line change
`@@ -121,14 +121,15 @@ public async Task Queryable()`
`121`	`121`	`}`
`122`	`122`	`#endregion`
`123`	`123`
`124`		`- public CoreTests(ITestOutputHelper output) :`
`125`		`- base(output)`
	`124`	`+ static CoreTests()`
`126`	`125`	`{`
	`126`	`+ sqlInstance = new SqlInstance<SampleDbContext>(`
	`127`	`+ constructInstance: connection => new SampleDbContext(connection),`
	`128`	`+ storage: Storage.FromSuffix<SampleDbContext>("Tests"));`
`127`	`129`	`}`
`128`	`130`
`129`		`- static CoreTests()`
	`131`	`+ public CoreTests(ITestOutputHelper output) :`
	`132`	`+ base(output)`
`130`	`133`	`{`
`131`		`- sqlInstance = new SqlInstance<SampleDbContext>(`
`132`		`- constructInstance: connection => new SampleDbContext(connection),instanceSuffix:"Tests");`
`133`	`134`	`}`
`134`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ static DbContextBuilder()`
`10`	`10`	`sqlInstance = new SqlInstance<SampleDbContext>(`
`11`	`11`	`buildTemplate: CreateDb,`
`12`	`12`	`constructInstance: connection => new SampleDbContext(connection),`
`13`		`- instanceSuffix: "Classic");`
	`13`	`+ storage: Storage.FromSuffix<SampleDbContext>("Classic"));`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`static SqlInstance<SampleDbContext> sqlInstance;`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,8 @@ public override bool CanConvert(Type type)`
`35`	`35`	`return IsQueryable(type);`
`36`	`36`	`}`
`37`	`37`
`38`		`- public static bool IsQueryable(Type type)`
	`38`	`+ public static bool IsQueryable(object target)`
`39`	`39`	`{`
`40`		`- if (!type.IsGenericType)`
`41`		`- {`
`42`		`- return false;`
`43`		`- }`
`44`		`-`
`45`		`- var genericType = type.GetGenericTypeDefinition();`
`46`		`- return genericType == typeof(IQueryable<>);`
	`40`	`+ return target is IQueryable;`
`47`	`41`	`}`
`48`	`42`	`}`