Skip to content

Commit d25d292

Browse files
author
mickfold
committed
Changed Methods and Properties so they conform to coding conventions, i.e first letter capitalised. Also fixed a number of minor typos.
1 parent bb43119 commit d25d292

36 files changed

+2010
-119
lines changed

‎src/NHibernate.Test/NHSpecificTest/NH1262/fk/bidirectional/DeleteOneToOneOrphansTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protected override void OnSetUp()
1717
using (var t = s.BeginTransaction())
1818
{
1919
var emp = new Employee();
20-
emp.info = new EmployeeInfo(emp);
20+
emp.Info = new EmployeeInfo(emp);
2121

2222
s.Save(emp);
2323
t.Commit();
@@ -38,7 +38,7 @@ protected override void OnTearDown()
3838
}
3939

4040
[Test]
41-
public void testOrphanedWhileManaged()
41+
public void TestOrphanedWhileManaged()
4242
{
4343
long empId = 0;
4444

@@ -54,16 +54,16 @@ public void testOrphanedWhileManaged()
5454
var emp = empResults[0];
5555
Assert.NotNull(emp);
5656

57-
empId = emp.id;
58-
emp.info = null;
57+
empId = emp.Id;
58+
emp.Info = null;
5959
t.Commit();
6060
}
6161

