Skip to content

Commit 61337c7

Browse files
jagregoryjagregory
committed
Fixes for failing tests
1 parent d661380 commit 61337c7

File tree

6 files changed

+98
-81
lines changed

6 files changed

+98
-81
lines changed

‎src/FluentNHibernate.Testing/Cfg/FluentConfigurationTests.cs

Lines changed: 76 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using FluentNHibernate.Testing.DomainModel;
99
using FluentNHibernate.Testing.Fixtures.Basic;
1010
using FluentNHibernate.Testing.Fixtures.MixedMappingsInSameLocation;
11+
using FluentNHibernate.Testing.Fixtures.MixedMappingsInSameLocation.Mappings;
1112
using NHibernate.Cfg;
1213
using NUnit.Framework;
1314

@@ -93,7 +94,7 @@ public void MappingsCanBeMixedAndDontConflict()
9394
.Database(SQLiteConfiguration.Standard.InMemory)
9495
.Mappings(m =>
9596
{
96-
m.FluentMappings.AddFromAssemblyOf<Foo>();
97+
m.FluentMappings.Add<FooMap>();
9798
m.AutoMappings.Add(AutoMap.AssemblyOf<Bar>()
9899
.Where(t => t.Namespace == typeof(Bar).Namespace));
99100
})
@@ -108,7 +109,7 @@ public void ShouldGetASessionFactoryIfEverythingIsOK()
108109
var sessionFactory = Fluently.Configure()
109110
.Database(SQLiteConfiguration.Standard.InMemory)
110111
.Mappings(m =>
111-
m.FluentMappings.AddFromAssemblyOf<Record>())
112+
m.FluentMappings.Add<BinaryRecordMap>())
112113
.BuildSessionFactory();
113114

114115
sessionFactory.ShouldNotBeNull();
@@ -120,19 +121,31 @@ public void ShouldGetAConfigurationIfEverythingIsOK()
120121
var configuration = Fluently.Configure()
121122
.Database(SQLiteConfiguration.Standard.InMemory)
122123
.Mappings(m =>
123-
m.FluentMappings.AddFromAssemblyOf<Record>())
124+
m.FluentMappings.Add<BinaryRecordMap>())
124125
.BuildConfiguration();
125126

126127
configuration.ShouldNotBeNull();
127128
}
128129

129130
[Test]
130-
public void ShouldSetCurrentSessionContext() { var configuration = Fluently.Configure() .CurrentSessionContext("thread_static") .BuildConfiguration();
131-
configuration.Properties["current_session_context_class"].ShouldEqual("thread_static"); }
131+
public void ShouldSetCurrentSessionContext()
132+
{
133+
var configuration = Fluently.Configure()
134+
.CurrentSessionContext("thread_static")
135+
.BuildConfiguration();
136+
137+
configuration.Properties["current_session_context_class"].ShouldEqual("thread_static");
138+
}
132139

133140
[Test]
134-
public void ShouldSetCurrentSessionContextUsingGeneric() { var configuration = Fluently.Configure() .CurrentSessionContext<NHibernate.Context.ThreadStaticSessionContext>() .BuildConfiguration();
135-
configuration.Properties["current_session_context_class"].ShouldEqual(typeof(NHibernate.Context.ThreadStaticSessionContext).AssemblyQualifiedName); }
141+
public void ShouldSetCurrentSessionContextUsingGeneric()
142+
{
143+
var configuration = Fluently.Configure()
144+
.CurrentSessionContext<NHibernate.Context.ThreadStaticSessionContext>()
145+
.BuildConfiguration();
146+
147+
configuration.Properties["current_session_context_class"].ShouldEqual(typeof(NHibernate.Context.ThreadStaticSessionContext).AssemblyQualifiedName);
148+
}
136149

137150
#pragma warning disable 612,618
138151
[Test]
@@ -166,7 +179,54 @@ public void ShouldSetConnectionIsolationLevel()
166179
configuration.Properties["connection.isolation"].ShouldEqual("ReadUncommitted");
167180
}
168181

