Skip to content

Commit 94b220d

Browse files
fredericDelaportefredericDelaporte
committed
Fix SQL-ServerCE failures and regen Async.
To be squashed.
1 parent 9e61353 commit 94b220d

File tree

6 files changed

+542
-1
lines changed

6 files changed

+542
-1
lines changed

‎src/NHibernate.Test/Async/NHSpecificTest/GH2067/BaseAndDerivedClassProxiesFixture.cs

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by AsyncGenerator.
4+
//
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
11+
using System;
12+
using NHibernate.Cfg.MappingSchema;
13+
using NHibernate.Mapping.ByCode;
14+
using NUnit.Framework;
15+
16+
namespace NHibernate.Test.NHSpecificTest.GH2067
17+
{
18+
using System.Threading.Tasks;
19+
namespace BaseAndDerivedClassProxies
20+
{
21+
using System.Threading.Tasks;
22+
23+
[TestFixture]
24+
public class BaseAndDerivedClassProxiesFixtureAsync : TestCaseMappingByCode
25+
{
26+
private Guid _id = Guid.NewGuid();
27+
28+
protected override HbmMapping GetMappings()
29+
{
30+
var mapper = new ModelMapper();
31+
mapper.Class<Base>(
32+
rc =>
33+
{
34+
rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
35+
rc.Property(x => x.BaseName);
36+
});
37+
38+
mapper.JoinedSubclass<Derived1>(
39+
rc => { rc.Property(x => x.Derived1Name); });
40+
41+
mapper.JoinedSubclass<Derived2>(
42+
rc => { rc.Property(x => x.Derived2Name); });
43+
44+
return mapper.CompileMappingForAllExplicitlyAddedEntities();
45+
}
46+
47+
[Test]
48+
public async Task ProxyForBaseAsync()
49+
{
50+
using (var s = OpenSession())
51+
{
52+
var b = await (s.LoadAsync<Base>(_id));
53+
Assert.That(b.Id, Is.EqualTo(_id));
54+
}
55+
}
56+
57+
[Test]
58+
public async Task ProxyForDerived1Async()
59+
{
60+
using (var s = OpenSession())
61+
{
62+
var b = await (s.LoadAsync(typeof(Derived1), _id));
63+
64+
Assert.That(b, Is.InstanceOf(typeof(Derived1)));
65+
Assert.That(b, Is.InstanceOf(typeof(Base)));
66+
Assert.That(((Derived1) b).Id, Is.EqualTo(_id));
67+
}
68+
}
69+
70+
[Test]
71+
public async Task ProxyForDerived2Async()
72+
{
73+
using (var s = OpenSession())
74+
{
75+
var b = await (s.LoadAsync(typeof(Derived2), _id));
76+
77+
Assert.That(b, Is.InstanceOf(typeof(Derived1)));
78+
Assert.That(b, Is.InstanceOf(typeof(Derived2)));
79+
Assert.That(b, Is.InstanceOf(typeof(Base)));
80+
Assert.That(((Derived2) b).Id, Is.EqualTo(_id));
81+
}
82+
}
83+
}
84+
}
85+
}

