Skip to content

Commit c24de5a

Browse files
jagregoryjagregory
committed
Similar to the previous commit. Refactored columns into layers so
different sets of columns can be supplied by various systems whilst still allowing the user to fully control the end result.
1 parent f3186cb commit c24de5a

File tree

86 files changed

+348
-721
lines changed

Some content is hidden

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

86 files changed

+348
-721
lines changed

‎src/FluentNHibernate.Specs/FluentInterface/ClassMapSpecs/ClassMapSpecs.Id.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ public class when_class_map_is_told_to_map_an_id_without_a_property_or_column :
1919
Id.Member.ShouldBeNull();
2020

2121
It should_not_specify_any_columns_for_the_id = () =>
22-
{
23-
Id.Columns.Defaults.ShouldBeEmpty();
24-
Id.Columns.UserDefined.ShouldBeEmpty();
25-
};
22+
Id.Columns.ShouldBeEmpty();
2623

2724
It should_specify_the_default_generator_for_the_id = () =>
2825
Id.Generator.Class.ShouldEqual("increment");

‎src/FluentNHibernate.Testing/ConventionsTests/AcceptanceCriteria/PropertyAcceptanceCriteriaCollectionTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void CollectionIsEmptyShouldBeFalseWithItemsWhenUsingExpression()
3636
.Expect(x => x.Columns.IsEmpty());
3737

3838
var mapping = new PropertyMapping();
39-
mapping.AddColumn(new ColumnMapping("Column1"));
39+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
4040

4141
acceptance
4242
.Matches(new PropertyInspector(mapping))
@@ -61,7 +61,7 @@ public void CollectionIsNotEmptyShouldBeTrueWithItemsWhenUsingExpression()
6161
.Expect(x => x.Columns.IsNotEmpty());
6262

6363
var mapping = new PropertyMapping();
64-
mapping.AddColumn(new ColumnMapping("Column1"));
64+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
6565

6666
acceptance
6767
.Matches(new PropertyInspector(mapping))
@@ -75,7 +75,7 @@ public void CollectionContainsWithStringShouldBeFalseWhenNoItemsMatching()
7575
.Expect(x => x.Columns.Contains("boo"));
7676

7777
var mapping = new PropertyMapping();
78-
mapping.AddColumn(new ColumnMapping("Column1"));
78+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
7979

8080
acceptance
8181
.Matches(new PropertyInspector(mapping))
@@ -89,7 +89,7 @@ public void CollectionContainsWithStringShouldBeTrueWhenItemsMatching()
8989
.Expect(x => x.Columns.Contains("Column1"));
9090

9191
var mapping = new PropertyMapping();
92-
mapping.AddColumn(new ColumnMapping("Column1"));
92+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
9393

9494
acceptance
9595
.Matches(new PropertyInspector(mapping))
@@ -103,7 +103,7 @@ public void CollectionContainsWithLambdaShouldBeFalseWhenNoItemsMatching()
103103
.Expect(x => x.Columns.Contains(c => c.Name == "boo"));
104104

105105
var mapping = new PropertyMapping();
106-
mapping.AddColumn(new ColumnMapping ("Column1"));
106+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
107107

108108
acceptance
109109
.Matches(new PropertyInspector(mapping))
@@ -117,7 +117,7 @@ public void CollectionContainsWithLambdaShouldBeTrueWhenItemsMatching()
117117
.Expect(x => x.Columns.Contains(c => c.Name == "Column1"));
118118

119119
var mapping = new PropertyMapping();
120-
mapping.AddColumn(new ColumnMapping("Column1"));
120+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
121121

122122
acceptance
123123
.Matches(new PropertyInspector(mapping))

‎src/FluentNHibernate.Testing/MappingModel/Defaults/PropertyColumnDefaultsTester.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public void ShouldHaveDefaultColumnIfNoneSpecified()
1818
var mapping = ((IPropertyMappingProvider)new PropertyPart(Prop(x => x.Name), typeof(PropertyTarget)))
1919
.GetPropertyMapping();
2020

21-
mapping.Columns.Defaults.Count().ShouldEqual(1);
22-
mapping.Columns.UserDefined.Count().ShouldEqual(0);
21+
mapping.Columns.Count().ShouldEqual(1);
2322
mapping.Columns.Count().ShouldEqual(1);
2423
}
2524

@@ -30,8 +29,7 @@ public void ShouldHaveNoDefaultsIfUserSpecifiedColumn()
3029
.Column("explicit"))
3130
.GetPropertyMapping();
3231

33-
mapping.Columns.Defaults.Count().ShouldEqual(0);
34-
mapping.Columns.UserDefined.Count().ShouldEqual(1);
32+
mapping.Columns.Count().ShouldEqual(1);
3533
mapping.Columns.Count().ShouldEqual(1);
3634
}
3735