169-
[Test] public void Use_Minimal_Puts_should_set_value_to_const_true() { var configuration = Fluently.Configure() .Cache(x => x.UseMinimalPuts()) .BuildConfiguration(); configuration.Properties.ShouldContain("cache.use_minimal_puts", "true"); } [Test] public void Use_Query_Cache_should_set_value_to_const_true() { var configuration = Fluently.Configure() .Cache(x => x.UseQueryCache()) .BuildConfiguration(); configuration.Properties.ShouldContain("cache.use_query_cache", "true"); } [Test] public void Query_Cache_Factory_should_set_property_value() { var configuration = Fluently.Configure() .Cache(x => x.QueryCacheFactory("foo")) .BuildConfiguration(); configuration.Properties.ShouldContain("cache.query_cache_factory", "foo"); } [Test] public void Region_Prefix_should_set_property_value() { var configuration = Fluently.Configure() .Cache(x => x.RegionPrefix("foo")) .BuildConfiguration(); configuration.Properties.ShouldContain("cache.region_prefix", "foo"); } [Test] public void Provider_Class_should_set_property_value() { var configuration = Fluently.Configure() .Cache(x => x.ProviderClass("foo")) .BuildConfiguration(); } }
182+
[Test]
183+
public void Use_Minimal_Puts_should_set_value_to_const_true()
184+
{
185+
var configuration = Fluently.Configure()
186+
.Cache(x => x.UseMinimalPuts())
187+
.BuildConfiguration();
188+
189+
configuration.Properties.ShouldContain("cache.use_minimal_puts", "true");
190+
}
191+
192+
[Test]
193+
public void Use_Query_Cache_should_set_value_to_const_true()
194+
{
195+
var configuration = Fluently.Configure()
196+
.Cache(x => x.UseQueryCache())
197+
.BuildConfiguration();
198+
199+
configuration.Properties.ShouldContain("cache.use_query_cache", "true");
200+
}
201+
202+
[Test]
203+
public void Query_Cache_Factory_should_set_property_value()
204+
{
205+
var configuration = Fluently.Configure()
206+
.Cache(x => x.QueryCacheFactory("foo"))
207+
.BuildConfiguration();
208+
209+
configuration.Properties.ShouldContain("cache.query_cache_factory", "foo");
210+
}
211+
212+
[Test]
213+
public void Region_Prefix_should_set_property_value()
214+
{
215+
var configuration = Fluently.Configure()
216+
.Cache(x => x.RegionPrefix("foo"))
217+
.BuildConfiguration();
218+
219+
configuration.Properties.ShouldContain("cache.region_prefix", "foo");
220+
}
221+
222+
[Test]
223+
public void Provider_Class_should_set_property_value()
224+
{
225+
var configuration = Fluently.Configure()
226+
.Cache(x => x.ProviderClass("foo"))
227+
.BuildConfiguration();
228+
}
229+
}
170230

171231
[TestFixture]
172232
public class InvalidFluentConfigurationTests
@@ -271,12 +331,12 @@ public void WritesFluentMappingsOut()
271331
.Database(SQLiteConfiguration.Standard.InMemory)
272332
.Mappings(m =>
273333
m.FluentMappings
274-
.AddFromAssemblyOf<Record>()
334+
.Add<BinaryRecordMap>()
275335
.ExportTo(ExportPath))
276336
.BuildConfiguration();
277337

278338
Directory.GetFiles(ExportPath)
279-
.ShouldContain(HbmFor<Record>);
339+
.ShouldContain(HbmFor<BinaryRecord>);
280340
}
281341

282342
[Test]
@@ -288,7 +348,7 @@ public void WritesFluentMappingsOutToTextWriter()
288348
.Database(SQLiteConfiguration.Standard.InMemory)
289349
.Mappings(m =>
290350
m.FluentMappings
291-
.AddFromAssemblyOf<Record>()
351+
.Add<BinaryRecordMap>()
292352
.ExportTo(stringWriter))
293353
.BuildConfiguration();
294354

@@ -304,7 +364,7 @@ public void WritesFluentMappingsOutMergedWhenFlagSet()
304364
.Mappings(m =>
305365
m.MergeMappings()
306366
.FluentMappings
307-
.AddFromAssemblyOf<Record>()
367+
.Add<BinaryRecordMap>()
308368
.ExportTo(ExportPath))
309369
.BuildConfiguration();
310370

@@ -351,18 +411,18 @@ public void WritesBothOut()
351411
.Mappings(m =>
352412
{
353413
m.FluentMappings
354-
.AddFromAssemblyOf<Record>()
414+
.Add<BinaryRecordMap>()
355415
.ExportTo(ExportPath);
356416

357-
m.AutoMappings.Add(AutoMap.AssemblyOf<Person>()
417+
m.AutoMappings.Add(AutoMap.Source(new StubTypeSource(typeof(Person)))
358418
.Where(type => type.Namespace == "FluentNHibernate.Testing.Fixtures.Basic"))
359419
.ExportTo(ExportPath);
360420
})
361421
.BuildSessionFactory();
362422

363423
var files = Directory.GetFiles(ExportPath);
364424

365-
files.ShouldContain(HbmFor<Record>);
425+
files.ShouldContain(HbmFor<BinaryRecord>);
366426
files.ShouldContain(HbmFor<Person>);
367427
}
368428