‎src/NHibernate.Test/Async/NHSpecificTest/GH2067/BaseClassAndDerivedInterfaceProxiesFixture.cs

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by AsyncGenerator.
4+
//
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
11+
using System;
12+
using NHibernate.Cfg.MappingSchema;
13+
using NHibernate.Mapping.ByCode;
14+
using NUnit.Framework;
15+
16+
namespace NHibernate.Test.NHSpecificTest.GH2067
17+
{
18+
using System.Threading.Tasks;
19+
namespace BaseClassAndDerivedInterfaceProxies
20+
{
21+
using System.Threading.Tasks;
22+
23+
[TestFixture]
24+
public class BaseClassAndDerivedInterfaceProxiesFixtureAsync : TestCaseMappingByCode
25+
{
26+
private Guid _id = Guid.NewGuid();
27+
28+
protected override HbmMapping GetMappings()
29+
{
30+
var mapper = new ModelMapper();
31+
mapper.Class<Base>(
32+
rc =>
33+
{
34+
rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
35+
rc.Property(x => x.BaseName);
36+
});
37+
38+
mapper.JoinedSubclass<Derived1Interface>(
39+
rc =>
40+
{
41+
rc.Proxy(typeof(IDerived1));
42+
rc.Property(x => x.Derived1Name);
43+
});
44+
45+
mapper.JoinedSubclass<Derived2Interface>(
46+
rc =>
47+
{
48+
rc.Proxy(typeof(IDerived2));
49+
rc.Property(x => x.Derived2Name);
50+
});
51+
52+
return mapper.CompileMappingForAllExplicitlyAddedEntities();
53+
}
54+
55+
[Test]
56+
public async Task ProxyForBaseClassAsync()
57+
{
58+
using (var s = OpenSession())
59+
{
60+
var b = await (s.LoadAsync<Base>(_id));
61+
Assert.That(b.Id, Is.EqualTo(_id));
62+
}
63+
}
64+
65+
[Test]
66+
public async Task ProxyForDerived1InterfaceAsync()
67+
{
68+
using (var s = OpenSession())
69+
{
70+
var b = await (s.LoadAsync(typeof(Derived1Interface), _id));
71+
72+
Assert.That(b, Is.InstanceOf(typeof(IDerived1)));
73+
// Assert.That(b, Is.InstanceOf(typeof(Base)));
74+
Assert.That(((IDerived1) b).Id, Is.EqualTo(_id));
75+
}
76+
}
77+
78+
[Test]
79+
public async Task ProxyForDerived2InterfaceAsync()
80+
{
81+
using (var s = OpenSession())
82+
{
83+
var b = await (s.LoadAsync(typeof(Derived2Interface), _id));
84+
85+
Assert.That(b, Is.InstanceOf(typeof(IDerived2)));
86+
// Assert.That(b, Is.InstanceOf(typeof(IDerived1)));
87+
// Assert.That(b, Is.InstanceOf(typeof(Base)));
88+
Assert.That(((IDerived2) b).Id, Is.EqualTo(_id));
89+
}
90+
}
91+
}
92+
}
93+
}

‎src/NHibernate.Test/Async/NHSpecificTest/GH2067/BaseClassDerived1InterfaceDerived2ClassProxiesFixture.cs

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by AsyncGenerator.
4+
//
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
11+
using System;
12+
using NHibernate.Cfg.MappingSchema;
13+
using NHibernate.Mapping.ByCode;
14+
using NUnit.Framework;
15+
16+
namespace NHibernate.Test.NHSpecificTest.GH2067
17+
{
18+
using System.Threading.Tasks;
19+
namespace BaseClassDerived1InterfaceDerived2ClassProxies
20+
{
21+
using System.Threading.Tasks;
22+
23+
[TestFixture]
24+
public class BaseClassDerived1InterfaceDerived2ClassProxiesFixtureAsync : TestCaseMappingByCode
25+
{
26+
private Guid _id = Guid.NewGuid();
27+
28+
protected override HbmMapping GetMappings()
29+
{
30+
var mapper = new ModelMapper();
31+
mapper.Class<Base>(
32+
rc =>
33+
{
34+
rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
35+
rc.Property(x => x.BaseName);
36+
});
37+
38+
mapper.JoinedSubclass<Derived1>(
39+
rc =>
40+
{
41+
rc.Proxy(typeof(IDerived1));
42+
rc.Property(x => x.Derived1Name);
43+
});
44+
45+
mapper.JoinedSubclass<Derived2>(
46+
rc => { rc.Property(x => x.Derived2Name); });
47+
48+
return mapper.CompileMappingForAllExplicitlyAddedEntities();
49+
}
50+
51+
[Test]
52+
public async Task ProxyForBaseAsync()
53+
{
54+
using (var s = OpenSession())
55+
{
56+
var b = await (s.LoadAsync(typeof(Base), _id));
57+
Assert.That(((Base) b).Id, Is.EqualTo(_id));
58+
}
59+
}
60+
61+
[Test]
62+
public async Task ProxyForDerived1InterfaceAsync()
63+
{
64+
using (var s = OpenSession())
65+
{
66+
var b = await (s.LoadAsync(typeof(Derived1), _id));
67+
68+
Assert.That(b, Is.InstanceOf(typeof(IDerived1)));
69+
//Assert.That(b, Is.InstanceOf(typeof(Base)));
70+
Assert.That(((IDerived1) b).Id, Is.EqualTo(_id));
71+
}
72+
}
73+
74+
[Test]
75+
public async Task ProxyForDerived2Async()
76+
{
77+
using (var s = OpenSession())
78+
{
79+
var b = await (s.LoadAsync(typeof(Derived2), _id));
80+
81+
Assert.That(b, Is.InstanceOf(typeof(IDerived1)));
82+
Assert.That(b, Is.InstanceOf(typeof(Derived2)));
83+
Assert.That(b, Is.InstanceOf(typeof(Base)));
84+
Assert.That(((Derived2) b).Id, Is.EqualTo(_id));
85+
}
86+
}
87+
}
88+
}
89+
}

