Skip to content

Commit ec00730

Browse files
committed
Several tests fixed, one kept ignored just in case
Net6 version works though
1 parent 435abfb commit ec00730

3 files changed

Lines changed: 37 additions & 3 deletions

File tree

Orm/Xtensive.Orm.Tests/Storage/LegacyDb/CrazyColumns2008Test.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,19 @@ public class Crazy : Entity
1919
[Field, Key]
2020
public Guid Id { get; private set; }
2121

22+
#if NET6_0_OR_GREATER
23+
[Field]
24+
public TimeOnly Time { get; set; }
25+
26+
[Field]
27+
public DateOnly Date { get; set; }
28+
#else
2229
[Field]
2330
public DateTime Time { get; set; }
2431

2532
[Field]
2633
public DateTime Date { get; set; }
34+
#endif
2735
}
2836
}
2937

@@ -46,6 +54,31 @@ protected override DomainConfiguration BuildConfiguration()
4654
return config;
4755
}
4856

57+
#if NET6_0_OR_GREATER
58+
[Test]
59+
[Ignore("Fix later")]
60+
public void CombinedTest()
61+
{
62+
var date = new DateTime(2000, 01, 01);
63+
var time = new DateTime(1, 1, 1, 12, 00, 00);
64+
using (var session = Domain.OpenSession())
65+
using (var ts = session.OpenTransaction()) {
66+
var crazy1 = new Crazy { Date = DateOnly.FromDateTime(date), Time = TimeOnly.FromDateTime(DateTime.Now) };
67+
var crazy2 = new Crazy { Date = DateOnly.FromDateTime(DateTime.Now), Time = TimeOnly.FromDateTime(time) };
68+
ts.Complete();
69+
}
70+
71+
using (var session = Domain.OpenSession())
72+
using (session.OpenTransaction()) {
73+
foreach (var item in session.Query.All<Crazy>()) {
74+
Console.WriteLine(item.Date);
75+
Console.WriteLine(item.Time);
76+
}
77+
Assert.AreEqual(1, session.Query.All<Crazy>().Where(o => o.Date == DateOnly.FromDateTime(date)).Count());
78+
Assert.AreEqual(1, session.Query.All<Crazy>().Where(o => o.Time == TimeOnly.FromDateTime(time)).Count());
79+
}
80+
}
81+
#else
4982
[Test]
5083
[Ignore("Fix later")]
5184
public void CombinedTest()
@@ -69,6 +102,7 @@ public void CombinedTest()
69102
Assert.AreEqual(1, session.Query.All<Crazy>().Where(o => o.Time==time).Count());
70103
}
71104
}
105+
#endif
72106

73107
protected override string GetCreateDbScript(DomainConfiguration config)
74108
{

Orm/Xtensive.Orm.Tests/Storage/SessionEventsTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using Xtensive.Orm.Configuration;
1111
using Xtensive.Orm.Tests.Storage.SessionEventsTestModel;
1212
using System.Threading.Tasks;
13-
using Renci.SshNet;
1413
using System.Linq;
1514

1615
namespace Xtensive.Orm.Tests.Storage.SessionEventsTestModel

Orm/Xtensive.Orm.Tests/Upgrade/FullText/DomainUpgradeFullTextTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode)
4949
configuration.UpgradeMode = upgradeMode;
5050
configuration.Types.Register(Assembly.GetExecutingAssembly(),
5151
"Xtensive.Orm.Tests.Upgrade.FullText.Model." + version);
52-
using (Upgrader.Enable(version)) {
52+
configuration.Types.Register(typeof(Model.Upgrader));
53+
using (Model.Upgrader.Enable(version)) {
5354
var domain = Domain.Build(configuration);
5455
return domain;
5556
}
@@ -61,7 +62,7 @@ private async Task<Domain> BuildDomainAsync(string version, DomainUpgradeMode up
6162
configuration.UpgradeMode = upgradeMode;
6263
configuration.Types.Register(Assembly.GetExecutingAssembly(),
6364
"Xtensive.Orm.Tests.Upgrade.FullText.Model." + version);
64-
using (Upgrader.Enable(version)) {
65+
using (Model.Upgrader.Enable(version)) {
6566
var domain = await Domain.BuildAsync(configuration);
6667
return domain;
6768
}

0 commit comments

Comments
 (0)