@@ -42,7 +40,7 @@ public void DefaultColumnShouldInheritColumnAttributes()
4240
.Not.Nullable())
4341
.GetPropertyMapping();
4442

45-
mapping.Columns.Defaults.First().NotNull.ShouldBeTrue();
43+
mapping.Columns.First().NotNull.ShouldBeTrue();
4644
mapping.Columns.First().NotNull.ShouldBeTrue();
4745
}
4846

‎src/FluentNHibernate.Testing/MappingModel/Equality/CollectionContentEqualitySpecs.cs

Lines changed: 0 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -88,127 +88,6 @@ public void should_be_equal()
8888
}
8989
}
9090

91-
[TestFixture]
92-
public class when_comparing_the_contents_of_two_different_IDefaultableEnumerables_with_the_same_user_items : IDefaultableEnumerableContentEqualitySpec
93-
{
94-
public override void establish_context()
95-
{
96-
first_enumerable = new DefaultableList<string> { "one", "two" };
97-
second_enumerable = new DefaultableList<string> { "one", "two" };
98-
}
99-
100-
public override void because()
101-
{
102-
are_equal = first_enumerable.ContentEquals(second_enumerable);
103-
}
104-
105-
[Test]
106-
public void should_be_equal()
107-
{
108-
are_equal.ShouldBeTrue();
109-
}
110-
}
111-
112-
[TestFixture]
113-
public class when_comparing_the_contents_of_two_different_IDefaultableEnumerables_with_the_same_default_items : IDefaultableEnumerableContentEqualitySpec
114-
{
115-
public override void establish_context()
116-
{
117-
first_enumerable = new DefaultableList<string>();
118-
first_enumerable.AddDefault("one");
119-
first_enumerable.AddDefault("two");
120-
second_enumerable = new DefaultableList<string>();
121-
second_enumerable.AddDefault("one");
122-
second_enumerable.AddDefault("two");
123-
}
124-
125-
public override void because()
126-
{
127-
are_equal = first_enumerable.ContentEquals(second_enumerable);
128-
}
129-
130-
[Test]
131-
public void should_be_equal()
132-
{
133-
are_equal.ShouldBeTrue();
134-
}
135-
}
136-
137-
[TestFixture]
138-
public class when_comparing_the_contents_of_two_different_IDefaultableEnumerables_with_the_same_default_items_and_user_items : IDefaultableEnumerableContentEqualitySpec
139-
{
140-
public override void establish_context()
141-
{
142-
first_enumerable = new DefaultableList<string> { "one", "two" };
143-
first_enumerable.AddDefault("three");
144-
first_enumerable.AddDefault("four");
145-
second_enumerable = new DefaultableList<string> { "one", "two" };
146-
second_enumerable.AddDefault("three");
147-
second_enumerable.AddDefault("four");
148-
}
149-
150-
public override void because()
151-
{
152-
are_equal = first_enumerable.ContentEquals(second_enumerable);
153-
}
154-
155-
[Test]
156-
public void should_be_equal()
157-
{
158-
are_equal.ShouldBeTrue();
159-
}
160-
}
161-
162-
[TestFixture]
163-
public class when_comparing_the_contents_of_two_different_IDefaultableEnumerables_with_the_same_default_items_and_different_user_items : IDefaultableEnumerableContentEqualitySpec
164-
{
165-
public override void establish_context()
166-
{
167-
first_enumerable = new DefaultableList<string> { "one", "two" };
168-
first_enumerable.AddDefault("three");
169-
first_enumerable.AddDefault("four");
170-
second_enumerable = new DefaultableList<string> { "1", "2" };
171-
second_enumerable.AddDefault("three");
172-
second_enumerable.AddDefault("four");
173-
}
174-
175-
public override void because()
176-
{
177-
are_equal = first_enumerable.ContentEquals(second_enumerable);
178-
}
179-
180-
[Test]
181-
public void should_not_be_equal()
182-
{
183-
are_equal.ShouldBeFalse();
184-
}
185-
}
186-
187-
[TestFixture]
188-
public class when_comparing_the_contents_of_two_different_IDefaultableEnumerables_with_different_default_items_and_the_same_user_items : IDefaultableEnumerableContentEqualitySpec
189-
{
190-
public override void establish_context()
191-
{
192-
first_enumerable = new DefaultableList<string> { "one", "two" };
193-
first_enumerable.AddDefault("three");
194-
first_enumerable.AddDefault("four");
195-
second_enumerable = new DefaultableList<string> { "one", "two" };
196-
second_enumerable.AddDefault("3");
197-
second_enumerable.AddDefault("4");
198-
}
199-
200-
public override void because()
201-
{
202-
are_equal = first_enumerable.ContentEquals(second_enumerable);
203-
}
204-
205-
[Test]
206-
public void should_not_be_equal()
207-
{
208-
are_equal.ShouldBeFalse();
209-
}
210-
}
211-
21291
[TestFixture]
21392
public class when_comparing_the_contents_of_two_diferent_IDictionarys_with_the_same_contents : IDictionaryContentEqualitySpec
21493
{
@@ -260,13 +139,6 @@ public abstract class IEnumerableContentEqualitySpec : Specification
260139
protected bool are_equal;
261140
}
262141

