Skip to content

Commit f3be548

Browse files
committed
Refactor BugTestCase
- Always load the mappings from the same namespace - Change type of Mappings property on TestCase to string[]
1 parent ba4147c commit f3be548

File tree

733 files changed

+696
-1569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

733 files changed

+696
-1569
lines changed

src/NHibernate.Test.VisualBasic/Issues/IssueTestCase.vb

-13
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,4 @@
22

33
Public Class IssueTestCase
44
Inherits BugTestCase
5-
6-
Protected Overrides ReadOnly Property MappingsAssembly As String
7-
Get
8-
Return "NHibernate.Test.VisualBasic"
9-
End Get
10-
End Property
11-
12-
Protected Overrides ReadOnly Property Mappings As IList
13-
Get
14-
Return New String() {"Issues." + BugNumber + ".Mappings.hbm.xml"}
15-
End Get
16-
End Property
17-
185
End Class

src/NHibernate.Test/Ado/BatcherFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ protected override string MappingsAssembly
1313
get { return "NHibernate.Test"; }
1414
}
1515

16-
protected override IList Mappings
16+
protected override string[] Mappings
1717
{
1818
get { return new[] { "Ado.VerySimple.hbm.xml", "Ado.AlmostSimple.hbm.xml" }; }
1919
}

src/NHibernate.Test/Ado/GenericBatchingBatcherFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class GenericBatchingBatcherFixture : TestCase
1515
{
1616
protected override string MappingsAssembly => "NHibernate.Test";
1717

18-
protected override IList Mappings => new[] {"Ado.VerySimple.hbm.xml"};
18+
protected override string[] Mappings => new[] {"Ado.VerySimple.hbm.xml"};
1919

2020
protected override void Configure(Configuration configuration)
2121
{

src/NHibernate.Test/Any/AnyTypeTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ protected override string MappingsAssembly
1111
get { return "NHibernate.Test"; }
1212
}
1313

14-
protected override IList Mappings
14+
protected override string[] Mappings
1515
{
1616
get { return new string[] {"Any.Person.hbm.xml"}; }
1717
}

src/NHibernate.Test/Async/Ado/BatcherFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected override string MappingsAssembly
2525
get { return "NHibernate.Test"; }
2626
}
2727

28-
protected override IList Mappings
28+
protected override string[] Mappings
2929
{
3030
get { return new[] { "Ado.VerySimple.hbm.xml", "Ado.AlmostSimple.hbm.xml" }; }
3131
}

src/NHibernate.Test/Async/Ado/GenericBatchingBatcherFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class GenericBatchingBatcherFixtureAsync : TestCase
2828
{
2929
protected override string MappingsAssembly => "NHibernate.Test";
3030

31-
protected override IList Mappings => new[] {"Ado.VerySimple.hbm.xml"};
31+
protected override string[] Mappings => new[] {"Ado.VerySimple.hbm.xml"};
3232

3333
protected override void Configure(Configuration configuration)
3434
{

src/NHibernate.Test/Async/Any/AnyTypeTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected override string MappingsAssembly
2222
get { return "NHibernate.Test"; }
2323
}
2424

25-
protected override IList Mappings
25+
protected override string[] Mappings
2626
{
2727
get { return new string[] {"Any.Person.hbm.xml"}; }
2828
}

src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperations.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected override string MappingsAssembly
2323
get { return "NHibernate.Test"; }
2424
}
2525

26-
protected override IList Mappings
26+
protected override string[] Mappings
2727
{
2828
get { return new string[] { "BulkManipulation.Vehicle.hbm.xml" }; }
2929
}