@@ -374,7 +434,7 @@ public void DoesNotThrowWhenExportToIsBeforeBuildConfigurationOnCachePartMapping
374434
.Database(SQLiteConfiguration.Standard.InMemory)
375435
.Mappings(m =>
376436
m.FluentMappings
377-
.AddFromAssemblyOf<CachedRecord>()
437+
.Add<CachedRecordMap>()
378438
.ExportTo(ExportPath))
379439
.BuildConfiguration();
380440
}

‎src/FluentNHibernate.Testing/Cfg/MappingConfigurationTests.cs

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,6 @@ public void CreateMappingConfiguration()
3232
mapping = new MappingConfiguration(logger);
3333
}
3434

35-
[Test]
36-
public void AddFromAssemblyOfAddsAnyClassMapMappingsToCfg()
37-
{
38-
mapping.FluentMappings.AddFromAssemblyOf<Record>();
39-
mapping.Apply(cfg);
40-
41-
cfg.ClassMappings.Count.ShouldBeGreaterThan(0);
42-
cfg.ClassMappings.ShouldContain(c => c.MappedClass == typeof(Record));
43-
}
44-
45-
[Test]
46-
public void AddFromAssemblyAddsAnyClassMapMappingsToCfg()
47-
{
48-
mapping.FluentMappings.AddFromAssembly(typeof(Record).Assembly);
49-
mapping.Apply(cfg);
50-
51-
cfg.ClassMappings.Count.ShouldBeGreaterThan(0);
52-
cfg.ClassMappings.ShouldContain(c => c.MappedClass == typeof(Record));
53-
}
54-
55-
[Test]
56-
public void AddFromAssemblyAddsAnyClassMapMappingsToCfgWhenMerged()
57-
{
58-
mapping.MergeMappings();
59-
mapping.FluentMappings.AddFromAssembly(typeof(Record).Assembly);
60-
mapping.Apply(cfg);
61-
62-
cfg.ClassMappings.Count.ShouldBeGreaterThan(0);
63-
cfg.ClassMappings.ShouldContain(c => c.MappedClass == typeof(Record));
64-
}
65-
6635
[Test]
6736
public void AddAutoMappingAddsAnyAutoMappedMappingsToCfg()
6837
{
@@ -121,27 +90,27 @@ public void AddHbmMappingsFromAssemblyAddsClasses()
12190
public void AlteringConventionsShouldAffectProducedClasses()
12291
{
12392
mapping.FluentMappings
124-
.AddFromAssemblyOf<Record>()
93+
.Add<BinaryRecordMap>()
12594
.Conventions.Add(
12695
ConventionBuilder.Class.Always(x => x.Table(x.EntityType.Name + "Table"))
12796
);
12897
mapping.Apply(cfg);
12998

130-
cfg.ClassMappings.ShouldContain(c => c.Table.Name == "RecordTable");
99+
cfg.ClassMappings.ShouldContain(c => c.Table.Name == "BinaryRecordTable");
131100
}
132101

133102
[Test]
134103
public void CanAddMultipleConventions()
135104
{
136105
mapping.FluentMappings
137-
.AddFromAssemblyOf<Record>()
106+
.Add<BinaryRecordMap>()
138107
.Conventions.Add(
139108
ConventionBuilder.Class.Always(x => x.Table(x.EntityType.Name + "Table")),
140109
ConventionBuilder.Class.Always(x => x.DynamicInsert())
141110
);
142111
mapping.Apply(cfg);
143112

144-
cfg.ClassMappings.ShouldContain(c => c.Table.Name == "RecordTable" && c.DynamicInsert == true);
113+
cfg.ClassMappings.ShouldContain(c => c.Table.Name == "BinaryRecordTable" && c.DynamicInsert == true);
145114
}
146115

147116
[Test]

‎src/FluentNHibernate.Testing/DomainModel/ConnectedTester.cs

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,24 @@ namespace FluentNHibernate.Testing.DomainModel
1010
[TestFixture]
1111
public class ConnectedTester
1212
{
13-
private ISessionSource _source;
13+
private ISessionSource source;
1414

1515
[SetUp]
1616
public void SetUp()
1717
{
1818
var properties = new SQLiteConfiguration()
1919
.UseOuterJoin()
20-
//.ShowSql()
2120
.InMemory()
2221
.ToProperties();
2322

24-
//var properties = MsSqlConfiguration
25-
// .MsSql2005
26-
// .ConnectionString
27-
// .Server(".")
28-
// .Database("FluentNHibernate")
29-
// .TrustedConnection
30-
// .CreateProperties
31-
// .ToProperties();
32-
33-
_source = new SingleConnectionSessionSourceForSQLiteInMemoryTesting(properties, new TestPersistenceModel());
34-
_source.BuildSchema();
23+
source = new SingleConnectionSessionSourceForSQLiteInMemoryTesting(properties, new TestPersistenceModel());
24+
source.BuildSchema();
3525
}
3626

3727
[Test]
3828
public void MappingTest1()
3929
{
40-
new PersistenceSpecification<Record>(_source)
30+
new PersistenceSpecification<Record>(source)
4131
.CheckProperty(r => r.Age, 22)
4232
.CheckProperty(r => r.Name, "somebody")
4333
.CheckProperty(r => r.Location, "somewhere")
@@ -47,14 +37,14 @@ public void MappingTest1()
4737
[Test]
4838
public void Mapping_test_with_arrays()
4939
{
50-
new PersistenceSpecification<BinaryRecord>(_source)
40+
new PersistenceSpecification<BinaryRecord>(source)
5141
.CheckProperty(r => r.BinaryValue, new byte[] { 1, 2, 3 })
5242
.VerifyTheMappings();
5343
}
5444
[Test]
5545
public void CanWorkWithNestedSubClasses()
5646
{
57-
new PersistenceSpecification<Child2Record>(_source)
47+
new PersistenceSpecification<Child2Record>(source)
5848
.CheckProperty(r => r.Name, "Foxy")
5949
.CheckProperty(r => r.Another, "Lady")
6050
.CheckProperty(r => r.Third, "Yeah")
@@ -64,7 +54,7 @@ public void CanWorkWithNestedSubClasses()
6454
[Test]
6555
public void MappingTest2_NullableProperty()
6656
{
67-
new PersistenceSpecification<RecordWithNullableProperty>(_source)
57+
new PersistenceSpecification<RecordWithNullableProperty>(source)
6858
.CheckProperty(x => x.Age, null)
6959
.CheckProperty(x => x.Name, "somebody")
7060
.CheckProperty(x => x.Location, "somewhere")
@@ -140,18 +130,12 @@ public class BinaryRecord : Entity
140130
public virtual byte[] BinaryValue { get; set; }
141131
}
142132

143-
public class CachedRecordMap
133+
public class CachedRecordMap : ClassMap<CachedRecord>
144134
{
145-
private readonly ClassMap<CachedRecord> classMap = new ClassMap<CachedRecord>();
146-
public ClassMap<CachedRecord> ClassMap
135+
CachedRecordMap()
147136
{
148-
get { return classMap; }
149-
}
150-
151-
public CachedRecordMap()
152-
{
153-
classMap.Cache.ReadWrite();
154-
classMap.Id(x => x.Id, "id");
137+
Cache.ReadWrite();
138+
Id(x => x.Id, "id");
155139
}
156140
}
157141
public class CachedRecord : Entity

‎src/FluentNHibernate.Testing/Fixtures/TestPersistenceModel.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
using FluentNHibernate.Testing.DomainModel;
2+
13
namespace FluentNHibernate.Testing.Fixtures
24
{
35
public class TestPersistenceModel : PersistenceModel
46
{
57
public TestPersistenceModel()
68
{
7-
AddMappingsFromThisAssembly();
9+
AddMappingsFromSource(new StubTypeSource(typeof(RecordMap), typeof(BinaryRecordMap), typeof(RecordWithNullablePropertyMap), typeof(RecordFilter), typeof(NestedSubClassMap)));
810
}
911
}
1012
}

‎src/FluentNHibernate.Testing/PersistenceModelTests/SubclassPersistenceModelTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void ShouldPickUpSubclassMapsWhenAddingFromAssembly()
120120
{
121121
var model = new PersistenceModel();
122122

123-
model.AddMappingsFromAssembly(typeof(TablePerSubclass.TPS_Parent).Assembly);
123+
model.AddMappingsFromSource(new StubTypeSource(typeof(TablePerSubclass.TPS_ParentMap), typeof(TablePerSubclass.TPS_ChildMap)));
124124

125125
var classMapping = model.BuildMappings()
126126
.First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(TablePerSubclass.TPS_Parent)) != null)

‎src/FluentNHibernate.Testing/Testing/SessionSourceConfigurationTester.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ public SessionSource build_session_source()
5757
{
5858
FluentConfiguration config = Fluently.Configure()
5959
.Database(() => new SQLiteConfiguration().InMemory().UseOuterJoin().ShowSql())
60-
.Mappings(m => m.FluentMappings.AddFromAssemblyOf<TestPersistenceModel>());
60+
.Mappings(m => m.FluentMappings
61+
.Add<RecordMap>()
62+
.Add<RecordFilter>());
6163

6264
return new SingleConnectionSessionSourceForSQLiteInMemoryTesting(config);
6365
}

0 commit comments

Comments
 (0)