263-
public abstract class IDefaultableEnumerableContentEqualitySpec : Specification
264-
{
265-
protected IDefaultableList<string> first_enumerable;
266-
protected IDefaultableList<string> second_enumerable;
267-
protected bool are_equal;
268-
}
269-
270142
public abstract class IDictionaryContentEqualitySpec : Specification
271143
{
272144
protected IDictionary<string, string> first_dictionary;

‎src/FluentNHibernate.Testing/MappingModel/Output/XmlAnyWriterTester.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void ShouldWriteTypeColumns()
103103
{
104104
var mapping = new AnyMapping();
105105

106-
mapping.AddTypeColumn(new ColumnMapping("Column1"));
106+
mapping.AddTypeColumn(Layer.Defaults, new ColumnMapping("Column1"));
107107

108108
writer.VerifyXml(mapping)
109109
.Element("column").Exists();
@@ -114,7 +114,7 @@ public void ShouldWriteIdentifierColumns()
114114
{
115115
var mapping = new AnyMapping();
116116

117-
mapping.AddIdentifierColumn(new ColumnMapping("Column1"));
117+
mapping.AddIdentifierColumn(Layer.Defaults, new ColumnMapping("Column1"));
118118

119119
writer.VerifyXml(mapping)
120120
.Element("column").Exists();
@@ -125,8 +125,8 @@ public void ShouldWriteTypeColumnsBeforeIdentifiers()
125125
{
126126
var mapping = new AnyMapping();
127127

128-
mapping.AddIdentifierColumn(new ColumnMapping("Column1"));
129-
mapping.AddTypeColumn(new ColumnMapping("Column2"));
128+
mapping.AddIdentifierColumn(Layer.Defaults, new ColumnMapping("Column1"));
129+
mapping.AddTypeColumn(Layer.Defaults, new ColumnMapping("Column2"));
130130

131131
writer.VerifyXml(mapping)
132132
.Element("column[1]").HasAttribute("name", "Column2");

‎src/FluentNHibernate.Testing/MappingModel/Output/XmlDiscriminatorWriterTester.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void ShouldWriteColumns()
4949
{
5050
var mapping = new DiscriminatorMapping();
5151

52-
mapping.AddColumn(new ColumnMapping("Column1"));
52+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
5353

5454
writer.VerifyXml(mapping)
5555
.Element("column").Exists();

‎src/FluentNHibernate.Testing/MappingModel/Output/XmlElementWriterTester.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ShouldWriteColumns()
3232
{
3333
var mapping = new ElementMapping();
3434

35-
mapping.AddColumn(new ColumnMapping());
35+
mapping.AddColumn(Layer.Defaults, new ColumnMapping());
3636

3737
writer.VerifyXml(mapping)
3838
.Element("column").Exists();

‎src/FluentNHibernate.Testing/MappingModel/Output/XmlIdWriterTester.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void ShouldWriteTheGenerator()
7171
public void ShouldWriteTheColumns()
7272
{
7373
var mapping = new IdMapping();
74-
mapping.AddColumn(new ColumnMapping("Column1"));
74+
mapping.AddColumn(Layer.Defaults, new ColumnMapping("Column1"));
7575

7676
writer.VerifyXml(mapping)
7777
.Element("column").Exists();

‎src/FluentNHibernate.Testing/MappingModel/Output/XmlIndexManyToManyWriterTester.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void ShouldWriteColumns()
4343
{
4444
var mapping = new IndexManyToManyMapping();
4545

46-
mapping.AddColumn(new ColumnMapping());
46+
mapping.AddColumn(Layer.Defaults, new ColumnMapping());
4747

4848
writer.VerifyXml(mapping)
4949
.Element("column").Exists();

‎src/FluentNHibernate.Testing/MappingModel/Output/XmlIndexWriterTester.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ShouldWriteColumns()
3232
{
3333
var mapping = new IndexMapping();
3434

35-
mapping.AddColumn(new ColumnMapping());
35+
mapping.AddColumn(Layer.Defaults, new ColumnMapping());
3636

3737
writer.VerifyXml(mapping)
3838
.Element("column").Exists();

0 commit comments

Comments
 (0)