Skip to content

Commit 96f84a2

Browse files
Clean up the test case
1 parent 08c6a3f commit 96f84a2

File tree

3 files changed

+16
-28
lines changed

3 files changed

+16
-28
lines changed

src/NHibernate.Test/NHSpecificTest/GH3643/Entity.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
1+
using System.Collections.Generic;
42

53
// ReSharper disable CollectionNeverUpdated.Local
64
// ReSharper disable UnassignedGetOnlyAutoProperty
@@ -9,14 +7,14 @@ namespace NHibernate.Test.NHSpecificTest.GH3643
97
{
108
class Entity
119
{
12-
private readonly ICollection<ChildEntity> _children = new List<ChildEntity>();
13-
public virtual EntityId Id { get; protected set; }
14-
public virtual IEnumerable<ChildEntity> Children => _children.AsEnumerable();
10+
private readonly ICollection<ChildEntity> _children = [];
11+
public virtual EntityId Id { get; set; }
12+
public virtual ICollection<ChildEntity> Children => _children;
1513
}
1614

1715
class ChildEntity
1816
{
19-
public virtual int Id { get; protected set; }
17+
public virtual int Id { get; set; }
2018
}
2119

2220
enum EntityId

src/NHibernate.Test/NHSpecificTest/GH3643/FixtureByCode.cs

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ protected override HbmMapping GetMappings()
3030
{
3131
m.Access(Accessor.Field);
3232
m.Key(k => k.Column("EntityId"));
33+
m.Cascade(Mapping.ByCode.Cascade.All);
3334
},
3435
r => r.OneToMany());
3536

@@ -60,19 +61,12 @@ protected override void OnSetUp()
6061
{
6162
using var session = OpenSession();
6263
using var transaction = session.BeginTransaction();
63-
64-
session.CreateSQLQuery(
65-
"INSERT INTO Entity (Id) VALUES (0)"
66-
).ExecuteUpdate();
6764

68-
session.CreateSQLQuery(
69-
"INSERT INTO ChildEntity (Id, EntityId) VALUES (0, 0)"
70-
).ExecuteUpdate();
65+
var entity = new Entity { Id = EntityId.Id1 };
66+
entity.Children.Add(new ChildEntity { Id = 0 });
67+
entity.Children.Add(new ChildEntity { Id = 1 });
68+
session.Save(entity);
7169

72-
session.CreateSQLQuery(
73-
"INSERT INTO ChildEntity (Id, EntityId) VALUES (1, 0)"
74-
).ExecuteUpdate();
75-
7670
transaction.Commit();
7771
}
7872

@@ -81,8 +75,8 @@ protected override void OnTearDown()
8175
using var session = OpenSession();
8276
using var transaction = session.BeginTransaction();
8377

84-
session.CreateSQLQuery("DELETE FROM ChildEntity").ExecuteUpdate();
85-
session.CreateSQLQuery("DELETE FROM Entity").ExecuteUpdate();
78+
session.CreateQuery("delete from ChildEntity").ExecuteUpdate();
79+
session.CreateQuery("delete from System.Object").ExecuteUpdate();
8680

8781
transaction.Commit();
8882
}
@@ -106,10 +100,10 @@ private Entity LoadEntityWithQueryCache()
106100
using var session = OpenSession();
107101
using var transaction = session.BeginTransaction();
108102
var entity = session
109-
.Query<Entity>()
110-
.FetchMany(x => x.Children)
111-
.WithOptions(opt => opt.SetCacheable(true))
112-
.ToList()[0];
103+
.Query<Entity>()
104+
.FetchMany(x => x.Children)
105+
.WithOptions(opt => opt.SetCacheable(true))
106+
.ToList()[0];
113107

114108
transaction.Commit();
115109
return entity;

src/NHibernate.sln.DotSettings

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
2222
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
2323
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
24-
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=15b5b1f1_002D457c_002D4ca6_002Db278_002D5615aedc07d3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
25-
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
26-
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" WarnAboutPrefixesAndSuffixes="False" Prefix="_" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
2724
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
2825
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
2926
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -32,7 +29,6 @@
3229
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
3330
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
3431
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
35-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
3632
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EFormat_002ESettingsUpgrade_002EAlignmentTabFillStyleMigration/@EntryIndexedValue">True</s:Boolean>
3733
<s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
3834
<s:Boolean x:Key="/Default/PatternsAndTemplates/StructuralSearch/Pattern/=0BE95D01E0F2244E97F5FEFAD1EB1A63/@KeyIndexDefined">True</s:Boolean>

0 commit comments

Comments
 (0)