Skip to content

Commit 840af66

Browse files
committed
NH-3900 - TestFixtureSetUp becomes OneTimeSetUp
TestFixtureTearDown becomes OneTimeTearDown Add reason to IgnoreAttribute when missing
1 parent 14e3ec1 commit 840af66

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

src/NHibernate.Test.VisualBasic/Issues/NH3302/Fixture.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Namespace Issues
66

77
Namespace NH3302
88
'http://msdn.microsoft.com/en-us/library/swf8kaxw.aspx
9-
<TestFixture(), Ignore()> _
9+
<TestFixture(), Ignore("Not fixed yet")> _
1010
Public Class Fixture
1111
Inherits IssueTestCase
1212

src/NHibernate.Test/CfgTest/DefaultNsAssmFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public class DefaultNsAssmFixture
9494

9595
#region NUnit.Framework.TestFixture Members
9696

97-
[TestFixtureSetUp]
97+
[OneTimeSetUp]
9898
public void TestFixtureSetUp()
9999
{
100100
dir_ = Directory.GetCurrentDirectory();
@@ -138,7 +138,7 @@ public virtual void TearDown()
138138
{
139139
}
140140

141-
[TestFixtureTearDown]
141+
[OneTimeTearDown]
142142
public virtual void TestFixtureTearDown()
143143
{
144144
}
@@ -217,4 +217,4 @@ public void MixedSubclass()
217217
// if no exception, success
218218
}
219219
}
220-
}
220+
}

src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public class HbmOrderingFixture
132132

133133
#region NUnit.Framework.TestFixture Members
134134

135-
[TestFixtureSetUp]
135+
[OneTimeSetUp]
136136
public void TestFixtureSetUp()
137137
{
138138
dir_ = Directory.GetCurrentDirectory();
@@ -176,7 +176,7 @@ public virtual void TearDown()
176176
{
177177
}
178178

179-
[TestFixtureTearDown]
179+
[OneTimeTearDown]
180180
public virtual void TestFixtureTearDown()
181181
{
182182
}
@@ -255,4 +255,4 @@ public void MixedSubclass()
255255
// if no exception, success
256256
}
257257
}
258-
}
258+
}

src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class NativeGuidGeneratorFixture
1212
protected Configuration cfg;
1313
protected ISessionFactoryImplementor sessions;
1414

15-
[TestFixtureSetUp]
15+
[OneTimeSetUp]
1616
public void TestFixtureSetUp()
1717
{
1818
cfg = new Configuration();
@@ -43,4 +43,4 @@ public void ReturnedValueIsGuid()
4343
}
4444
}
4545
}
46-
}
46+
}

src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ public class NonReflectiveBinderFixture
1616

1717
private Configuration cfg;
1818

19-
[TestFixtureSetUp]
19+
[OneTimeSetUp]
2020
public void SetUp()
2121
{
2222
cfg = new Configuration()
2323
.AddResource("NHibernate.Test.MappingTest.Wicked.hbm.xml", GetType().Assembly);
2424
cfg.BuildMappings();
2525
}
2626

27-
[TestFixtureTearDown]
27+
[OneTimeTearDown]
2828
public void TearDown()
2929
{
3030
cfg = null;
@@ -195,4 +195,4 @@ public void XmlSerialization()
195195
}
196196
}
197197
}
198-
}
198+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace NHibernate.Test.NHSpecificTest.NH1289
77
{
8-
[TestFixture,Ignore]
8+
[TestFixture,Ignore("Not fixed yet")]
99
public class Fixture:BugTestCase
1010
{
1111
protected override void OnSetUp()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public abstract class BaseFixture
1818
protected ISessionFactoryImplementor factory;
1919
private string expectedExportString;
2020

21-
[TestFixtureSetUp]
21+
[OneTimeSetUp]
2222
public void Config()
2323
{
2424
cfg = new Configuration();
@@ -89,4 +89,4 @@ protected override string GetResourceName()
8989
return "WithColumnNode.hbm.xml";
9090
}
9191
}
92-
}
92+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Fixture
2525
private CultureInfo currentCulture = null;
2626
private CultureInfo currentUICulture = null;
2727

28-
[TestFixtureSetUp]
28+
[OneTimeSetUp]
2929
public void TestFixtureSetUp()
3030
{
3131
currentCulture = Thread.CurrentThread.CurrentCulture;
@@ -36,7 +36,7 @@ public void TestFixtureSetUp()
3636
Thread.CurrentThread.CurrentUICulture = turkish;
3737
}
3838

39-
[TestFixtureTearDown]
39+
[OneTimeTearDown]
4040
public void TestFixtureTearDown()
4141
{
4242
Thread.CurrentThread.CurrentCulture = currentCulture;
@@ -58,4 +58,4 @@ public void CheckIII()
5858
Assert.AreEqual("iii_iii_iii", ImprovedNamingStrategy.Instance.ColumnName("IiiIiiIii"));
5959
}
6060
}
61-
}
61+
}

src/NHibernate.Test/TestCase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static TestCase()
6969
/// <summary>
7070
/// Creates the tables used in this TestCase
7171
/// </summary>
72-
[TestFixtureSetUp]
72+
[OneTimeSetUp]
7373
public void TestFixtureSetUp()
7474
{
7575
try
@@ -112,7 +112,7 @@ public void TestFixtureSetUp()
112112
/// will occur if the TestCase does not have the same hbm.xml files
113113
/// included as a previous one.
114114
/// </remarks>
115-
[TestFixtureTearDown]
115+
[OneTimeTearDown]
116116
public void TestFixtureTearDown()
117117
{
118118
// If TestFixtureSetup fails due to an IgnoreException, it will still run the teardown.

src/NHibernate.Test/TypesTest/TypeSqlTypeFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public abstract class TypeSqlTypeFixture
2525
protected Configuration cfg;
2626
protected ISessionFactoryImplementor factory;
2727

28-
[TestFixtureSetUp]
28+
[OneTimeSetUp]
2929
public void Config()
3030
{
3131
cfg = new Configuration();
@@ -141,4 +141,4 @@ protected override string GetResourceName()
141141
return "MultiTypeEntity_WithSqlType.hbm.xml";
142142
}
143143
}
144-
}
144+
}

0 commit comments

Comments
 (0)