Skip to content

Commit 65884f1

Browse files
chester89chester89
committed
Merge pull request #255 from twiernik/master
Moving from RhinoMocks to FakeItEasy
2 parents 2cadff4 + b779ae1 commit 65884f1

24 files changed

+286
-371
lines changed

‎src/FluentNHibernate.Testing/AutoMapping/Apm/AlterationTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using FluentNHibernate.Automapping;
1+
using FakeItEasy;
2+
using FluentNHibernate.Automapping;
23
using FluentNHibernate.Automapping.Alterations;
34
using FluentNHibernate.Automapping.TestFixtures;
45
using NUnit.Framework;
5-
using Rhino.Mocks;
66

77
namespace FluentNHibernate.Testing.Automapping.Apm
88
{
@@ -21,13 +21,13 @@ public void CreateAutoMapper()
2121
[Test]
2222
public void ShouldApplyAlterationsToModel()
2323
{
24-
var alteration = MockRepository.GenerateMock<IAutoMappingAlteration>();
24+
var alteration = A.Fake<IAutoMappingAlteration>();
2525

2626
model
2727
.Alterations(alterations => alterations.Add(alteration))
2828
.BuildMappings();
2929

30-
alteration.AssertWasCalled(x => x.Alter(model));
30+
A.CallTo(() => alteration.Alter(model)).MustHaveHappened();
3131
}
3232

3333
[Test]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Linq;
2+
using FakeItEasy;
23
using FluentNHibernate.Automapping;
34
using FluentNHibernate.Cfg;
45
using FluentNHibernate.Cfg.Db;
@@ -22,7 +23,7 @@ public class MappingConfigurationTests
2223
[SetUp]
2324
public void CreateMappingConfiguration()
2425
{
25-
logger = Stub<IDiagnosticLogger>.Create();
26+
logger = A.Fake<IDiagnosticLogger>();
2627
cfg = new Configuration();
2728

2829
SQLiteConfiguration.Standard

‎src/FluentNHibernate.Testing/ConventionsTests/ProxyConventionTester.cs

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Text;
5+
using FakeItEasy;
56
using FluentNHibernate.Conventions;
67
using FluentNHibernate.Conventions.Inspections;
78
using FluentNHibernate.Conventions.Instances;
89
using FluentNHibernate.Mapping;
910
using FluentNHibernate.MappingModel;
1011
using NUnit.Framework;
11-
using Rhino.Mocks;
1212

1313
namespace FluentNHibernate.Testing.ConventionsTests
1414
{
@@ -20,147 +20,145 @@ public void ConventionSetsProxyOnProxiedClass()
2020
{
2121
ProxyConvention convention = GetConvention();
2222

23-
var classInstance = MockRepository.GenerateMock<IClassInstance>();
24-
classInstance.Expect(x => x.EntityType)
25-
.Return(typeof(ProxiedObject));
26-
23+
var classInstance = A.Fake<IClassInstance>();
24+
A.CallTo(() => classInstance.EntityType).Returns(typeof(ProxiedObject));
25+
2726
convention.Apply(classInstance);
2827

29-
classInstance.AssertWasCalled(x => x.Proxy(typeof(IProxiedObject)));
28+
A.CallTo(() => classInstance.Proxy(typeof(IProxiedObject)))
29+
.MustHaveHappened();
3030
}
3131

3232
[Test]
3333
public void ConventionSetsProxyOnProxiedSubclass()
3434
{
3535
ProxyConvention convention = GetConvention();
3636

37-
var classInstance = MockRepository.GenerateMock<ISubclassInstance>();
38-
classInstance.Expect(x => x.EntityType)
39-
.Return(typeof(ProxiedObject));
37+
var classInstance = A.Fake<ISubclassInstance>();
38+
A.CallTo(() => classInstance.EntityType).Returns(typeof(ProxiedObject));
4039

4140
convention.Apply(classInstance);
4241

43-
classInstance.AssertWasCalled(x => x.Proxy(typeof(IProxiedObject)));
42+
A.CallTo(() => classInstance.Proxy(typeof(IProxiedObject)))
43+
.MustHaveHappened();
4444
}
4545

4646
[Test]
4747
public void ConventionDoesNotSetProxyOnUnproxiedClass()
4848
{
4949
ProxyConvention convention = GetConvention();
5050

51-
var classInstance = MockRepository.GenerateMock<IClassInstance>();
52-
classInstance.Stub(x => x.EntityType)
53-
.Return(typeof(NotProxied));
51+
var classInstance = A.Fake<IClassInstance>();
52+
A.CallTo(() => classInstance.EntityType).Returns(typeof(NotProxied));
5453

5554
convention.Apply(classInstance);
5655

57-
classInstance.AssertWasNotCalled(x => x.Proxy(Arg<Type>.Is.Anything));
56+
A.CallTo(() => classInstance.Proxy(A<Type>._)).MustNotHaveHappened();
5857
}
5958

6059
[Test]
6160
public void ConventionDoesNotSetProxyOnUnproxiedSubclass()
6261
{
6362
ProxyConvention convention = GetConvention();
6463

65-
var classInstance = MockRepository.GenerateMock<ISubclassInstance>();
66-
classInstance.Stub(x => x.EntityType)
67-
.Return(typeof(NotProxied));
64+
var classInstance = A.Fake<ISubclassInstance>();
65+
A.CallTo(() => classInstance.EntityType).Returns(typeof(NotProxied));
6866

6967
convention.Apply(classInstance);
7068

71-
classInstance.AssertWasNotCalled(x => x.Proxy(Arg<Type>.Is.Anything));
69+
A.CallTo(() => classInstance.Proxy(A<Type>._)).MustNotHaveHappened();
7270
}
7371

7472
[Test]
7573
public void ConventionSetsProxiedCollectionChildTypeToConcreteType()
7674
{
7775
ProxyConvention convention = GetConvention();
7876

79-
var collectionInstance = MockRepository.GenerateMock<ICollectionInstance>();
80-
var relationship = MockRepository.GenerateMock<IRelationshipInstance>();
77+
var collectionInstance = A.Fake<ICollectionInstance>();
78+
var relationship = A.Fake<IRelationshipInstance>();
8179

82-
collectionInstance.Stub(x => x.Relationship)
83-
.Return(relationship);
84-
relationship.Stub(x => x.Class)
85-
.Return(new TypeReference(typeof(IProxiedObject)));
80+
A.CallTo(() => collectionInstance.Relationship).Returns(relationship);
81+
A.CallTo(() => relationship.Class).Returns(new TypeReference(typeof(IProxiedObject)));
8682

8783
convention.Apply(collectionInstance);
8884

89-
relationship.AssertWasCalled(x => x.CustomClass(typeof(ProxiedObject)));
85+
A.CallTo(() => relationship.CustomClass(typeof(ProxiedObject)))
86+
.MustHaveHappened();
9087
}
9188

9289
[Test]
9390
public void ConventionDoesNotSetCollectionChildTypeIfUnrecognised()
9491
{
9592
ProxyConvention convention = GetConvention();
9693

97-
var collectionInstance = MockRepository.GenerateMock<ICollectionInstance>();
98-
var relationship = MockRepository.GenerateMock<IRelationshipInstance>();
94+
var collectionInstance = A.Fake<ICollectionInstance>();
95+
var relationship = A.Fake<IRelationshipInstance>();
9996

100-
collectionInstance.Stub(x => x.Relationship)
101-
.Return(relationship);
102-
relationship.Stub(x => x.Class)
103-
.Return(new TypeReference(typeof(NotProxied)));
97+
A.CallTo(() => collectionInstance.Relationship).Returns(relationship);
98+
A.CallTo(() => relationship.Class).Returns(new TypeReference(typeof(NotProxied)));
10499

105100
convention.Apply(collectionInstance);
106101

107-
relationship.AssertWasNotCalled(x => x.CustomClass(Arg<Type>.Is.Anything));
102+
A.CallTo(() => relationship.CustomClass(A<Type>._))
103+
.MustNotHaveHappened();
108104
}
109105

110106
[Test]
111107
public void ConventionSetsProxiedManyToOneTypeToConcreteType()
112108
{
113109
ProxyConvention convention = GetConvention();
114110

115-
var manyToOneInstance = MockRepository.GenerateMock<IManyToOneInstance>();
116-
manyToOneInstance.Stub(x => x.Class)
117-
.Return(new TypeReference(typeof(IProxiedObject)));
111+
var manyToOneInstance = A.Fake<IManyToOneInstance>();
112+
A.CallTo(() => manyToOneInstance.Class).Returns(new TypeReference(typeof(IProxiedObject)));
118113

119114
convention.Apply(manyToOneInstance);
120115

121-
manyToOneInstance.AssertWasCalled(x => x.OverrideInferredClass(typeof(ProxiedObject)));
116+
A.CallTo(() => manyToOneInstance.OverrideInferredClass(typeof(ProxiedObject)))
117+
.MustHaveHappened();
122118
}
123119

124120
[Test]
125121
public void ConventionDoesNotSetManyToOneTypeIfUnrecognised()
126122
{
127123
ProxyConvention convention = GetConvention();
128124

129-
var manyToOneInstance = MockRepository.GenerateMock<IManyToOneInstance>();
130-
manyToOneInstance.Stub(x => x.Class)
131-
.Return(new TypeReference(typeof(NotProxied)));
125+
var manyToOneInstance = A.Fake<IManyToOneInstance>();
126+
A.CallTo(() => manyToOneInstance.Class).Returns(new TypeReference(typeof(NotProxied)));
132127

133128
convention.Apply(manyToOneInstance);
134129

135-
manyToOneInstance.AssertWasNotCalled(x => x.OverrideInferredClass(typeof(ProxiedObject)));
130+
A.CallTo(() => manyToOneInstance.OverrideInferredClass(typeof(ProxiedObject)))
131+
.MustNotHaveHappened();
136132
}
137133

138134
[Test]
139135
public void ConventionSetsProxiedOneToOneTypeToConcreteType()
140136
{
141137
ProxyConvention convention = GetConvention();
142138

143-
var oneToOneInstance = MockRepository.GenerateMock<IOneToOneInstance>();
144-
oneToOneInstance.Stub(x => ((IOneToOneInspector)x).Class)
145-
.Return(new TypeReference(typeof(IProxiedObject)));
139+
var oneToOneInstance = A.Fake<IOneToOneInstance>();
140+
A.CallTo(() => ((IOneToOneInspector)oneToOneInstance).Class)
141+
.Returns(new TypeReference(typeof(IProxiedObject)));
146142

147143
convention.Apply(oneToOneInstance);
148144

149-
oneToOneInstance.AssertWasCalled(x => x.OverrideInferredClass(typeof(ProxiedObject)));
145+
A.CallTo(() => oneToOneInstance.OverrideInferredClass(typeof(ProxiedObject)))
146+
.MustHaveHappened();
150147
}
151148

152149
[Test]
153150
public void ConventionDoesNotSetOneToOneTypeIfUnrecognised()
154151
{
155152
ProxyConvention convention = GetConvention();
156153

157-
var oneToOneInstance = MockRepository.GenerateMock<IOneToOneInstance>();
158-
oneToOneInstance.Stub(x => ((IOneToOneInspector)x).Class)
159-
.Return(new TypeReference(typeof(NotProxied)));
154+
var oneToOneInstance = A.Fake<IOneToOneInstance>();
155+
A.CallTo(() => ((IOneToOneInspector)oneToOneInstance).Class)
156+
.Returns(new TypeReference(typeof(NotProxied)));
160157

161158
convention.Apply(oneToOneInstance);
162159

163-
oneToOneInstance.AssertWasNotCalled(x => x.OverrideInferredClass(typeof(ProxiedObject)));
160+
A.CallTo(() => oneToOneInstance.OverrideInferredClass(typeof(ProxiedObject)))
161+
.MustNotHaveHappened();
164162
}
165163

166164
private static ProxyConvention GetConvention()

‎src/FluentNHibernate.Testing/Diagnostics/DiagnosticConfigurationTests.cs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using FluentNHibernate.Diagnostics;
1+
using FakeItEasy;
2+
using FluentNHibernate.Diagnostics;
23
using FluentNHibernate.Testing.Utils;
34
using NUnit.Framework;
4-
using Rhino.Mocks;
55

66
namespace FluentNHibernate.Testing.Diagnostics
77
{
@@ -33,35 +33,38 @@ public void disabling_should_set_logger_to_null_impl()
3333
[Test]
3434
public void adding_listener_should_add_listener_to_underlying_dispatcher()
3535
{
36-
var dispatcher = Mock<IDiagnosticMessageDispatcher>.Create();
37-
var listener = Stub<IDiagnosticListener>.Create();
36+
var dispatcher = A.Fake<IDiagnosticMessageDispatcher>();
37+
var listener = A.Fake<IDiagnosticListener>();
3838

3939
new DiagnosticsConfiguration(dispatcher, l => { })
4040
.RegisterListener(listener);
4141

42-
dispatcher.AssertWasCalled(x => x.RegisterListener(listener));
42+
A.CallTo(() => dispatcher.RegisterListener(listener))
43+
.MustHaveHappened();
4344
}
4445

4546
[Test]
4647
public void output_to_console_should_register_console_listener()
4748
{
48-
var dispatcher = Mock<IDiagnosticMessageDispatcher>.Create();
49+
var dispatcher = A.Fake<IDiagnosticMessageDispatcher>();
4950

5051
new DiagnosticsConfiguration(dispatcher, l => { })
5152
.OutputToConsole();
5253

53-
dispatcher.AssertWasCalled(x => x.RegisterListener(Arg<ConsoleOutputListener>.Is.TypeOf));
54+
A.CallTo(() => dispatcher.RegisterListener(A<ConsoleOutputListener>._))
55+
.MustHaveHappened();
5456
}
5557

5658
[Test]
5759
public void output_to_file_should_register_console_listener()
5860
{
59-
var dispatcher = Mock<IDiagnosticMessageDispatcher>.Create();
61+
var dispatcher = A.Fake<IDiagnosticMessageDispatcher>();
6062

6163
new DiagnosticsConfiguration(dispatcher, l => { })
6264
.OutputToFile("path");
6365

64-
dispatcher.AssertWasCalled(x => x.RegisterListener(Arg<FileOutputListener>.Is.TypeOf));
66+
A.CallTo(() => dispatcher.RegisterListener(A<FileOutputListener>._))
67+
.MustHaveHappened();
6568
}
6669
}
6770
}

0 commit comments

Comments
 (0)