Skip to content

Commit 0ff6ce2

Browse files
committed
test fix
1 parent 37f892e commit 0ff6ce2

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ indent_style = space
99
indent_size = 4
1010
insert_final_newline = true
1111
trim_trailing_whitespace = true
12-
vsspell_section_id = 41b65011239a40959ccaae2a4ec7044a
13-
vsspell_ignored_words_41b65011239a40959ccaae2a4ec7044a = accessor|awaitable|app|clr|inline|middleware|mvc|validator|deconstruct|nullable|serializer|deserializer|serialization|deserialization|queryable
12+
vsspell_section_id = main
13+
vsspell_ignored_words_main = accessor|app|awaitable|cacheable|clr|deconstruct|deserialization|deserializer|inline|json|middleware|mvc|nullable|queryable|serialization|serializer|upsert|validator
1414

1515
# XML Configuration Files
1616
[*.{xml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct,refactorlog,runsettings}]

src/EntityFrameworkCore.Generator.Core/Scripts/ScriptTemplateBase.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,8 @@ protected virtual void WriteCode()
4848

4949
// save file
5050
var directory = TemplateOptions.Directory;
51-
if (directory.HasValue() && !Directory.Exists(directory))
52-
Directory.CreateDirectory(directory);
53-
5451
var fileName = TemplateOptions.FileName;
52+
5553
if (directory.IsNullOrEmpty() || fileName.IsNullOrEmpty())
5654
{
5755
Logger.LogWarning("Template '{template}' could not resolve output file.", templatePath);
@@ -81,6 +79,9 @@ protected virtual void WriteCode()
8179
return;
8280
}
8381

82+
if (directory.HasValue() && !Directory.Exists(directory))
83+
Directory.CreateDirectory(directory);
84+
8485
if (exists && TemplateOptions.Merge && !TemplateOptions.Overwrite)
8586
RegionReplace.MergeFile(path, content);
8687
else

test/EntityFrameworkCore.Generator.Core.Tests/Parsing/RegionParserTests.cs

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,26 @@ public void ParseRegionsMultipleClasses()
172172
var first = result[0];
173173
Assert.NotNull(first);
174174
Assert.Equal("Generated Properties", first.RegionName);
175+
Assert.Equal("User", first.ClassName);
175176

176-
var content = new StringBuilder();
177-
content.AppendLine(@"#region Generated Properties");
178-
content.AppendLine(@" public Guid Id { get; set; }");
179-
content.AppendLine(@" #endregion");
177+
var firstContent = new StringBuilder();
178+
firstContent.AppendLine(@"#region Generated Properties");
179+
firstContent.AppendLine(@" public Guid UserId { get; set; }");
180+
firstContent.AppendLine(@" #endregion");
180181

181-
Assert.Equal(content.ToString(), first.Content);
182+
Assert.Equal(firstContent.ToString(), first.Content);
183+
184+
var second = result[1];
185+
Assert.NotNull(second);
186+
Assert.Equal("Generated Properties", second.RegionName);
187+
Assert.Equal("Tester", second.ClassName);
188+
189+
var secondContent = new StringBuilder();
190+
secondContent.AppendLine(@"#region Generated Properties");
191+
secondContent.AppendLine(@" public Guid TesterId { get; set; }");
192+
secondContent.AppendLine(@" #endregion");
182193

194+
Assert.Equal(secondContent.ToString(), second.Content);
183195
}
184196

185197
}

0 commit comments

Comments
 (0)