Merge pull request #51 from TrackableEntities/add-ctor-tests

Update tests to add DbContext ctor

Author: Anthony Sneed

src/EntityFrameworkCore.Scaffolding.Handlebars/CodeTemplates/CSharpDbContext/DbContext.hbs

@@ -4,7 +4,6 @@ namespace {{namespace}}
 {
     public partial class {{class}} : DbContext
     {
-{{{> dbconstructor}}}
 {{{> dbsets}}}
 {{#if entity-type-errors}}
 {{#each entity-type-errors}}

test/Scaffolding.Handlebars.Tests/CodeTemplates/CSharpDbContext/DbContext.hbs

@@ -4,14 +4,16 @@ namespace {{namespace}}
 {
     public partial class {{class}} : DbContext
     {
-{{> dbsets}}
+{{{> dbsets}}}
 {{#if entity-type-errors}}
 {{#each entity-type-errors}}
 {{spaces 8}}{{{entity-type-error}}}
 {{/each}}
 
 {{/if}}
 
+{{{> dbconstructor}}}
+
 {{{on-configuring}}}
 {{{on-model-creating}}}
     }

test/Scaffolding.Handlebars.Tests/CodeTemplates/CSharpDbContext/Partials/DbConstructor.hbs

@@ -0,0 +1,3 @@
+{{spaces 8}}public {{class}}(DbContextOptions<{{class}}> options) : base(options)
+{{spaces 8}}{
+{{spaces 7}} }

test/Scaffolding.Handlebars.Tests/CodeTemplates/CSharpEntityType/Class.hbs

@@ -8,6 +8,6 @@ namespace {{namespace}}
     public partial class {{class}}
     {
         {{{> constructor}}}
-        {{> properties}}
+        {{{> properties}}}
     }
 }

test/Scaffolding.Handlebars.Tests/CodeTemplatesAlt/CSharpDbContext/DbContext.hbs

@@ -4,14 +4,16 @@ namespace {{namespace}}
 {
     public partial class {{class}} : DbContext
     {
-{{> dbsets}}
+{{{> dbsets}}}
 {{#if entity-type-errors}}
 {{#each entity-type-errors}}
 {{spaces 8}}{{{entity-type-error}}}
 {{/each}}
 
 {{/if}}
 
+{{{> dbconstructor}}}
+
 {{{on-configuring}}}
 {{{on-model-creating}}}
     }

test/Scaffolding.Handlebars.Tests/ExpectedContexts.cs

@@ -16,6 +16,10 @@ public partial class FakeDbContext : DbContext
         public virtual DbSet<Category> Category { get; set; }
         public virtual DbSet<Product> Product { get; set; }
 
+        public FakeDbContext(DbContextOptions<FakeDbContext> options) : base(options)
+        {
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             if (!optionsBuilder.IsConfigured)
@@ -76,6 +80,10 @@ public partial class FakeDbContext : DbContext
         public virtual DbSet<Category> Category { get; set; }
         public virtual DbSet<Product> Product { get; set; }
 
+        public FakeDbContext(DbContextOptions<FakeDbContext> options) : base(options)
+        {
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             if (!optionsBuilder.IsConfigured)

test/Scaffolding.Handlebars.Tests/ExpectedTemplates.cs

@@ -11,14 +11,16 @@ namespace {{namespace}}
 {
     public partial class {{class}} : DbContext
     {
-{{> dbsets}}
+{{{> dbsets}}}
 {{#if entity-type-errors}}
 {{#each entity-type-errors}}
 {{spaces 8}}{{{entity-type-error}}}
 {{/each}}
 
 {{/if}}
 
+{{{> dbconstructor}}}
+
 {{{on-configuring}}}
 {{{on-model-creating}}}
     }
@@ -36,7 +38,7 @@ namespace {{namespace}}
     public partial class {{class}}
     {
         {{{> constructor}}}
-        {{> properties}}
+        {{{> properties}}}
     }
 }
 ";

test/Scaffolding.Handlebars.Tests/HbsCSharpScaffoldingGeneratorTests.cs

@@ -22,6 +22,7 @@ public partial class HbsCSharpScaffoldingGeneratorTests
 
         private InputFile ContextClassTemplate { get; }
         private InputFile ContextImportsTemplate { get; }
+        private InputFile ContextCtorTemplate { get; }
         private InputFile ContextDbSetsTemplate { get; }
         private InputFile EntityClassTemplate { get; }
         private InputFile EntityImportsTemplate { get; }
@@ -61,6 +62,12 @@ public HbsCSharpScaffoldingGeneratorTests(NorthwindDbContextFixture fixture)
                 File = Constants.Templates.ContextImportsFile,
                 Contents = File.ReadAllText(Path.Combine(contextPartialTemplatesPath, Constants.Templates.ContextImportsFile))
             };
+            ContextCtorTemplate = new InputFile
+            {
+                Directory = contextPartialsVirtualPath,
+                File = Constants.Templates.ContextCtorFile,
+                Contents = File.ReadAllText(Path.Combine(contextPartialTemplatesPath, Constants.Templates.ContextCtorFile))
+            };
             ContextDbSetsTemplate = new InputFile
             {
                 Directory = contextPartialsVirtualPath,
@@ -313,7 +320,7 @@ public void Save_Should_Write_Context_and_Entity_Files()
         private IReverseEngineerScaffolder CreateScaffolder(ReverseEngineerOptions options)
         {
             var fileService = new InMemoryTemplateFileService();
-            fileService.InputFiles(ContextClassTemplate, ContextImportsTemplate, ContextDbSetsTemplate,
+            fileService.InputFiles(ContextClassTemplate, ContextImportsTemplate, ContextCtorTemplate, ContextDbSetsTemplate,
                 EntityClassTemplate, EntityImportsTemplate, EntityCtorTemplate, EntityPropertiesTemplate);
 
             var services = new ServiceCollection()

test/Scaffolding.Handlebars.Tests/Helpers/Constants.cs

@@ -29,6 +29,7 @@ public static class Templates
             public const string EntityPropertiesFile = "Properties.hbs";
             public const string ContextClassFile = "DbContext.hbs";
             public const string ContextImportsFile = "DbImports.hbs";
+            public const string ContextCtorFile = "DbConstructor.hbs";
             public const string ContextDbSetsFile = "DbSets.hbs";
         }