Skip to content

Commit a81d68c

Browse files
committed
NH-1192 - Ignore tests for Oracle as it does not support &, |, ^ as bitwise operators.
1 parent 454979f commit a81d68c

File tree

3 files changed

+20
-32
lines changed

3 files changed

+20
-32
lines changed

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

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,36 @@
1-
using System;
2-
using System.Collections;
3-
using System.Collections.Generic;
4-
using System.Text;
1+
using System.Collections.Generic;
2+
using NHibernate.Dialect;
53
using NUnit.Framework;
64

75
namespace NHibernate.Test.NHSpecificTest.NH1775
86
{
97
[TestFixture]
108
public class Fixture : BugTestCase
119
{
12-
protected override string MappingsAssembly
10+
protected override bool AppliesTo(Dialect.Dialect dialect)
1311
{
14-
get { return "NHibernate.Test"; }
12+
return !(dialect is Oracle8iDialect);
1513
}
1614

17-
protected override IList Mappings
15+
protected override void OnSetUp()
1816
{
19-
get { return new[] { "NHSpecificTest.NH1775.Member.hbm.xml" }; }
17+
using (var s = OpenSession())
18+
using (var tx = s.BeginTransaction())
19+
{
20+
s.Save(new Member { FirstName = "Bob", LastName = "One", Roles = 1 });
21+
s.Save(new Member { FirstName = "Bob", LastName = "Two", Roles = 2 });
22+
s.Save(new Member { FirstName = "Bob", LastName = "Four", Roles = 4 });
23+
s.Save(new Member { FirstName = "Bob", LastName = "OneAndFour", Roles = 5 });
24+
25+
tx.Commit();
26+
}
2027
}
2128

2229
[Test]
2330
public void BitwiseOperationsShouldBeSupported()
2431
{
25-
using (ISession s = OpenSession())
26-
{
27-
using (ITransaction tx = s.BeginTransaction())
28-
{
29-
Member m = new Member {FirstName = "Bob", LastName = "One", Roles = 1};
30-
s.Save(m);
31-
32-
m = new Member { FirstName = "Bob", LastName = "Two", Roles = 2 };
33-
s.Save(m);
34-
35-
m = new Member { FirstName = "Bob", LastName = "Four", Roles = 4 };
36-
s.Save(m);
37-
38-
m = new Member { FirstName = "Bob", LastName = "OneAndFour", Roles = 5 };
39-
s.Save(m);
40-
tx.Commit();
41-
}
42-
}
43-
44-
using (ISession s = OpenSession())
45-
using (ITransaction tx = s.BeginTransaction())
32+
using (var s = OpenSession())
33+
using (var tx = s.BeginTransaction())
4634
{
4735
// &
4836
IList<DTO> result = s.CreateQuery("select new DTO(m.Id, concat(m.FirstName, ' ', m.LastName)) from Member m where (m.Roles & :roles) = :roles")
@@ -83,8 +71,8 @@ public void BitwiseOperationsShouldBeSupported()
8371

8472
protected override void OnTearDown()
8573
{
86-
using (ISession s = OpenSession())
87-
using (ITransaction tx = s.BeginTransaction())
74+
using (var s = OpenSession())
75+
using (var tx = s.BeginTransaction())
8876
{
8977
s.Delete("from Member");
9078
tx.Commit();

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3323,7 +3323,7 @@
33233323
<EmbeddedResource Include="NHSpecificTest\NH1343\Mappings.hbm.xml" />
33243324
<EmbeddedResource Include="NHSpecificTest\NH1264\Passenger.hbm.xml" />
33253325
<EmbeddedResource Include="NHSpecificTest\NH1264\Reservation.hbm.xml" />
3326-
<EmbeddedResource Include="NHSpecificTest\NH1775\Member.hbm.xml" />
3326+
<EmbeddedResource Include="NHSpecificTest\NH1775\Mappings.hbm.xml" />
33273327
<EmbeddedResource Include="NHSpecificTest\NH1388\Mappings.hbm.xml" />
33283328
<EmbeddedResource Include="NHSpecificTest\ElementsEnums\SimpleWithEnums.hbm.xml" />
33293329
<EmbeddedResource Include="NHSpecificTest\NH1574\Mappings.hbm.xml" />

0 commit comments

Comments
 (0)