Skip to content

Commit 5f61374

Browse files
bahusoidbahusoid
committed
Just rename it
1 parent cb0ee18 commit 5f61374

File tree

2 files changed

+59
-60
lines changed

2 files changed

+59
-60
lines changed

‎src/NHibernate.Test/Async/Linq/EnumTests.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ protected override HbmMapping GetMappings()
4444
rc.Table("EnumEntity");
4545
rc.Id(x => x.Id, m => m.Generator(Generators.Guid));
4646
rc.Property(x => x.Name);
47-
rc.Property(x => x.Enum, m => m.Type(_enumType));
48-
rc.Property(x => x.NullableEnum, m =>
47+
rc.Property(x => x.Enum1, m => m.Type(_enumType));
48+
rc.Property(x => x.NullableEnum1, m =>
4949
{
5050
m.Type(_enumType);
5151
m.Formula($"(case when `Enum` = {_unspecifiedValue} then null else `Enum` end)");
@@ -63,16 +63,16 @@ protected override void OnSetUp()
6363
using (var session = OpenSession())
6464
using (var trans = session.BeginTransaction())
6565
{
66-
session.Save(new EnumEntity { Enum = TestEnum.Unspecified });
67-
session.Save(new EnumEntity { Enum = TestEnum.Small });
68-
session.Save(new EnumEntity { Enum = TestEnum.Small });
69-
session.Save(new EnumEntity { Enum = TestEnum.Medium });
70-
session.Save(new EnumEntity { Enum = TestEnum.Medium });
71-
session.Save(new EnumEntity { Enum = TestEnum.Medium });
72-
session.Save(new EnumEntity { Enum = TestEnum.Large });
73-
session.Save(new EnumEntity { Enum = TestEnum.Large });
74-
session.Save(new EnumEntity { Enum = TestEnum.Large });
75-
session.Save(new EnumEntity { Enum = TestEnum.Large });
66+
session.Save(new EnumEntity { Enum1 = TestEnum.Unspecified });
67+
session.Save(new EnumEntity { Enum1 = TestEnum.Small });
68+
session.Save(new EnumEntity { Enum1 = TestEnum.Small });
69+
session.Save(new EnumEntity { Enum1 = TestEnum.Medium });
70+
session.Save(new EnumEntity { Enum1 = TestEnum.Medium });
71+
session.Save(new EnumEntity { Enum1 = TestEnum.Medium });
72+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
73+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
74+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
75+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
7676
trans.Commit();
7777
}
7878
}
@@ -118,7 +118,7 @@ public async Task CanQueryOnEnum_Unspecified_1Async()
118118
using (var session = OpenSession())
119119
using (var trans = session.BeginTransaction())
120120
{
121-
var query = await (session.Query<EnumEntity>().Where(x => x.Enum == type).ToListAsync(cancellationToken));
121+
var query = await (session.Query<EnumEntity>().Where(x => x.Enum1 == type).ToListAsync(cancellationToken));
122122

123123
Assert.AreEqual(expectedCount, query.Count);
124124
}
@@ -131,7 +131,7 @@ public async Task CanQueryWithContainsOnTestEnum_Small_1Async()
131131
using (var session = OpenSession())
132132
using (var trans = session.BeginTransaction())
133133
{
134-
var query = await (session.Query<EnumEntity>().Where(x => values.Contains(x.Enum)).ToListAsync());
134+
var query = await (session.Query<EnumEntity>().Where(x => values.Contains(x.Enum1)).ToListAsync());
135135

136136
Assert.AreEqual(5, query.Count);
137137
}
@@ -145,17 +145,17 @@ public async Task ConditionalNavigationPropertyAsync()
145145
using (var trans = session.BeginTransaction())
146146
{
147147
var entities = session.Query<EnumEntity>();
148-
await (entities.Where(o => o.Enum == TestEnum.Large).ToListAsync());
149-
await (entities.Where(o => TestEnum.Large != o.Enum).ToListAsync());
150-
await (entities.Where(o => (o.NullableEnum ?? TestEnum.Large) == TestEnum.Medium).ToListAsync());
151-
await (entities.Where(o => ((o.NullableEnum ?? type) ?? o.Enum) == TestEnum.Medium).ToListAsync());
152-
153-
await (entities.Where(o => (o.NullableEnum.HasValue ? o.Enum : TestEnum.Unspecified) == TestEnum.Medium).ToListAsync());
154-
await (entities.Where(o => (o.Enum != TestEnum.Large
155-
? (o.NullableEnum.HasValue ? o.Enum : TestEnum.Unspecified)
148+
await (entities.Where(o => o.Enum1 == TestEnum.Large).ToListAsync());
149+
await (entities.Where(o => TestEnum.Large != o.Enum1).ToListAsync());
150+
await (entities.Where(o => (o.NullableEnum1 ?? TestEnum.Large) == TestEnum.Medium).ToListAsync());
151+
await (entities.Where(o => ((o.NullableEnum1 ?? type) ?? o.Enum1) == TestEnum.Medium).ToListAsync());
152+
153+
await (entities.Where(o => (o.NullableEnum1.HasValue ? o.Enum1 : TestEnum.Unspecified) == TestEnum.Medium).ToListAsync());
154+
await (entities.Where(o => (o.Enum1 != TestEnum.Large
155+
? (o.NullableEnum1.HasValue ? o.Enum1 : TestEnum.Unspecified)
156156
: TestEnum.Small) == TestEnum.Medium).ToListAsync());
157157

158-
await (entities.Where(o => (o.Enum == TestEnum.Large ? o.Other : o.Other).Name == "test").ToListAsync());
158+
await (entities.Where(o => (o.Enum1 == TestEnum.Large ? o.Other : o.Other).Name == "test").ToListAsync());
159159
}
160160
}
161161

@@ -170,16 +170,16 @@ public async Task CanQueryComplexExpressionOnTestEnumAsync()
170170
var entities = session.Query<EnumEntity>();
171171

172172
var query = await ((from user in entities
173-
where (user.NullableEnum == TestEnum.Large
173+
where (user.NullableEnum1 == TestEnum.Large
174174
? TestEnum.Medium
175-
: user.NullableEnum ?? user.Enum
175+
: user.NullableEnum1 ?? user.Enum1
176176
) == type
177177
select new
178178
{
179179
user,
180-
simple = user.Enum,
181-
condition = user.Enum == TestEnum.Large ? TestEnum.Medium : user.Enum,
182-
coalesce = user.NullableEnum ?? TestEnum.Medium
180+
simple = user.Enum1,
181+
condition = user.Enum1 == TestEnum.Large ? TestEnum.Medium : user.Enum1,
182+
coalesce = user.NullableEnum1 ?? TestEnum.Medium
183183
}).ToListAsync());
184184

185185
Assert.That(query.Count, Is.EqualTo(0));

‎src/NHibernate.Test/Linq/EnumTests.cs

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,15 @@ protected override HbmMapping GetMappings()
3131
rc.Table("EnumEntity");
3232
rc.Id(x => x.Id, m => m.Generator(Generators.Guid));
3333
rc.Property(x => x.Name);
34-
rc.Property(x => x.Enum, m => m.Type(_enumType));
35-
rc.Property(x => x.NullableEnum, m =>
34+
rc.Property(x => x.Enum1, m => m.Type(_enumType));
35+
rc.Property(x => x.NullableEnum1, m =>
3636
{
3737
m.Type(_enumType);
38-
m.Formula($"(case when `Enum` = {_unspecifiedValue} then null else `Enum` end)");
38+
m.Formula($"(case when Enum1 = {_unspecifiedValue} then null else Enum1 end)");
3939
});
4040
rc.ManyToOne(x => x.Other, m => m.Cascade(Mapping.ByCode.Cascade.All));
4141
});
4242

43-
4443
return mapper.CompileMappingForAllExplicitlyAddedEntities();
4544
}
4645

@@ -50,16 +49,16 @@ protected override void OnSetUp()
5049
using (var session = OpenSession())
5150
using (var trans = session.BeginTransaction())
5251
{
53-
session.Save(new EnumEntity { Enum = TestEnum.Unspecified });
54-
session.Save(new EnumEntity { Enum = TestEnum.Small });
55-
session.Save(new EnumEntity { Enum = TestEnum.Small });
56-
session.Save(new EnumEntity { Enum = TestEnum.Medium });
57-
session.Save(new EnumEntity { Enum = TestEnum.Medium });
58-
session.Save(new EnumEntity { Enum = TestEnum.Medium });
59-
session.Save(new EnumEntity { Enum = TestEnum.Large });
60-
session.Save(new EnumEntity { Enum = TestEnum.Large });
61-
session.Save(new EnumEntity { Enum = TestEnum.Large });
62-
session.Save(new EnumEntity { Enum = TestEnum.Large });
52+
session.Save(new EnumEntity { Enum1 = TestEnum.Unspecified });
53+
session.Save(new EnumEntity { Enum1 = TestEnum.Small });
54+
session.Save(new EnumEntity { Enum1 = TestEnum.Small });
55+
session.Save(new EnumEntity { Enum1 = TestEnum.Medium });
56+
session.Save(new EnumEntity { Enum1 = TestEnum.Medium });
57+
session.Save(new EnumEntity { Enum1 = TestEnum.Medium });
58+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
59+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
60+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
61+
session.Save(new EnumEntity { Enum1 = TestEnum.Large });
6362
trans.Commit();
6463
}
6564
}
@@ -105,7 +104,7 @@ private void CanQueryOnEnum(TestEnum type, int expectedCount)
105104
using (var session = OpenSession())
106105
using (var trans = session.BeginTransaction())
107106
{
108-
var query = session.Query<EnumEntity>().Where(x => x.Enum == type).ToList();
107+
var query = session.Query<EnumEntity>().Where(x => x.Enum1 == type).ToList();
109108

110109
Assert.AreEqual(expectedCount, query.Count);
111110
}
@@ -118,7 +117,7 @@ public void CanQueryWithContainsOnTestEnum_Small_1()
118117
using (var session = OpenSession())
119118
using (var trans = session.BeginTransaction())
120119
{
121-
var query = session.Query<EnumEntity>().Where(x => values.Contains(x.Enum)).ToList();
120+
var query = session.Query<EnumEntity>().Where(x => values.Contains(x.Enum1)).ToList();
122121

123122
Assert.AreEqual(5, query.Count);
124123
}
@@ -132,17 +131,17 @@ public void ConditionalNavigationProperty()
132131
using (var trans = session.BeginTransaction())
133132
{
134133
var entities = session.Query<EnumEntity>();
135-
entities.Where(o => o.Enum == TestEnum.Large).ToList();
136-
entities.Where(o => TestEnum.Large != o.Enum).ToList();
137-
entities.Where(o => (o.NullableEnum ?? TestEnum.Large) == TestEnum.Medium).ToList();
138-
entities.Where(o => ((o.NullableEnum ?? type) ?? o.Enum) == TestEnum.Medium).ToList();
139-
140-
entities.Where(o => (o.NullableEnum.HasValue ? o.Enum : TestEnum.Unspecified) == TestEnum.Medium).ToList();
141-
entities.Where(o => (o.Enum != TestEnum.Large
142-
? (o.NullableEnum.HasValue ? o.Enum : TestEnum.Unspecified)
134+
entities.Where(o => o.Enum1 == TestEnum.Large).ToList();
135+
entities.Where(o => TestEnum.Large != o.Enum1).ToList();
136+
entities.Where(o => (o.NullableEnum1 ?? TestEnum.Large) == TestEnum.Medium).ToList();
137+
entities.Where(o => ((o.NullableEnum1 ?? type) ?? o.Enum1) == TestEnum.Medium).ToList();
138+
139+
entities.Where(o => (o.NullableEnum1.HasValue ? o.Enum1 : TestEnum.Unspecified) == TestEnum.Medium).ToList();
140+
entities.Where(o => (o.Enum1 != TestEnum.Large
141+
? (o.NullableEnum1.HasValue ? o.Enum1 : TestEnum.Unspecified)
143142
: TestEnum.Small) == TestEnum.Medium).ToList();
144143

145-
entities.Where(o => (o.Enum == TestEnum.Large ? o.Other : o.Other).Name == "test").ToList();
144+
entities.Where(o => (o.Enum1 == TestEnum.Large ? o.Other : o.Other).Name == "test").ToList();
146145
}
147146
}
148147

@@ -157,16 +156,16 @@ public void CanQueryComplexExpressionOnTestEnum()
157156
var entities = session.Query<EnumEntity>();
158157

159158
var query = (from user in entities
160-
where (user.NullableEnum == TestEnum.Large
159+
where (user.NullableEnum1 == TestEnum.Large
161160
? TestEnum.Medium
162-
: user.NullableEnum ?? user.Enum
161+
: user.NullableEnum1 ?? user.Enum1
163162
) == type
164163
select new
165164
{
166165
user,
167-
simple = user.Enum,
168-
condition = user.Enum == TestEnum.Large ? TestEnum.Medium : user.Enum,
169-
coalesce = user.NullableEnum ?? TestEnum.Medium
166+
simple = user.Enum1,
167+
condition = user.Enum1 == TestEnum.Large ? TestEnum.Medium : user.Enum1,
168+
coalesce = user.NullableEnum1 ?? TestEnum.Medium
170169
}).ToList();
171170

172171
Assert.That(query.Count, Is.EqualTo(0));
@@ -179,8 +178,8 @@ public class EnumEntity
179178
public virtual Guid Id { get; set; }
180179
public virtual string Name { get; set; }
181180

182-
public virtual TestEnum Enum { get; set; }
183-
public virtual TestEnum? NullableEnum { get; set; }
181+
public virtual TestEnum Enum1 { get; set; }
182+
public virtual TestEnum? NullableEnum1 { get; set; }
184183

185184
public virtual EnumEntity Other { get; set; }
186185
}

0 commit comments

Comments
 (0)