Skip to content

Commit 68c6b34

Browse files
committed
NH-3720
* Ignore Boolean test for SQLite, Firebird, MySQL, and Oracle * Ignore DateTime test for Oracle * Improve DateTime test to suit SQLite
1 parent c3357c4 commit 68c6b34

File tree

1 file changed

+36
-29
lines changed
  • src/NHibernate.Test/NHSpecificTest/NH3377

1 file changed

+36
-29
lines changed

src/NHibernate.Test/NHSpecificTest/NH3377/Fixture.cs

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using NHibernate.Linq;
33
using NUnit.Framework;
44
using System;
5+
using NHibernate.Dialect;
56

67
namespace NHibernate.Test.NHSpecificTest.NH3377
78
{
@@ -10,34 +11,34 @@ public class Fixture : BugTestCase
1011
{
1112
protected override void OnSetUp()
1213
{
13-
using (ISession session = OpenSession())
14-
using (ITransaction transaction = session.BeginTransaction())
14+
using (var session = OpenSession())
15+
using (var transaction = session.BeginTransaction())
1516
{
1617
var e1 = new Entity
17-
{
18-
Name = "Bob",
19-
Age = "17",
20-
Solde = "5.4"
21-
};
18+
{
19+
Name = "Bob",
20+
Age = "17",
21+
Solde = "5.4"
22+
};
2223
session.Save(e1);
2324

2425
var e2 = new Entity
25-
{
26-
Name = "Sally",
27-
Age = "16"
28-
};
26+
{
27+
Name = "Sally",
28+
Age = "16"
29+
};
2930
session.Save(e2);
3031

3132
var e3 = new Entity
3233
{
33-
Name = "True",
34+
Name = "true",
3435
Age = "10"
3536
};
3637
session.Save(e3);
3738

3839
var e4 = new Entity
3940
{
40-
Name = "20141013",
41+
Name = "2014-10-13",
4142
Age = "11"
4243
};
4344
session.Save(e4);
@@ -49,8 +50,8 @@ protected override void OnSetUp()
4950

5051
protected override void OnTearDown()
5152
{
52-
using (ISession session = OpenSession())
53-
using (ITransaction transaction = session.BeginTransaction())
53+
using (var session = OpenSession())
54+
using (var transaction = session.BeginTransaction())
5455
{
5556
session.Delete("from System.Object");
5657

@@ -62,53 +63,59 @@ protected override void OnTearDown()
6263
[Test]
6364
public void ShouldBeAbleToCallConvertToInt32FromStringParameter()
6465
{
65-
using (ISession session = OpenSession())
66+
using (var session = OpenSession())
6667
using (session.BeginTransaction())
6768
{
68-
var result = from e in session.Query<Entity>()
69-
where e.Name == "Bob"
70-
select Convert.ToInt32(e.Age);
69+
var result = (from e in session.Query<Entity>()
70+
where e.Name == "Bob"
71+
select Convert.ToInt32(e.Age)).ToList();
7172

72-
Assert.AreEqual(1, result.Count());
73-
Assert.AreEqual(17, result.First());
73+
Assert.That(result, Has.Count.EqualTo(1));
74+
Assert.That(result[0], Is.EqualTo(17));
7475
}
7576
}
7677

7778
[Test]
7879
public void ShouldBeAbleToCallConvertToInt32FromStringParameterInMax()
7980
{
80-
using (ISession session = OpenSession())
81+
using (var session = OpenSession())
8182
using (session.BeginTransaction())
8283
{
8384
var result = session.Query<Entity>().Max(e => Convert.ToInt32(e.Age));
8485

85-
Assert.AreEqual(17, result);
86+
Assert.That(result, Is.EqualTo(17));
8687
}
8788
}
8889

8990
[Test]
9091
public void ShouldBeAbleToCallConvertToBooleanFromStringParameter()
9192
{
93+
if (Dialect is SQLiteDialect || Dialect is FirebirdDialect || Dialect is MySQLDialect || Dialect is Oracle8iDialect)
94+
Assert.Ignore(Dialect.GetType() + " is not supported");
95+
9296
//NH-3720
93-
using (ISession session = OpenSession())
97+
using (var session = OpenSession())
9498
using (session.BeginTransaction())
9599
{
96-
var result = session.Query<Entity>().Where(x => x.Name == Boolean.TrueString).Select(x => Convert.ToBoolean(x.Name)).Single();
100+
var result = session.Query<Entity>().Where(x => x.Name == "true").Select(x => Convert.ToBoolean(x.Name)).Single();
97101

98-
Assert.AreEqual(true, result);
102+
Assert.That(result, Is.True);
99103
}
100104
}
101105

102106
[Test]
103107
public void ShouldBeAbleToCallConvertToDateTimeFromStringParameter()
104108
{
109+
if (Dialect is Oracle8iDialect)
110+
Assert.Ignore(Dialect.GetType() + " is not supported");
111+
105112
//NH-3720
106-
using (ISession session = OpenSession())
113+
using (var session = OpenSession())
107114
using (session.BeginTransaction())
108115
{
109-
var result = session.Query<Entity>().Where(x => x.Name == "20141013").Select(x => Convert.ToDateTime(x.Name)).Single();
116+
var result = session.Query<Entity>().Where(x => x.Name == "2014-10-13").Select(x => Convert.ToDateTime(x.Name)).Single();
110117

111-
Assert.AreEqual(new DateTime(2014, 10, 13), result);
118+
Assert.That(result, Is.EqualTo(new DateTime(2014, 10, 13)));
112119
}
113120
}
114121
}

0 commit comments

Comments
 (0)