Skip to content

Commit 3bdc793

Browse files
authored
Merge pull request #151 from spring-projects/features/fakeiteasy
Replace Rhino.Mocks with FakeItEasy
2 parents bd3a729 + ba10504 commit 3bdc793

File tree

126 files changed

+2958
-10556
lines changed

Some content is hidden

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

126 files changed

+2958
-10556
lines changed

Spring.build

Lines changed: 18 additions & 249 deletions
Large diffs are not rendered by default.

lib/Mono/2.0/DotNetMock.Framework.dll

-44 KB
Binary file not shown.

lib/Mono/2.0/DotNetMock.dll

-60 KB
Binary file not shown.

lib/Mono/2.0/Rhino.Mocks.dll

-309 KB
Binary file not shown.

lib/Mono/2.0/Rhino.Mocks.xml

Lines changed: 0 additions & 5624 deletions
This file was deleted.

src/Directory.Build.props

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<NeutralLanguage>en-US</NeutralLanguage>
3232
<WarningsAsErrors>True</WarningsAsErrors>
3333

34-
<RepositoryType>git</RepositoryType>
35-
<RepositoryUrl>https://github.com/spring-projects/spring-net</RepositoryUrl>
34+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
35+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3636

3737
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
3838

@@ -46,8 +46,13 @@
4646
<LangVersion>latest</LangVersion>
4747

4848
</PropertyGroup>
49+
50+
<ItemGroup Condition="'$(SourceLinkEnabled)' != 'false'">
51+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
52+
</ItemGroup>
4953

5054
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
55+
<DebugType>Full</DebugType>
5156
<DefineConstants>DEBUG;TRACE;DEBUG_DYNAMIC;$(DefineConstants)</DefineConstants>
5257
</PropertyGroup>
5358