‎src/NHibernate.Test/Async/NHSpecificTest/GH2067/BaseInterfaceAndDerivedClassProxiesFixture.cs

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by AsyncGenerator.
4+
//
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
11+
using System;
12+
using NHibernate.Cfg.MappingSchema;
13+
using NHibernate.Mapping.ByCode;
14+
using NUnit.Framework;
15+
16+
namespace NHibernate.Test.NHSpecificTest.GH2067
17+
{
18+
using System.Threading.Tasks;
19+
namespace BaseInterfaceAndDerivedClassProxies
20+
{
21+
using System.Threading.Tasks;
22+
23+
[TestFixture]
24+
public class BaseInterfaceAndDerivedClassProxiesFixtureAsync : TestCaseMappingByCode
25+
{
26+
private Guid _id = Guid.NewGuid();
27+
28+
protected override HbmMapping GetMappings()
29+
{
30+
var mapper = new ModelMapper();
31+
mapper.Class<BaseInterface>(
32+
rc =>
33+
{
34+
rc.Proxy(typeof(IBase));
35+
rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
36+
rc.Property(x => x.BaseName);
37+
});
38+
39+
mapper.JoinedSubclass<Derived1>(
40+
rc => { rc.Property(x => x.Derived1Name); });
41+
42+
mapper.JoinedSubclass<Derived2>(
43+
rc => { rc.Property(x => x.Derived2Name); });
44+
45+
return mapper.CompileMappingForAllExplicitlyAddedEntities();
46+
}
47+
48+
[Test]
49+
public async Task ProxyForBaseAsync()
50+
{
51+
using (var s = OpenSession())
52+
{
53+
var b = await (s.LoadAsync(typeof(IBase), _id));
54+
Assert.That(((IBase) b).Id, Is.EqualTo(_id));
55+
}
56+
}
57+
58+
[Test]
59+
public async Task ProxyForDerived1Async()
60+
{
61+
using (var s = OpenSession())
62+
{
63+
var b = await (s.LoadAsync(typeof(Derived1), _id));
64+
65+
Assert.That(b, Is.InstanceOf(typeof(Derived1)));
66+
Assert.That(b, Is.InstanceOf(typeof(IBase)));
67+
Assert.That(((Derived1) b).Id, Is.EqualTo(_id));
68+
}
69+
}
70+
71+
[Test]
72+
public async Task ProxyForDerived2Async()
73+
{
74+
using (var s = OpenSession())
75+
{
76+
var b = await (s.LoadAsync(typeof(Derived2), _id));
77+
78+
Assert.That(b, Is.InstanceOf(typeof(Derived1)));
79+
Assert.That(b, Is.InstanceOf(typeof(Derived2)));
80+
Assert.That(b, Is.InstanceOf(typeof(IBase)));
81+
Assert.That(((Derived2) b).Id, Is.EqualTo(_id));
82+
}
83+
}
84+
}
85+
}
86+
}

0 commit comments

Comments
 (0)