src/NHibernate.Test/Async/BulkManipulation/NativeSQLBulkOperationsWithCache.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class NativeSQLBulkOperationsWithCacheAsync : TestCase
2727
{
2828
protected override string MappingsAssembly => "NHibernate.Test";
2929

30-
protected override IList Mappings => new[] { "BulkManipulation.Vehicle.hbm.xml" };
30+
protected override string[] Mappings => new[] { "BulkManipulation.Vehicle.hbm.xml" };
3131

3232
protected override void Configure(Configuration configuration)
3333
{

src/NHibernate.Test/Async/CacheTest/BatchableCacheFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace NHibernate.Test.CacheTest
2929
[TestFixture]
3030
public class BatchableCacheFixtureAsync : TestCase
3131
{
32-
protected override IList Mappings => new[]
32+
protected override string[] Mappings => new[]
3333
{
3434
"CacheTest.ReadOnly.hbm.xml",
3535
"CacheTest.ReadWrite.hbm.xml"

src/NHibernate.Test/Async/CacheTest/BatchableCacheSubclassFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace NHibernate.Test.CacheTest
2424
[TestFixture]
2525
public class BatchableCacheSubclassFixtureAsync : TestCase
2626
{
27-
protected override IList Mappings
27+
protected override string[] Mappings
2828
{
2929
get
3030
{

src/NHibernate.Test/Async/CacheTest/GetQueryCacheFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace NHibernate.Test.CacheTest
2424
[TestFixture]
2525
public class GetQueryCacheFixtureAsync : TestCase
2626
{
27-
protected override IList Mappings => new[] { "Simple.hbm.xml" };
27+
protected override string[] Mappings => new[] { "Simple.hbm.xml" };
2828

2929
protected override void Configure(Configuration configuration)
3030
{

src/NHibernate.Test/Async/CacheTest/QueryCacheFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace NHibernate.Test.CacheTest
2020
[TestFixture]
2121
public class QueryCacheFixtureAsync : TestCase
2222
{
23-
protected override IList Mappings => new[] { "Simple.hbm.xml" };
23+
protected override string[] Mappings => new[] { "Simple.hbm.xml" };
2424

2525
protected override void Configure(Configuration configuration)
2626
{

src/NHibernate.Test/Async/Cascade/Circle/CascadeMergeToChildBeforeParentTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected override string MappingsAssembly
4444
get { return "NHibernate.Test"; }
4545
}
4646

47-
protected override IList Mappings
47+
protected override string[] Mappings
4848
{
4949
get { return new[] { "Cascade.Circle.CascadeMergeToChildBeforeParent.hbm.xml" }; }
5050
}

src/NHibernate.Test/Async/Cascade/Circle/MultiPathCircleCascadeTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected override string MappingsAssembly
5151
get { return "NHibernate.Test"; }
5252
}
5353

54-
protected override IList Mappings
54+
protected override string[] Mappings
5555
{
5656
get { return new[] { "Cascade.Circle.MultiPathCircleCascade.hbm.xml" }; }
5757
}

src/NHibernate.Test/Async/Cascade/MultiPathCascadeTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected override string MappingsAssembly
2828
get { return "NHibernate.Test"; }
2929
}
3030

31-
protected override IList Mappings
31+
protected override string[] Mappings
3232
{
3333
get { return new[] { "Cascade.MultiPathCascade.hbm.xml" }; }
3434
}

src/NHibernate.Test/Async/Cascade/RefreshFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected override string MappingsAssembly
2626
get { return "NHibernate.Test"; }
2727
}
2828

29-
protected override IList Mappings
29+
protected override string[] Mappings
3030
{
3131
get { return new[] { "Cascade.Job.hbm.xml", "Cascade.JobBatch.hbm.xml" }; }
3232
}

src/NHibernate.Test/Async/Classic/LifecycleFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected override string MappingsAssembly
2323
get { return "NHibernate.Test"; }
2424
}
2525

26-
protected override IList Mappings
26+
protected override string[] Mappings
2727
{
2828
get { return new[] { "Classic.EntityWithLifecycle.hbm.xml" }; }
2929
}

src/NHibernate.Test/Async/Classic/ValidatableFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected override string MappingsAssembly
2323
get { return "NHibernate.Test"; }
2424
}
2525

26-
protected override IList Mappings
26+
protected override string[] Mappings
2727
{
2828
get { return new string[] { "Classic.Video.hbm.xml" }; }
2929
}

src/NHibernate.Test/Async/CollectionFilterTest/CollectionFilterQueriesTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace NHibernate.Test.CollectionFilterTest
2121
[TestFixture]
2222
public class CollectionFilterQueriesTestAsync : TestCase
2323
{
24-
protected override IList Mappings
24+
protected override string[] Mappings
2525
{
2626
get
2727
{

src/NHibernate.Test/Async/CollectionTest/IdBagFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace NHibernate.Test.CollectionTest
1919
[TestFixture]
2020
public class IdBagFixtureAsync : TestCase
2121
{
22-
protected override System.Collections.IList Mappings
22+
protected override string[] Mappings
2323
{
2424
get { return new string[] { "CollectionTest.IdBagFixture.hbm.xml" }; }
2525
}

src/NHibernate.Test/Async/CollectionTest/NullableValueTypeElementMapFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace NHibernate.Test.CollectionTest
1818
[TestFixture]
1919
public class NullableValueTypeElementMapFixtureAsync : TestCase
2020
{
21-
protected override IList Mappings
21+
protected override string[] Mappings
2222
{
2323
get { return new[] {"CollectionTest.NullableValueTypeElementMapFixture.hbm.xml"}; }
2424
}

src/NHibernate.Test/Async/Component/Basic/ComponentTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected override string MappingsAssembly
3030
get { return "NHibernate.Test"; }
3131
}
3232

33-
protected override System.Collections.IList Mappings
33+
protected override string[] Mappings
3434
{
3535
get { return Array.Empty<string>(); }
3636
}

src/NHibernate.Test/Async/CompositeId/ClassWithCompositeIdFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected override string MappingsAssembly
3232
get { return "NHibernate.Test"; }
3333
}
3434

35-
protected override IList Mappings
35+
protected override string[] Mappings
3636
{
3737
get { return new string[] {"CompositeId.ClassWithCompositeId.hbm.xml"}; }
3838
}

src/NHibernate.Test/Async/CompositeId/CompositeIdFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected override string MappingsAssembly
2424
get { return "NHibernate.Test"; }
2525
}
2626

27-
protected override IList Mappings
27+
protected override string[] Mappings
2828
{
2929
get
3030
{

src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected override string MappingsAssembly
3030
get { return "NHibernate.Test"; }
3131
}
3232

33-
protected override IList Mappings
33+
protected override string[] Mappings
3434
{
3535
get
3636
{

src/NHibernate.Test/Async/Criteria/DetachedCriteriaSerializable.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected override string MappingsAssembly
2828
get { return "NHibernate.Test"; }
2929
}
3030

31-
protected override IList Mappings
31+
protected override string[] Mappings
3232
{
3333
get { return new string[] { "Criteria.Enrolment.hbm.xml" }; }
3434
}

src/NHibernate.Test/Async/Criteria/Lambda/FunctionsIntegrationFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class FunctionsIntegrationFixtureAsync : TestCase
2121
{
2222
protected override string MappingsAssembly => "NHibernate.Test";
2323

24-
protected override IList Mappings => new[] { "Criteria.Lambda.Mappings.hbm.xml" };
24+
protected override string[] Mappings => new[] { "Criteria.Lambda.Mappings.hbm.xml" };
2525

2626
protected override void OnTearDown()
2727
{

src/NHibernate.Test/Async/Criteria/Lambda/IntegrationFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class IntegrationFixtureAsync : TestCase
2626
{
2727
protected override string MappingsAssembly { get { return "NHibernate.Test"; } }
2828

29-
protected override IList Mappings
29+
protected override string[] Mappings
3030
{
3131
get { return new[] { "Criteria.Lambda.Mappings.hbm.xml" }; }
3232
}

src/NHibernate.Test/Async/Criteria/Lambda/ProjectIntegrationFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected override string MappingsAssembly
2525
get { return "NHibernate.Test"; }
2626
}
2727

28-
protected override IList Mappings
28+
protected override string[] Mappings
2929
{
3030
get { return new[] { "Criteria.Lambda.Mappings.hbm.xml" }; }
3131
}

src/NHibernate.Test/Async/Criteria/Lambda/SimpleIntegrationFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected override string MappingsAssembly
2222
get { return "NHibernate.Test"; }
2323
}
2424

25-
protected override IList Mappings
25+
protected override string[] Mappings
2626
{
2727
get { return new[] { "Criteria.Lambda.Mappings.hbm.xml" }; }
2828
}

src/NHibernate.Test/Async/Criteria/Lambda/SubQueryIntegrationFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected override string MappingsAssembly
2424
get { return "NHibernate.Test"; }
2525
}
2626

27-
protected override IList Mappings
27+
protected override string[] Mappings
2828
{
2929
get { return new[] { "Criteria.Lambda.Mappings.hbm.xml" }; }
3030
}

src/NHibernate.Test/Async/Criteria/ProjectionsTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected override string MappingsAssembly
2929
get { return "NHibernate.Test"; }
3030
}
3131

32-
protected override IList Mappings
32+
protected override string[] Mappings
3333
{
3434
get
3535
{

src/NHibernate.Test/Async/Deletetransient/DeleteTransientEntityTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ protected override string MappingsAssembly
2222
get { return "NHibernate.Test"; }
2323
}
2424

25-
protected override IList Mappings
25+
protected override string[] Mappings
2626
{
2727
get { return new string[] {"Deletetransient.Person.hbm.xml"}; }
2828
}

src/NHibernate.Test/Async/DriverTest/NullReferenceFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace NHibernate.Test.DriverTest
2121
[TestFixture]
2222
public class NullReferenceFixtureAsync : TestCase
2323
{
24-
protected override IList Mappings
24+
protected override string[] Mappings
2525
{
2626
get { return new string[] {"Simple.hbm.xml"}; }
2727
}

src/NHibernate.Test/Async/DriverTest/OdbcDriverFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class OdbcDriverFixtureAsync : TestCase
2323
{
2424
protected override string MappingsAssembly => "NHibernate.Test";
2525

26-
protected override IList Mappings => new[] { "DriverTest.MultiTypeEntity.hbm.xml" };
26+
protected override string[] Mappings => new[] { "DriverTest.MultiTypeEntity.hbm.xml" };
2727

2828
protected override bool AppliesTo(Dialect.Dialect dialect)
2929
{

src/NHibernate.Test/Async/DriverTest/Sql2008DateTime2Test.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected override string MappingsAssembly
3131
get { return "NHibernate.Test"; }
3232
}
3333

34-
protected override IList Mappings
34+
protected override string[] Mappings
3535
{
3636
get { return new[] { "DriverTest.EntityForMs2008.hbm.xml" }; }
3737
}

src/NHibernate.Test/Async/DriverTest/SqlClientDriverFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class SqlClientDriverFixtureAsync : TestCase
2727
{
2828
protected override string MappingsAssembly => "NHibernate.Test";
2929

30-
protected override IList Mappings => new[] { "DriverTest.MultiTypeEntity.hbm.xml" };
30+
protected override string[] Mappings => new[] { "DriverTest.MultiTypeEntity.hbm.xml" };
3131

3232
protected override bool AppliesTo(Dialect.Dialect dialect)
3333
{

src/NHibernate.Test/Async/DriverTest/SqlServerCeDriverFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected override string MappingsAssembly
2828
get { return "NHibernate.Test"; }
2929
}
3030

31-
protected override IList Mappings
31+
protected override string[] Mappings
3232
{
3333
get { return new[] { "DriverTest.SqlServerCeEntity.hbm.xml" }; }
3434
}

src/NHibernate.Test/Async/DynamicEntity/Interceptor/InterceptorDynamicEntity.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected override string MappingsAssembly
2525
get { return "NHibernate.Test"; }
2626
}
2727

28-
protected override IList Mappings
28+
protected override string[] Mappings
2929
{
3030
get { return new string[] {"DynamicEntity.Interceptor.Customer.hbm.xml"}; }
3131
}

src/NHibernate.Test/Async/DynamicEntity/Tuplizer/TuplizerDynamicEntity.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected override string MappingsAssembly
2626
get { return "NHibernate.Test"; }
2727
}
2828

29-
protected override IList Mappings
29+
protected override string[] Mappings
3030
{
3131
get { return new string[] {"DynamicEntity.Tuplizer.Customer.hbm.xml"}; }
3232
}

src/NHibernate.Test/Async/DynamicProxyTests/InterfaceProxySerializationTests/ProxyFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace NHibernate.Test.DynamicProxyTests.InterfaceProxySerializationTests
2222
[TestFixture]
2323
public class ProxyFixtureAsync : TestCase
2424
{
25-
protected override IList Mappings
25+
protected override string[] Mappings
2626
{
2727
get { return new[] { "DynamicProxyTests.InterfaceProxySerializationTests.ProxyImpl.hbm.xml" }; }
2828
}

src/NHibernate.Test/Async/EntityModeTest/Map/Basic/DynamicClassFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected override string MappingsAssembly
2626
get { return "NHibernate.Test"; }
2727
}
2828

29-
protected override IList Mappings
29+
protected override string[] Mappings
3030
{
3131
get { return new[] {"EntityModeTest.Map.Basic.ProductLine.hbm.xml"}; }
3232
}

0 commit comments

Comments
 (0)