src/Spring/Spring.Aop/Aop/Framework/AdvisorChainFactoryUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
/*
4-
* Copyright © 2002-2011 the original author or authors.
4+
* Copyright © 2002-2011 the original author or authors.
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.

src/Spring/Spring.Aop/Aop/Framework/AopContext.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
/*
4-
* Copyright © 2002-2011 the original author or authors.
4+
* Copyright © 2002-2011 the original author or authors.
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ namespace Spring.Aop.Framework
4141
/// advice configuration.
4242
/// </p>
4343
/// <p>
44-
/// To expose the current proxy, set the <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/>
44+
/// To expose the current proxy, set the <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/>
4545
/// property on the controlling proxy to <see langword="true"/>.
4646
/// The default value for the <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
4747
/// is <see langword="false"/>, for performance reasons.
@@ -70,7 +70,7 @@ public sealed class AopContext
7070
/// </summary>
7171
private static Stack ProxyStack
7272
{
73-
get
73+
get
7474
{
7575
if (tls_ProxyStack == null)
7676
{
@@ -90,7 +90,7 @@ private static Stack ProxyStack
9090
/// on the controlling proxy has been set to <see langword="true"/>.
9191
/// </p>
9292
/// <p>
93-
/// The default value for the
93+
/// The default value for the
9494
/// <see cref="Spring.Aop.Framework.ProxyConfig.ExposeProxy"/> property
9595
/// is <see langword="false"/>, for performance reasons.
9696
/// </p>
@@ -99,7 +99,7 @@ public static bool IsActive
9999
{
100100
get
101101
{
102-
return (tls_ProxyStack != null && tls_ProxyStack.Count > 0);
102+
return (tls_ProxyStack != null && tls_ProxyStack.Count > 0);
103103
}
104104
}
105105

@@ -125,7 +125,7 @@ public static object CurrentProxy
125125
}
126126

127127
/// <summary>
128-
/// Sets the current proxy by pushing it to the proxy stack.
128+
/// Sets the current proxy by pushing it to the proxy stack.
129129
/// </summary>
130130
/// <remarks>
131131
/// <p>

src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
/*
4-
* Copyright © 2002-2011 the original author or authors.
4+
* Copyright © 2002-2011 the original author or authors.
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.
@@ -109,13 +109,13 @@ public abstract class AbstractAutoProxyCreator : ProxyConfig, IInstantiationAwar
109109
/// Indicates whether to mark the create proxy as immutable.
110110
/// </summary>
111111
/// <remarks>
112-
/// Setting this to true effectively disables modifying the generated
112+
/// Setting this to true effectively disables modifying the generated
113113
/// proxy's advisor configuration
114114
/// </remarks>
115115
private bool freezeProxy = false;
116116

117117
/// <summary>
118-
/// Names of common interceptors.
118+
/// Names of common interceptors.
119119
/// We must use object name rather than object references
120120
/// to handle prototype advisors/interceptors.
121121
/// Default is the empty array: no common interceptors.
@@ -142,7 +142,7 @@ public abstract class AbstractAutoProxyCreator : ProxyConfig, IInstantiationAwar
142142
#region Properties
143143

144144
/// <summary>
145-
/// Sets the AdvisorAdapterRegistry to use.
145+
/// Sets the AdvisorAdapterRegistry to use.
146146
/// </summary>
147147
/// <remarks>
148148
/// Default is the global AdvisorAdapterRegistry.
@@ -170,19 +170,19 @@ public IList CustomTargetSourceCreators
170170
set { customTargetSourceCreators = value; }
171171
}
172172

173-
/// <summary>
174-
/// Sets the common interceptors, a list of <see cref="AopAlliance.Aop.IAdvice"/>,
173+
/// <summary>
174+
/// Sets the common interceptors, a list of <see cref="AopAlliance.Aop.IAdvice"/>,
175175
/// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
176176
/// </summary>
177177
/// <remarks>
178178
/// <para>
179-
/// If this property isn't set, there will be zero common interceptors.
179+
/// If this property isn't set, there will be zero common interceptors.
180180
/// This is perfectly valid, if "specific" interceptors such as
181181
/// matching Advisors are all we want.
182182
/// </para>
183183
/// </remarks>
184184
/// <value>
185-
/// The list of <see cref="AopAlliance.Aop.IAdvice"/>,
185+
/// The list of <see cref="AopAlliance.Aop.IAdvice"/>,
186186
/// <see cref="Spring.Aop.IAdvisor"/> and introduction object names.
187187
/// </value>
188188
/// <seealso cref="AopAlliance.Aop.IAdvice"/>
@@ -194,7 +194,7 @@ public string[] InterceptorNames
194194

195195
/// <summary>
196196
/// Sets whether the common interceptors should be applied before
197-
/// object-specific ones.
197+
/// object-specific ones.
198198
/// </summary>
199199
/// <remarks>
200200
/// Default is true; else, object-specific interceptors will get applied first.
@@ -683,7 +683,7 @@ public bool PostProcessAfterInstantiation(object objectInstance, string objectNa
683683
/// <param name="pvs">The property values that the factory is about to apply (never <code>null</code>).</param>
684684
/// <param name="pis">he relevant property infos for the target object (with ignored
685685
/// dependency types - which the factory handles specifically - already filtered out)</param>
686-
/// <param name="objectInstance">The object instance created, but whose properties have not yet
686+
/// <param name="objectInstance">The object instance created, but whose properties have not yet
687687
/// been set.</param>
688688
/// <param name="objectName">Name of the object.</param>
689689
/// <returns>The passed in PropertyValues</returns>

src/Spring/Spring.Aop/Aop/Target/SimplePoolTargetSource.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
/*
44
* Copyright © 2002-2011 the original author or authors.
5-
*
5+
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.
88
* You may obtain a copy of the License at
9-
*
9+
*
1010
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
11+
*
1212
* Unless required by applicable law or agreed to in writing, software
1313
* distributed under the License is distributed on an "AS IS" BASIS,
1414
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
/*
4-
* Copyright © 2002-2011 the original author or authors.
4+
* Copyright © 2002-2011 the original author or authors.
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.
@@ -236,7 +236,7 @@ protected AbstractApplicationContext(string name, bool caseSensitive,
236236
/// processors being added to the underlying <see cref="IConfigurableObjectFactory"/>
237237
/// </summary>
238238
/// <remarks>
239-
/// Each time <see cref="Refresh()"/> is called on this context, the context ensures, that
239+
/// Each time <see cref="Refresh()"/> is called on this context, the context ensures, that
240240
/// all default <see cref="IObjectPostProcessor"/>s are registered with the underlying <see cref="IConfigurableObjectFactory"/>.
241241
/// </remarks>
242242
/// <param name="defaultObjectPostProcessor">The <see cref="IObjectPostProcessor"/> instance.</param>
@@ -268,7 +268,7 @@ public virtual void Dispose()
268268

269269
#endregion
270270

271-
// Closed event is raised before destroying objectfactory to enable registered IApplicationEventListeners
271+
// Closed event is raised before destroying objectfactory to enable registered IApplicationEventListeners
272272
// to handle the event before they get disposed.
273273
PublishEvent(this, new ContextClosedEventArgs());
274274

@@ -1046,7 +1046,7 @@ public void Refresh()
10461046
}
10471047

10481048
/// <summary>
1049-
/// Registers well-known <see cref="IObjectPostProcessor"/>s and
1049+
/// Registers well-known <see cref="IObjectPostProcessor"/>s and
10501050
/// preregisters well-known dependencies using <see cref="IConfigurableListableObjectFactory.RegisterResolvableDependency"/>
10511051
/// </summary>
10521052
/// <param name="objectFactory">the raw object factory as returned from <see cref="RefreshObjectFactory"/></param>
@@ -1370,14 +1370,14 @@ public IList<string> GetObjectDefinitionNames()
13701370
{
13711371
return GetObjectDefinitionNames(false);
13721372
}
1373-
1373+
13741374
/// <summary>
13751375
/// Return the names of all objects defined in this factory, if <code>includeAncestors</code>is <code>true</code>
13761376
/// includes all parent factories.
13771377
/// </summary>
13781378
/// <param name="includeAncestors">to include parent factories into result</param>
13791379
/// <returns>
1380-
/// The names of all objects defined in this factory, if <code>includeAncestors</code> is <code>true</code> includes all
1380+
/// The names of all objects defined in this factory, if <code>includeAncestors</code> is <code>true</code> includes all
13811381
/// objects defined in parent factories, or an empty array if none are defined.
13821382
/// </returns>
13831383
public IList<string> GetObjectDefinitionNames(bool includeAncestors)
@@ -1401,7 +1401,7 @@ public IList<string> GetObjectDefinitionNames(bool includeAncestors)
14011401
/// </exception>
14021402
/// <exception cref="Spring.Objects.ObjectsException">
14031403
/// In the case of errors.
1404-
/// </exception>
1404+
/// </exception>
14051405
public virtual IObjectDefinition GetObjectDefinition(string name)
14061406
{
14071407
return SafeGetObjectFactory().GetObjectDefinition(name);
@@ -1425,7 +1425,7 @@ public virtual IObjectDefinition GetObjectDefinition(string name)
14251425
/// </exception>
14261426
/// <exception cref="Spring.Objects.ObjectsException">
14271427
/// In the case of errors.
1428-
/// </exception>
1428+
/// </exception>
14291429
public IObjectDefinition GetObjectDefinition(string name, bool includeAncestors)
14301430
{
14311431
return SafeGetObjectFactory().GetObjectDefinition(name, includeAncestors);
@@ -2099,7 +2099,7 @@ public IObjectFactory ParentObjectFactory
20992099
/// of the given name from an ancestor object factory.
21002100
/// </summary>
21012101
/// <remarks>
2102-
///
2102+
///
21032103
/// </remarks>
21042104
/// <param name="name">The name of the object to query.</param>
21052105
/// <returns>
@@ -2115,8 +2115,8 @@ public bool ContainsLocalObject(string name)
21152115
#region IObjectDefinitionRegistry Members
21162116

21172117
/// <summary>
2118-
/// Determine whether the given object name is already in use within this context,
2119-
/// i.e. whether there is a local object. May be override by subclasses, the default
2118+
/// Determine whether the given object name is already in use within this context,
2119+
/// i.e. whether there is a local object. May be override by subclasses, the default
21202120
/// implementation simply returns <see cref="ContainsLocalObject"/>
21212121
/// </summary>
21222122
public virtual bool IsObjectNameInUse(string objectName)
@@ -2496,7 +2496,7 @@ public void Unsubscribe(object subscriber, Type targetSourceType)
24962496
/// </summary>
24972497
/// <remarks>
24982498
/// <p>
2499-
///
2499+
///
25002500
/// </p>
25012501
/// </remarks>
25022502
/// <param name="sender">

src/Spring/Spring.Core/Expressions/LambdaExpressionNode.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
/*
4-
* Copyright © 2002-2011 the original author or authors.
4+
* Copyright © 2002-2011 the original author or authors.
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");
77
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ public class LambdaExpressionNode : BaseNode
3636
/// caches argumentNames of this instance
3737
/// </summary>
3838
private string[] argumentNames;
39-
39+
4040
/// <summary>
4141
/// caches body expression of this lambda function
4242
/// </summary>
@@ -56,7 +56,7 @@ protected LambdaExpressionNode(SerializationInfo info, StreamingContext context)
5656
: base(info, context)
5757
{
5858
}
59-
59+
6060
/// <summary>
6161
/// Gets argument names for this lambda expression.
6262
/// </summary>
@@ -107,7 +107,7 @@ protected override object Get(object context, EvaluationContext evalContext, obj
107107
arguments[argNames[i]] = argValues[i];
108108
}
109109

110-
EvaluationContext ec = (EvaluationContext)evalContext;
110+
EvaluationContext ec = evalContext;
111111
using (ec.SwitchLocalVariables(arguments))
112112
{
113113
object result = Get(context, ec);

0 commit comments

Comments
 (0)