6262
using (var s = OpenSession())
6363
using (var t = s.BeginTransaction())
6464
{
6565
var emp = s.Get<Employee>(empId);
66-
Assert.Null(emp.info);
66+
Assert.Null(emp.Info);
6767

6868
var empInfoResults = s.CreateQuery("from EmployeeInfo").List<EmployeeInfo>();
6969
Assert.AreEqual(0, empInfoResults.Count);

‎src/NHibernate.Test/NHSpecificTest/NH1262/fk/bidirectional/DeleteOneToOneOrphansTest.cs.orig‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
<<<<<<< HEAD
2+
using NUnit.Framework;
3+
4+
namespace NHibernate.Test.NHSpecificTest.NH1262.fk.bidirectional
5+
{
6+
[TestFixture]
7+
public class DeleteOneToOneOrphansTest : BugTestCase
8+
{
9+
public override string BugNumber
10+
{
11+
get { return "NH1262.fk.bidirectional"; }
12+
}
13+
14+
protected override void OnSetUp()
15+
{
16+
base.OnSetUp();
17+
using (var s = OpenSession())
18+
using (var t = s.BeginTransaction())
19+
{
20+
var emp = new Employee();
21+
emp.info = new EmployeeInfo(emp);
22+
23+
s.Save(emp);
24+
t.Commit();
25+
}
26+
}
27+
28+
protected override void OnTearDown()
29+
{
30+
base.OnTearDown();
31+
32+
using (var session = OpenSession())
33+
using (var tx = session.BeginTransaction())
34+
{
35+
session.Delete("from EmployeeInfo");
36+
session.Delete("from Employee");
37+
tx.Commit();
38+
}
39+
}
40+
41+
[Test]
42+
public void testOrphanedWhileManaged()
43+
{
44+
long empId = 0;
45+
46+
using (var s = OpenSession())
47+
using (var t = s.BeginTransaction())
48+
{
49+
var empInfoResults = s.CreateQuery("from EmployeeInfo").List<EmployeeInfo>();
50+
Assert.AreEqual(1, empInfoResults.Count);
51+
52+
var empResults = s.CreateQuery("from Employee").List<Employee>();
53+
Assert.AreEqual(1, empResults.Count);
54+
55+
var emp = empResults[0];
56+
Assert.NotNull(emp);
57+
58+
empId = emp.id;
59+
emp.info = null;
60+
t.Commit();
61+
}
62+
63+
using (var s = OpenSession())
64+
using (var t = s.BeginTransaction())
65+
{
66+
var emp = s.Get<Employee>(empId);
67+
Assert.Null(emp.info);
68+
69+
var empInfoResults = s.CreateQuery("from EmployeeInfo").List<EmployeeInfo>();
70+
Assert.AreEqual(0, empInfoResults.Count);
71+
72+
var empResults = s.CreateQuery("from Employee").List<Employee>();
73+
Assert.AreEqual(1, empResults.Count);
74+
75+
t.Commit();
76+
}
77+
}
78+
79+
}
80+
}
81+
=======
82+
using NUnit.Framework;
83+
84+
namespace NHibernate.Test.NHSpecificTest.NH1262.fk.bidirectional
85+
{
86+
[TestFixture]
87+
public class DeleteOneToOneOrphansTest : BugTestCase
88+
{
89+
public override string BugNumber
90+
{
91+
get { return "NH1262.fk.bidirectional"; }
92+
}
93+
94+
protected override void OnSetUp()
95+
{
96+
base.OnSetUp();
97+
using (var s = OpenSession())
98+
using (var t = s.BeginTransaction())
99+
{
100+
var emp = new Employee();
101+
emp.Info = new EmployeeInfo(emp);
102+
103+
s.Save(emp);
104+
t.Commit();
105+
}
106+
}
107+
108+
protected override void OnTearDown()
109+
{
110+
base.OnTearDown();
111+
112+
using (var session = OpenSession())
113+
using (var tx = session.BeginTransaction())
114+
{
115+
session.Delete("from EmployeeInfo");
116+
session.Delete("from Employee");
117+
tx.Commit();
118+
}
119+
}
120+
121+
[Test]
122+
public void TestOrphanedWhileManaged()
123+
{
124+
long empId = 0;
125+
126+
using (var s = OpenSession())
127+
using (var t = s.BeginTransaction())
128+
{
129+
var empInfoResults = s.CreateQuery("from EmployeeInfo").List<EmployeeInfo>();
130+
Assert.AreEqual(1, empInfoResults.Count);
131+
132+
var empResults = s.CreateQuery("from Employee").List<Employee>();
133+
Assert.AreEqual(1, empResults.Count);
134+
135+
var emp = empResults[0];
136+
Assert.NotNull(emp);
137+
138+
empId = emp.Id;
139+
emp.Info = null;
140+
t.Commit();
141+
}
142+
143+
using (var s = OpenSession())
144+
using (var t = s.BeginTransaction())
145+
{
146+
var emp = s.Get<Employee>(empId);
147+
Assert.Null(emp.Info);
148+
149+
var empInfoResults = s.CreateQuery("from EmployeeInfo").List<EmployeeInfo>();
150+
Assert.AreEqual(0, empInfoResults.Count);
151+
152+
var empResults = s.CreateQuery("from Employee").List<Employee>();
153+
Assert.AreEqual(1, empResults.Count);
154+
155+
t.Commit();
156+
}
157+
}
158+
159+
}
160+
}
161+
>>>>>>> Changed Methods and Properties so they conform to coding conventions, i.e first letter capitalised. Also fixed a number of minor typos.

‎src/NHibernate.Test/NHSpecificTest/NH1262/fk/bidirectional/Mappings.hbm.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
assembly="NHibernate.Test">
55

66
<class name="Employee">
7-
<id name="id" type="long" column="id">
7+
<id name="Id" type="long" column="Id">
88
<generator class="increment" />
99
</id>
10-
<one-to-one name="info"
11-
property-ref="employee"
10+
<one-to-one name="Info"
11+
property-ref="EmployeeDetails"
1212
class="EmployeeInfo"
1313
cascade="all,delete-orphan"
1414
constrained="false" />
1515
</class>
1616

1717
<class name="EmployeeInfo">
18-
<id name="id" type="long" column="id">
18+
<id name="Id" type="long" column="Id">
1919
<generator class="increment" />
2020
</id>
21-
<many-to-one name="employee"
21+
<many-to-one name="EmployeeDetails"
2222
column="employee_id"
2323
unique="true"
2424
not-null="true" />

‎src/NHibernate.Test/NHSpecificTest/NH1262/fk/bidirectional/Mappings.hbm.xml.orig‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<<<<<<< HEAD
2+
<?xml version="1.0" encoding="utf-8" ?>
3+
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
4+
namespace="NHibernate.Test.NHSpecificTest.NH1262.fk.bidirectional"
5+
assembly="NHibernate.Test">
6+
7+
<class name="Employee">
8+
<id name="id" type="long" column="id">
9+
<generator class="increment" />
10+
</id>
11+
<one-to-one name="info"
12+
property-ref="employee"
13+
class="EmployeeInfo"
14+
cascade="all,delete-orphan"
15+
constrained="false" />
16+
</class>
17+
18+
<class name="EmployeeInfo">
19+
<id name="id" type="long" column="id">
20+
<generator class="increment" />
21+
</id>
22+
<many-to-one name="employee"
23+
column="employee_id"
24+
unique="true"
25+
not-null="true" />
26+
</class>
27+
28+
</hibernate-mapping>
29+
=======
30+
<?xml version="1.0" encoding="utf-8" ?>
31+
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
32+
namespace="NHibernate.Test.NHSpecificTest.NH1262.fk.bidirectional"
33+
assembly="NHibernate.Test">
34+
35+
<class name="Employee">
36+
<id name="Id" type="long" column="Id">
37+
<generator class="increment" />
38+
</id>
39+
<one-to-one name="Info"
40+
property-ref="EmployeeDetails"
41+
class="EmployeeInfo"
42+
cascade="all,delete-orphan"
43+
constrained="false" />
44+
</class>
45+
46+
<class name="EmployeeInfo">
47+
<id name="Id" type="long" column="Id">
48+
<generator class="increment" />
49+
</id>
50+
<many-to-one name="EmployeeDetails"
51+
column="employee_id"
52+
unique="true"
53+
not-null="true" />
54+
</class>
55+
56+
</hibernate-mapping>
57+
>>>>>>> Changed Methods and Properties so they conform to coding conventions, i.e first letter capitalised. Also fixed a number of minor typos.

‎src/NHibernate.Test/NHSpecificTest/NH1262/fk/bidirectional/Model.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ namespace NHibernate.Test.NHSpecificTest.NH1262.fk.bidirectional
33
{
44
public class Employee
55
{
6-
public virtual long id { get; set; }
7-
public virtual EmployeeInfo info { get; set; }
6+
public virtual long Id { get; set; }
7+
public virtual EmployeeInfo Info { get; set; }
88

99
public Employee()
1010
{
@@ -14,8 +14,8 @@ public Employee()
1414

1515
public class EmployeeInfo
1616
{
17-
public virtual long id { get; set; }
18-
public virtual Employee employee { get; set; }
17+
public virtual long Id { get; set; }
18+
public virtual Employee EmployeeDetails { get; set; }
1919

2020
public EmployeeInfo()
2121
{
@@ -24,7 +24,7 @@ public EmployeeInfo()
2424

2525
public EmployeeInfo(Employee emp)
2626
{
27-
employee = emp;
27+
EmployeeDetails = emp;
2828
}
2929
}
3030
}

‎src/NHibernate.Test/NHSpecificTest/NH1262/fk/bidirectional/Model.cs.orig‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<<<<<<< HEAD
2+

3+
namespace NHibernate.Test.NHSpecificTest.NH1262.fk.bidirectional
4+
{
5+
public class Employee
6+
{
7+
public virtual long id { get; set; }
8+
public virtual EmployeeInfo info { get; set; }
9+
10+
public Employee()
11+
{
12+
13+
}
14+
}
15+
16+
public class EmployeeInfo
17+
{
18+
public virtual long id { get; set; }
19+
public virtual Employee employee { get; set; }
20+
21+
public EmployeeInfo()
22+
{
23+
24+
}
25+
26+
public EmployeeInfo(Employee emp)
27+
{
28+
employee = emp;
29+
}
30+
}
31+
}
32+
=======
33+

34+
namespace NHibernate.Test.NHSpecificTest.NH1262.fk.bidirectional
35+
{
36+
public class Employee
37+
{
38+
public virtual long Id { get; set; }
39+
public virtual EmployeeInfo Info { get; set; }
40+
41+
public Employee()
42+
{
43+
44+
}
45+
}
46+
47+
public class EmployeeInfo
48+
{
49+
public virtual long Id { get; set; }
50+
public virtual Employee EmployeeDetails { get; set; }
51+
52+
public EmployeeInfo()
53+
{
54+
55+
}
56+
57+
public EmployeeInfo(Employee emp)
58+
{
59+
EmployeeDetails = emp;
60+
}
61+
}
62+
}
63+
>>>>>>> Changed Methods and Properties so they conform to coding conventions, i.e first letter capitalised. Also fixed a number of minor typos.

0 commit comments

Comments
 (0)