- demo.AssertWasCalled(x => x.Bar(Arg{string}.Matches(a => a.StartsWith("b") && a.Contains("ba"))));
-
-
- var argsForCalls = foo54.GetArgumentsForCallsMadeOn(x => x.DoSomething(0))
-
-
- var argsForCalls = foo54.GetArgumentsForCallsMadeOn(x => x.DoSomething(0))
-
-
- /// To expose the current proxy, set the
- /// The default value for the
+ /// The default value for the
///
diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs
index 4e45a4934..02528ba00 100644
--- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs
+++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -109,13 +109,13 @@ public abstract class AbstractAutoProxyCreator : ProxyConfig, IInstantiationAwar
/// Indicates whether to mark the create proxy as immutable.
///
///
- ///
+ ///
///
- /// Currently supports reading custom configuration sections and returning them as
+ /// Currently supports reading custom configuration sections and returning them as
/// null).
/// he relevant property infos for the target object (with ignored
/// dependency types - which the factory handles specifically - already filtered out)
- /// The object instance created, but whose properties have not yet
+ /// The object instance created, but whose properties have not yet
/// been set.
/// Name of the object.
/// includeAncestorsis true
/// includes all parent factories.
/// includeAncestors is true includes all
+ /// The names of all objects defined in this factory, if includeAncestors is true includes all
/// objects defined in parent factories, or an empty array if none are defined.
/// null if the
+ /// Gets the defaults definition object, or null if the
/// default have not yet been initialized.
///
- /// Usage: specify either the
- /// public class Foo
+ /// public class Foo
/// {
/// public string ToString(string name, int age, string address)
/// {
/// return string.Format("{0}, {1} years old, {2}", name, age, address);
/// }
- ///
+ ///
/// public static void Main()
/// {
/// Foo foo = new Foo();
@@ -352,7 +352,7 @@ private void PrepareArguments()
}
// look up the index of where in the prepared args array we're gonna stick the named argument value
- int namedArgumentsIndex = (int) argumentNamesToIndexes[argumentName];
+ int namedArgumentsIndex = argumentNamesToIndexes[argumentName];
PreparedArguments[namedArgumentsIndex] = argumentValue;
// we've prepped this index position, so mark it as so...
argumentNamesToIndexes[argumentName] = THE_ARGUMENT_IS_PREPARED;
@@ -420,7 +420,7 @@ protected virtual MethodInfo FindTheMethodToInvoke()
}
if (theMethod == null)
{
- // search for a method with a matching signature...
+ // search for a method with a matching signature...
ComposedCriteria searchCriteria = new ComposedCriteria();
searchCriteria.Add(new MethodNameMatchCriteria(genericInfo.GenericMethodName));
searchCriteria.Add(new MethodParametersCountCriteria(ArgumentCount));
diff --git a/src/Spring/Spring.Core/Util/NumberUtils.cs b/src/Spring/Spring.Core/Util/NumberUtils.cs
index 1e92570a5..db1f5bdd6 100644
--- a/src/Spring/Spring.Core/Util/NumberUtils.cs
+++ b/src/Spring/Spring.Core/Util/NumberUtils.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Generic/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Generic/HibernateTemplate.cs
index 1ebfbc21a..c4ee3617c 100644
--- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Generic/HibernateTemplate.cs
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/Generic/HibernateTemplate.cs
@@ -1,14 +1,14 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
- *
+ * Copyright � 2002-2011 the original author or authors.
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,18 +50,18 @@ namespace Spring.Data.NHibernate.Generic
/// or handling Session lifecycle exceptions. For typical single step actions,
/// there are various convenience methods (Find, Load, SaveOrUpdate, Delete).
///
- ///
+ ///
/// Can be used within a service implementation via direct instantiation
/// with a ISessionFactory reference, or get prepared in an application context
/// and given to services as an object reference. Note: The ISessionFactory should
/// always be configured as an object in the application context, in the first case
/// given to the service directly, in the second case to the prepared template.
///
- ///
+ ///
/// This class can be considered as a direct alternative to working with the raw
/// Hibernate Session API (through SessionFactoryUtils.Session).
///
- ///
+ ///
/// LocalSessionFactoryObject is the preferred way of obtaining a reference
/// to a specific NHibernate ISessionFactory.
///
@@ -73,8 +73,8 @@ public class HibernateTemplate : HibernateAccessor, IHibernateOperations
#region Fields
NHibernate.HibernateTemplate classicHibernateTemplate;
-
- #endregion
+
+ #endregion
#region Constructor (s)
@@ -89,25 +89,25 @@ public HibernateTemplate()
///
/// Initializes a new instance of the
- /// Allows creation of a new non-transactional session when no
+ /// Allows creation of a new non-transactional session when no
/// transactional Session can be found for the current thread
/// The session factory to create sessions.
public HibernateTemplate(ISessionFactory sessionFactory)
{
- classicHibernateTemplate = new Spring.Data.NHibernate.HibernateTemplate(sessionFactory);
+ classicHibernateTemplate = new Spring.Data.NHibernate.HibernateTemplate(sessionFactory);
AfterPropertiesSet();
}
///
/// Initializes a new instance of the
- /// The session factory to create sessions.
+ /// The session factory to create sessions.
/// if set to true allow creation
- /// of a new non-transactional session when no transactional Session can be found
+ /// of a new non-transactional session when no transactional Session can be found
/// for the current thread.
public HibernateTemplate(ISessionFactory sessionFactory, bool allowCreate)
{
- classicHibernateTemplate = new Spring.Data.NHibernate.HibernateTemplate(sessionFactory, allowCreate);
+ classicHibernateTemplate = new Spring.Data.NHibernate.HibernateTemplate(sessionFactory, allowCreate);
AfterPropertiesSet();
}
@@ -247,7 +247,7 @@ public override IObjectFactory ObjectFactory
}
///
- /// Gets or sets a value indicating whether to
+ /// Gets or sets a value indicating whether to
/// cache all queries executed by this template.
///
///
@@ -344,7 +344,7 @@ public NHibernate.HibernateTemplate ClassicHibernateTemplate
///
/// Gets or sets the proxy factory.
///
- /// This may be useful to set if you create many instances of
+ /// This may be useful to set if you create many instances of
/// HibernateTemplate and/or HibernateDaoSupport. This allows the same
/// ProxyFactory implementation to be used thereby limiting the
/// number of dynamic proxy types created in the temporary assembly, which
@@ -362,8 +362,8 @@ public virtual ProxyFactory ProxyFactory
#region Properties
-
-
+
+
#endregion
#region Methods
@@ -374,7 +374,7 @@ public virtual ProxyFactory ProxyFactory
///
public void Clear()
{
- classicHibernateTemplate.Clear();
+ classicHibernateTemplate.Clear();
}
@@ -606,13 +606,13 @@ public object SaveOrUpdateCopy(object entity)
#endif
///
- /// Copy the state of the given object onto the persistent object with the same identifier.
+ /// Copy the state of the given object onto the persistent object with the same identifier.
/// If there is no persistent instance currently associated with the session, it will be loaded.
- /// Return the persistent instance. If the given instance is unsaved,
+ /// Return the persistent instance. If the given instance is unsaved,
/// save a copy of and return it as a newly persistent instance.
- /// The given instance does not become associated with the session.
+ /// The given instance does not become associated with the session.
/// This operation cascades to associated instances if the association is mapped with cascade="merge".
- /// The semantics of this method are defined by JSR-220.
+ /// The semantics of this method are defined by JSR-220.
///
/// The persistent object to merge.
/// (not necessarily to be associated with the Hibernate Session)
@@ -636,7 +636,7 @@ public object Merge(object entity)
/// The object type to get.
/// The id of the object to get.
/// the persistent instance, or null if not found
- /// In case of Hibernate errors
+ /// In case of Hibernate errors
public T Get(object id)
{
return Get(id, null);
@@ -668,7 +668,7 @@ public T Get(object id, LockMode lockMode)
/// The object type to load.
/// An identifier of the persistent instance.
/// The persistent instance
- /// If not found
+ /// If not found
/// In case of Hibernate errors
public T Load(object id)
{
@@ -684,8 +684,8 @@ public T Load(object id)
/// An identifier of the persistent instance.
/// The lock mode.
/// The persistent instance
- /// If not found
- /// In case of Hibernate errors
+ /// If not found
+ /// In case of Hibernate errors
public T Load(object id, LockMode lockMode)
{
return Execute(new LoadByTypeHibernateCallback(id, lockMode), true);
@@ -715,7 +715,7 @@ public IList LoadAll()
///
/// a generic List containing 0 or more persistent instances
///
- /// In case of Hibernate errors
+ /// In case of Hibernate errors
public IList Find(string queryString)
{
return Find(queryString, (object[]) null, (IType[]) null);
@@ -731,7 +731,7 @@ public IList Find(string queryString)
///
/// a generic List containing 0 or more persistent instances
///
- /// In case of Hibernate errors
+ /// In case of Hibernate errors
public IList Find(string queryString, object value)
{
return Find(queryString, new object[] {value}, (IType[]) null);
@@ -748,7 +748,7 @@ public IList Find(string queryString, object value)
///
/// a generic List containing 0 or more persistent instances
///
- /// In case of Hibernate errors
+ /// In case of Hibernate errors
public IList Find(string queryString, object value, IType type)
{
return Find(queryString, new object[] {value}, new IType[] {type});
@@ -762,7 +762,7 @@ public IList Find(string queryString, object value, IType type)
/// a query expressed in Hibernate's query language
/// the values of the parameters
/// a generic List containing 0 or more persistent instances
- /// In case of Hibernate errors
+ /// In case of Hibernate errors
public IList Find(string queryString, object[] values)
{
return Find(queryString, values, (IType[]) null);
@@ -779,8 +779,8 @@ public IList Find(string queryString, object[] values)
///
/// a generic List containing 0 or more persistent instances
///
- /// In case of Hibernate errors
- /// If values and types are not null and their lengths are not equal
+ /// In case of Hibernate errors
+ /// If values and types are not null and their lengths are not equal
public IList Find(string queryString, object[] values, IType[] types)
{
if (values != null && types != null && values.Length != types.Length)
@@ -1009,7 +1009,7 @@ public IList FindByNamedQueryAndNamedParam(string queryName, string[] para
/// A generic List containing 0 or more persistent instances
/// In case of Hibernate errors
/// If paramNames length is not equal to values length or
- /// if paramNames length is not equal to types length (when types is not null)
+ /// if paramNames length is not equal to types length (when types is not null)
public IList FindByNamedQueryAndNamedParam(string queryName, string[] paramNames, object[] values,
IType[] types)
{
@@ -1050,7 +1050,7 @@ public IList FindByNamedQueryAndValueObject(string queryName, object value
/// of the given object to named parameters in the query string.
///
/// The object type to find.
- /// A query expressed in Hibernate's query language
+ /// A query expressed in Hibernate's query language
/// The values of the parameters
/// A generic List containing 0 or more persistent instances
/// In case of Hibernate errors
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
index df8f2a357..51c7bdc54 100644
--- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/HibernateTemplate.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
index 7bff9bd90..871c71ab1 100644
--- a/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
+++ b/src/Spring/Spring.Data.NHibernate/Data/NHibernate/LocalSessionFactoryObject.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@ namespace Spring.Data.NHibernate
/// as autodetected by Spring's
/// Mark Pollack (.NET)
@@ -117,7 +117,7 @@ public class LocalSessionFactoryObject : IFactoryObject, IInitializingObject, IP
private IApplicationContext applicationContext;
- // Configuration time DB provider.
+ // Configuration time DB provider.
// This will not be available after configuration has been done.
private static IDbProvider configTimeDbProvider;
@@ -508,7 +508,7 @@ public virtual void AfterPropertiesSet()
IDictionary typedProperties = new Dictionary();
foreach (KeyValuePair entry in hibernateProperties)
{
- typedProperties.Add((string) entry.Key, (string) entry.Value);
+ typedProperties.Add(entry.Key, entry.Value);
}
Dialect dialect = Dialect.GetDialect(typedProperties);
@@ -545,7 +545,7 @@ public virtual void AfterPropertiesSet()
log.Info("Overriding use of Spring's Hibernate Connection Provider with [" +
hibernateProperties[Environment.ConnectionProvider] + "]");
}
- #endregion
+ #endregion
config.Properties.Remove(Environment.ConnectionProvider);
}
@@ -625,7 +625,7 @@ public virtual void AfterPropertiesSet()
}
}
- if (this.eventListeners != null)
+ if (this.eventListeners != null)
{
// Register specified NHibernate event listeners.
foreach (DictionaryEntry entry in eventListeners)
@@ -641,7 +641,7 @@ public virtual void AfterPropertiesSet()
}
object listenerObject = entry.Value;
- if (listenerObject is ICollection)
+ if (listenerObject is ICollection)
{
ICollection listeners = (ICollection) listenerObject;
EventListeners listenerRegistry = config.EventListeners;
@@ -651,7 +651,7 @@ public virtual void AfterPropertiesSet()
object[] listenerArray = (object[])items.ToArray(listenerRegistry.GetListenerClassFor(listenerType));
config.SetListeners(listenerType, listenerArray);
}
- else
+ else
{
config.SetListener(listenerType, listenerObject);
}
@@ -694,8 +694,8 @@ public void Dispose()
if (log.IsInfoEnabled)
{
log.Info("Closing Hibernate SessionFactory");
- }
- #endregion
+ }
+ #endregion
sessionFactory.Close();
}
@@ -753,7 +753,7 @@ protected virtual void AfterSessionFactoryCreation()
UpdateDatabaseSchema();
}
}
-
+
///
/// Execute schema drop script, determined by the Configuration object
/// used for creating the SessionFactory. A replacement for NHibernate's
@@ -781,7 +781,7 @@ public void DropDatabaseSchema()
ExecuteSchemaScript(con, sql);
return null;
}));
-
+
}
///
@@ -810,8 +810,8 @@ public void CreateDatabaseSchema()
string[] sql = Configuration.GenerateSchemaCreationScript(dialect);
ExecuteSchemaScript(con, sql);
return null;
-
- }));
+
+ }));
}
///
@@ -829,7 +829,7 @@ public void CreateDatabaseSchema()
/// connection to perform the script.
///
///
- public virtual void UpdateDatabaseSchema()
+ public virtual void UpdateDatabaseSchema()
{
log.Info("Updating database schema for Hibernate SessionFactory");
HibernateTemplate hibernateTemplate = new HibernateTemplate(sessionFactory);
@@ -859,17 +859,17 @@ public virtual void UpdateDatabaseSchema()
/// The SQL statement to execute.
protected virtual void ExecuteSchemaScript(IDbConnection con, string[] sql)
{
- if (sql != null && sql.Length > 0)
+ if (sql != null && sql.Length > 0)
{
IDbCommand cmd = con.CreateCommand();
- try
+ try
{
- for (int i = 0; i < sql.Length; i++)
+ for (int i = 0; i < sql.Length; i++)
{
ExecuteSchemaStatement(cmd, sql[i]);
}
}
- finally
+ finally
{
AdoUtils.DisposeCommand(cmd);
}
@@ -887,18 +887,18 @@ protected virtual void ExecuteSchemaScript(IDbConnection con, string[] sql)
///
protected virtual void ExecuteSchemaStatement(IDbCommand cmd, string sql)
{
- if (log.IsDebugEnabled)
+ if (log.IsDebugEnabled)
{
log.Debug("Executing schema statement: " + sql);
}
- try
+ try
{
cmd.CommandText = sql;
cmd.ExecuteNonQuery();
}
- catch (ADOException ex)
+ catch (ADOException ex)
{
- if (log.IsWarnEnabled)
+ if (log.IsWarnEnabled)
{
log.Warn("Unsuccessful schema statement: " + sql, ex);
}
@@ -921,7 +921,7 @@ protected virtual ISessionFactory NewSessionFactory(Configuration config)
{
ISessionFactory sf = config.BuildSessionFactory();
ISessionFactoryImplementor sfImplementor = sf as ISessionFactoryImplementor;
-
+
if (sfImplementor != null)
{
DbProviderWrapper dbProviderWrapper = sfImplementor.ConnectionProvider as DbProviderWrapper;
@@ -997,7 +997,7 @@ public override IDbConnection GetConnection()
///
///
- /// In contrast to
///
- /// This technique is useful if you want to group e.g. rendering navigation elements on 1 ascx control, but your
+ /// This technique is useful if you want to group e.g. rendering navigation elements on 1 ascx control, but your
/// design requires navigation elements to be distributed across different places within the HTML code.
///
///
@@ -71,7 +71,7 @@ protected override void OnPreRender(EventArgs e)
if (!Visible) return;
//log.Debug(string.Format("OnPreRender Content['{0}']", this.contentPlaceHolderID));
- Control ctlRoot = (this.Page.Master != null) ? (Control)this.Page.Master : (Control)this.Page;
+ Control ctlRoot = Page.Master != null ? Page.Master : (Control) Page;
Control ctl = ctlRoot.FindControl(this.contentPlaceHolderID);
if (ctl != null)
@@ -120,7 +120,7 @@ private void RenderNothing(HtmlTextWriter output, Control container)
private static readonly PropertyInfo piRareFieldsEnsured =
typeof(Control).GetProperty("RareFieldsEnsured", BindingFlags.NonPublic | BindingFlags.Instance);
- private static readonly FieldInfo fiRenderMethod =
+ private static readonly FieldInfo fiRenderMethod =
typeof(Control).GetNestedType("ControlRareFields",BindingFlags.NonPublic).GetField("RenderMethod");
private RenderMethod GetRenderMethod()
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 110b81d44..88ada2da0 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -22,7 +22,7 @@
3.10.1
3.10.0
- 3.6.1
+ 4.8.1
15.7.2
True
@@ -36,6 +36,7 @@
+ Full
DEBUG;TRACE;$(DefineConstants)
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs
index 36610422d..1f6af64c6 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AbstractMethodInvocationTests.cs
@@ -18,18 +18,16 @@
#endregion
-#region Imports
-
using System;
using System.Collections;
using System.Globalization;
using System.Reflection;
using AopAlliance.Intercept;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Aop.Framework
{
@@ -41,16 +39,13 @@ namespace Spring.Aop.Framework
[TestFixture]
public abstract class AbstractMethodInvocationTests
{
- private MockRepository mocks;
-
[SetUp]
public virtual void SetUp()
{
- mocks = new MockRepository();
}
protected abstract AbstractMethodInvocation CreateMethodInvocation(
- object proxy, object target, MethodInfo method, MethodInfo onProxyMethod,
+ object proxy, object target, MethodInfo method, MethodInfo onProxyMethod,
object[] arguments, Type targetType, IList interceptors);
[Test]
@@ -178,7 +173,7 @@ public void ValidInvocation()
IMethodInterceptor interceptor = (IMethodInterceptor) repository.CreateMock(typeof (IMethodInterceptor));
AbstractMethodInvocation join = CreateMethodInvocation(
null, target, target.GetTargetMethodNoArgs(), null, null, target.GetType(), new object[] { interceptor });
- Expect.Call(interceptor.Invoke(join)).Return(target.BullseyeMethod().ToLower(CultureInfo.InvariantCulture));
+ Expect.Call(interceptor.Invoke(join)).Returns(target.BullseyeMethod().ToLower(CultureInfo.InvariantCulture));
repository.ReplayAll();
string score = (string) join.Proceed();
Assert.AreEqual(target.BullseyeMethod().ToLower(CultureInfo.InvariantCulture) + Target.Suffix, score);
@@ -186,18 +181,14 @@ public void ValidInvocation()
*/
Target target = new Target();
- IMethodInterceptor mock = (IMethodInterceptor) mocks.CreateMock(typeof(IMethodInterceptor));
+ IMethodInterceptor mock = A.Fake();
AbstractMethodInvocation join = CreateMethodInvocation(
null, target, target.GetTargetMethodNoArgs(), null, null, target.GetType(), new object[] { mock });
-
- Expect.Call(mock.Invoke(null)).IgnoreArguments().Return(target.BullseyeMethod().ToLower(CultureInfo.InvariantCulture));
- mocks.ReplayAll();
+
+ A.CallTo(() => mock.Invoke(null)).WithAnyArguments().Returns(target.BullseyeMethod().ToLower(CultureInfo.InvariantCulture));
string score = (string) join.Proceed();
Assert.AreEqual(Target.DefaultScore.ToLower(CultureInfo.InvariantCulture) + Target.Suffix, score);
-
- mocks.VerifyAll();
-
}
[Test]
@@ -222,53 +213,30 @@ public void UnwrapsTargetInvocationException_NoInterceptors()
[Test]
public void UnwrapsTargetInvocationException_WithInterceptor()
- {
- BadCommand target = new BadCommand();
- IMethodInterceptor mock = (IMethodInterceptor) mocks.CreateMock(typeof(IMethodInterceptor));
- AbstractMethodInvocation join = CreateMethodInvocation(
- null, target, target.GetTargetMethod(), null, null, target.GetType(), new object[] { mock });
-
- Expect.Call(mock.Invoke(null)).IgnoreArguments().Return(null);
- mocks.ReplayAll();
+ {
+ BadCommand target = new BadCommand();
+ IMethodInterceptor mock = A.Fake();
+ AbstractMethodInvocation join = CreateMethodInvocation(
+ null, target, target.GetTargetMethod(), null, null, target.GetType(), new object[] {mock});
- try
- {
- join.Proceed();
- }
- catch (NotImplementedException)
- {
- // this is good, we want this exception to bubble up...
- }
- catch (TargetInvocationException)
- {
- Assert.Fail("Must have unwrapped this.");
- }
- mocks.VerifyAll();
- }
+ A.CallTo(() => mock.Invoke(null)).WithAnyArguments().Throws();
- [Test]
+ // we want this exception to bubble up...
+ Assert.Throws(() => join.Proceed());
+ }
+
+ [Test]
public void UnwrapsTargetInvocationException_WithInterceptorThatThrowsAnException()
{
BadCommand target = new BadCommand();
- IMethodInterceptor mock = (IMethodInterceptor) mocks.CreateMock(typeof(IMethodInterceptor));
+ IMethodInterceptor mock = A.Fake();
AbstractMethodInvocation join = CreateMethodInvocation(
null, target, target.GetTargetMethod(), null, null, target.GetType(), new object[] { mock });
- Expect.Call(mock.Invoke(null)).IgnoreArguments().Throw(new NotImplementedException());
- mocks.ReplayAll();
- try
- {
- join.Proceed();
- }
- catch (NotImplementedException)
- {
- // this is good, we want this exception to bubble up...
- }
- catch (TargetInvocationException)
- {
- Assert.Fail("Must have unwrapped this.");
- }
- mocks.VerifyAll();
+ A.CallTo(() => mock.Invoke(null)).WithAnyArguments().Throws();
+
+ // we want this exception to bubble up...
+ Assert.Throws(() => join.Proceed());
}
}
}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs
index 880fb01a5..ca3cb116e 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/AfterReturningAdviceInterceptorTests.cs
@@ -18,48 +18,41 @@
#endregion
-#region Imports
-
using System;
+
using AopAlliance.Intercept;
+using FakeItEasy;
using NUnit.Framework;
-using Rhino.Mocks;
-using Spring.Util;
-#endregion
+using Spring.Util;
namespace Spring.Aop.Framework.Adapter
{
- ///
- /// Unit tests for the AfterReturningAdviceInterceptor class.
- ///
- /// Rod Johnson
- /// Simon White (.NET)
- [TestFixture]
- public sealed class AfterReturningAdviceInterceptorTests
- {
- [Test]
- public void PassNullAdviceToCtor()
- {
+ ///
+ /// Unit tests for the AfterReturningAdviceInterceptor class.
+ ///
+ /// Rod Johnson
+ /// Simon White (.NET)
+ [TestFixture]
+ public sealed class AfterReturningAdviceInterceptorTests
+ {
+ [Test]
+ public void PassNullAdviceToCtor()
+ {
Assert.Throws(() => new AfterReturningAdviceInterceptor(null));
- }
+ }
- [Test]
- public void IsNotInvokedIfServiceObjectThrowsException()
- {
- MockRepository repository = new MockRepository();
- IMethodInvocation mockInvocation = (IMethodInvocation)repository.CreateMock(typeof(IMethodInvocation));
- IAfterReturningAdvice mockAdvice = (IAfterReturningAdvice)repository.CreateMock(typeof(IAfterReturningAdvice));
- mockAdvice.AfterReturning(null, null, null, null);
- LastCall.IgnoreArguments();
- LastCall.Throw(new FormatException());
+ [Test]
+ public void IsNotInvokedIfServiceObjectThrowsException()
+ {
+ IMethodInvocation mockInvocation = A.Fake();
+ IAfterReturningAdvice mockAdvice = A.Fake();
- Expect.Call(mockInvocation.Method).Return(ReflectionUtils.GetMethod(typeof(object), "HashCode", new Type[] { }));
- Expect.Call(mockInvocation.Arguments).Return(null);
- Expect.Call(mockInvocation.This).Return(new object());
- Expect.Call(mockInvocation.Proceed()).Return(null);
-
- repository.ReplayAll();
+ A.CallTo(() => mockAdvice.AfterReturning(null, null, null, null)).WithAnyArguments().Throws();
+ A.CallTo(() => mockInvocation.Method).Returns(ReflectionUtils.GetMethod(typeof(object), "HashCode", new Type[] { }));
+ A.CallTo(() => mockInvocation.Arguments).Returns(null);
+ A.CallTo(() => mockInvocation.This).Returns(new object());
+ A.CallTo(() => mockInvocation.Proceed()).Returns(null);
try
{
@@ -70,29 +63,19 @@ public void IsNotInvokedIfServiceObjectThrowsException()
catch (FormatException)
{
}
-
- repository.VerifyAll();
-
- }
-
- [Test]
- public void JustPassesAfterReturningAdviceExceptionUpWithoutAnyWrapping()
- {
-
- MockRepository repository = new MockRepository();
- IMethodInvocation mockInvocation = (IMethodInvocation)repository.CreateMock(typeof(IMethodInvocation));
- IAfterReturningAdvice mockAdvice = (IAfterReturningAdvice) repository.CreateMock(typeof (IAfterReturningAdvice));
- mockAdvice.AfterReturning(null,null,null,null);
- LastCall.IgnoreArguments();
- LastCall.Throw(new FormatException());
-
- Expect.Call(mockInvocation.Method).Return(ReflectionUtils.GetMethod(typeof(object), "HashCode", new Type[] { }));
- Expect.Call(mockInvocation.Arguments).Return(null);
- Expect.Call(mockInvocation.This).Return(new object());
- Expect.Call(mockInvocation.Proceed()).Return(null);
-
- repository.ReplayAll();
-
+ }
+
+ [Test]
+ public void JustPassesAfterReturningAdviceExceptionUpWithoutAnyWrapping()
+ {
+ IMethodInvocation mockInvocation = A.Fake();
+ IAfterReturningAdvice mockAdvice = A.Fake();
+ A.CallTo(() => mockAdvice.AfterReturning(null, null, null, null)).WithAnyArguments().Throws();
+
+ A.CallTo(() => mockInvocation.Method).Returns(ReflectionUtils.GetMethod(typeof(object), "HashCode", new Type[] { }));
+ A.CallTo(() => mockInvocation.Arguments).Returns(null);
+ A.CallTo(() => mockInvocation.This).Returns(new object());
+ A.CallTo(() => mockInvocation.Proceed()).Returns(null);
try
{
AfterReturningAdviceInterceptor interceptor = new AfterReturningAdviceInterceptor(mockAdvice);
@@ -102,12 +85,6 @@ public void JustPassesAfterReturningAdviceExceptionUpWithoutAnyWrapping()
catch (FormatException)
{
}
- repository.VerifyAll();
-
-
-
-
-
- }
- }
+ }
+ }
}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs
index 86d68e777..38c1badb5 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/Adapter/ThrowsAdviceInterceptorTests.cs
@@ -18,18 +18,18 @@
#endregion
-#region Imports
-
using System;
using System.Reflection;
using System.Runtime.Remoting;
using System.Web;
+
using AopAlliance.Intercept;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
-using Spring.Util;
-#endregion
+using Spring.Util;
namespace Spring.Aop.Framework.Adapter
{
@@ -56,21 +56,16 @@ public void PassNullAdviceToCtor()
[Test]
public void NotInvoked()
{
- MockRepository repository = new MockRepository();
- IMethodInvocation mi = (IMethodInvocation) repository.CreateMock(typeof (IMethodInvocation));
+ IMethodInvocation mi = A.Fake();
MyThrowsHandler th = new MyThrowsHandler();
ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
object ret = new object();
- Expect.Call(mi.Proceed()).Return(ret);
- repository.ReplayAll();
+ A.CallTo(() => mi.Proceed()).Returns(ret);
+
Assert.AreEqual(ret, ti.Invoke(mi));
Assert.AreEqual(0, th.GetCalls());
- repository.VerifyAll();
-
-
-
}
[Test]
@@ -81,10 +76,9 @@ public void NoHandlerMethodForThrowable()
Assert.AreEqual(2, ti.HandlerMethodCount);
Exception ex = new Exception();
- MockRepository repository = new MockRepository();
- IMethodInvocation mi = (IMethodInvocation)repository.CreateMock(typeof(IMethodInvocation));
- Expect.Call(mi.Proceed()).Throw(ex);
- repository.ReplayAll();
+ IMethodInvocation mi = A.Fake();
+ A.CallTo(() => mi.Proceed()).Throws(ex);
+
try
{
ti.Invoke(mi);
@@ -95,8 +89,6 @@ public void NoHandlerMethodForThrowable()
Assert.AreEqual(ex, caught);
}
Assert.AreEqual(0, th.GetCalls());
- repository.VerifyAll();
-
}
[Test]
@@ -107,14 +99,13 @@ public void CorrectHandlerUsed()
ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th);
HttpException ex = new HttpException();
- MockRepository repository = new MockRepository();
- IMethodInvocation mi = (IMethodInvocation)repository.CreateMock(typeof(IMethodInvocation));
+ IMethodInvocation mi = A.Fake();
+
+ A.CallTo(() => mi.Method).Returns(ReflectionUtils.GetMethod(typeof (object), "HashCode", new Type[] {}));
+ A.CallTo(() => mi.Arguments).Returns(null);
+ A.CallTo(() => mi.This).Returns(new object());
+ A.CallTo(() => mi.Proceed()).Throws(ex);
- Expect.Call(mi.Method).Return(ReflectionUtils.GetMethod(typeof (object), "HashCode", new Type[] {}));
- Expect.Call(mi.Arguments).Return(null);
- Expect.Call(mi.This).Return(new object());
- Expect.Call(mi.Proceed()).Throw(ex);
- repository.ReplayAll();
try
{
ti.Invoke(mi);
@@ -126,9 +117,6 @@ public void CorrectHandlerUsed()
}
Assert.AreEqual(1, th.GetCalls());
Assert.AreEqual(1, th.GetCalls("HttpException"));
-
- repository.VerifyAll();
-
}
[Test]
@@ -138,10 +126,10 @@ public void NestedInnerExceptionsAreNotPickedUp()
ThrowsAdviceInterceptor throwsInterceptor = new ThrowsAdviceInterceptor(throwsHandler);
// nest the exceptions; make sure the advice gets applied because of the inner exception...
Exception exception = new FormatException("Parent", new HttpException("Inner"));
- MockRepository repository = new MockRepository();
- IMethodInvocation invocation = (IMethodInvocation)repository.CreateMock(typeof(IMethodInvocation));
- Expect.Call(invocation.Proceed()).Throw(exception);
- repository.ReplayAll();
+
+ IMethodInvocation invocation = A.Fake();
+ A.CallTo(() => invocation.Proceed()).Throws(exception);
+
try
{
throwsInterceptor.Invoke(invocation);
@@ -157,8 +145,7 @@ public void NestedInnerExceptionsAreNotPickedUp()
Assert.AreEqual(0, throwsHandler.GetCalls("HttpException"),
"Similarly, must NOT have been handled, 'cos the HttpException was wrapped by " +
"another Exception that did not have a handler.");
- repository.VerifyAll();
- }
+ }
[Test]
public void ChokesOnHandlerWhereMultipleMethodsAreApplicable()
@@ -175,10 +162,9 @@ public void CorrectHandlerUsedForSubclass()
// Extends RemotingException
RemotingTimeoutException ex = new RemotingTimeoutException();
- MockRepository repository = new MockRepository();
- IMethodInvocation mi = (IMethodInvocation)repository.CreateMock(typeof(IMethodInvocation));
- Expect.Call(mi.Proceed()).Throw(ex);
- repository.ReplayAll();
+ IMethodInvocation mi = A.Fake();
+ A.CallTo(() => mi.Proceed()).Throws(ex);
+
try
{
ti.Invoke(mi);
@@ -190,8 +176,6 @@ public void CorrectHandlerUsedForSubclass()
}
Assert.AreEqual(1, th.GetCalls());
Assert.AreEqual(1, th.GetCalls("RemotingException"));
-
- repository.VerifyAll();
}
[Test]
@@ -200,13 +184,10 @@ public void HandlerMethodThrowsException()
Exception exception = new Exception();
MyThrowsHandler handler = new ThrowingMyHandler(exception);
ThrowsAdviceInterceptor interceptor = new ThrowsAdviceInterceptor(handler);
- // extends RemotingException...
- RemotingTimeoutException ex = new RemotingTimeoutException();
- MockRepository repository = new MockRepository();
- IMethodInvocation mi = (IMethodInvocation)repository.CreateMock(typeof(IMethodInvocation));
- Expect.Call(mi.Proceed()).Throw(ex);
- repository.ReplayAll();
+ IMethodInvocation mi = A.Fake();
+ A.CallTo(() => mi.Proceed()).Throws(new RemotingTimeoutException());
+
try
{
interceptor.Invoke(mi);
@@ -217,9 +198,7 @@ public void HandlerMethodThrowsException()
Assert.AreEqual(exception, caught);
}
Assert.AreEqual(1, handler.GetCalls());
- Assert.AreEqual(1, handler.GetCalls("RemotingException"));
- repository.VerifyAll();
-
+ Assert.AreEqual(1, handler.GetCalls("RemotingException"));
}
#region Helper Classes
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
index c7229e632..bb7485294 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AbstractAopProxyTests.cs
@@ -18,8 +18,6 @@
#endregion
-#region Imports
-
using System;
using System.IO;
using System.Runtime.Serialization;
@@ -32,7 +30,9 @@
using AopAlliance.Aop;
using AopAlliance.Intercept;
-using Rhino.Mocks;
+
+using FakeItEasy;
+
using Spring.Aop.Framework.Adapter;
using Spring.Aop.Interceptor;
using Spring.Aop.Support;
@@ -44,8 +44,6 @@
using NUnit.Framework;
-#endregion
-
namespace Spring.Aop.Framework.DynamicProxy
{
///
@@ -288,19 +286,19 @@ public string Company
[Test(Description = "http://jira.springframework.org/browse/SPRNET-1174")]
public void ImplementsInterfaceHierarchy()
{
- IMethodInterceptor mi = MockRepository.GenerateMock();
+ IMethodInterceptor mi = A.Fake();
- mi.Stub(x => x.Invoke(Arg.Is.NotNull)).Return((long)5).Repeat.Once();
- mi.Stub(x => x.Invoke(Arg.Is.NotNull)).Return("Customer Name").Repeat.Once();
- mi.Stub(x => x.Invoke(Arg.Is.NotNull)).Return("Customer Company").Repeat.Once();
+ A.CallTo(() => mi.Invoke(A.That.Matches(x => x.Method.Name == "get_Id"))).Returns((long) 5).Once();
+ A.CallTo(() => mi.Invoke(A.That.Matches(x => x.Method.Name == "get_Name"))).Returns("Customer Name").Once();
+ A.CallTo(() => mi.Invoke(A.That.Matches(x => x.Method.Name == "get_Company"))).Returns("Customer Company").Once();
AdvisedSupport advised = new AdvisedSupport();
advised.AddAdvice(mi);
- advised.Interfaces = new Type[] { typeof(ITestCustomer) };
+ advised.Interfaces = new[] { typeof(ITestCustomer) };
ITestCustomer to = CreateProxy(advised) as ITestCustomer;
Assert.IsNotNull(to);
- Assert.AreEqual((long)5, to.Id, "Incorrect Id");
+ Assert.AreEqual((long) 5, to.Id, "Incorrect Id");
Assert.AreEqual("Customer Name", to.Name, "Incorrect Name");
Assert.AreEqual("Customer Company", to.Company, "Incorrect Company");
}
@@ -407,8 +405,8 @@ public void NoInterceptorWithNoTarget()
public void InterceptorHandledCallWithNoTarget()
{
int age = 26;
- IMethodInterceptor mock = MockRepository.GenerateMock();
- mock.Stub(x => x.Invoke(Arg.Is.NotNull)).Return(age);
+ IMethodInterceptor mock = A.Fake();
+ A.CallTo(() => mock.Invoke(A.That.Not.IsNull())).Returns(age);
AdvisedSupport advised = new AdvisedSupport();
advised.AddAdvice(mock);
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs
index 7431b9021..114afaa68 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/AopUtilsTests.cs
@@ -18,20 +18,18 @@
#endregion
-#region Imports
-
using System;
using System.Collections;
using System.Reflection;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Aop.Interceptor;
using Spring.Aop.Support;
using Spring.Collections;
using Spring.Objects;
-#endregion
-
namespace Spring.Aop.Framework.DynamicProxy
{
///
@@ -42,12 +40,9 @@ namespace Spring.Aop.Framework.DynamicProxy
[TestFixture]
public sealed class AopUtilsTests
{
- private MockRepository mocks;
-
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
}
[Test]
@@ -80,17 +75,17 @@ public void PointcutAppliesToOneInterfaceOfSeveral()
{
IPointcut pointcut = new OneInterfaceTestPointcut();
- // Will return true if we're proxying interfaces including ITestObject
+ // Will return true if we're proxying interfaces including ITestObject
Assert.IsTrue(AopUtils.CanApply(pointcut, typeof (TestObject), new Type[] {typeof (ITestObject), typeof (IComparable)}));
- // Will return true if we're proxying interfaces including ITestObject
+ // Will return true if we're proxying interfaces including ITestObject
Assert.IsFalse(AopUtils.CanApply(pointcut, typeof (TestObject), new Type[] {typeof (IComparable)}));
}
[Test]
public void CanApplyWithAdvisorYieldsTrueIfAdvisorIsNotKnownAdvisorType()
{
- IAdvisor advisor = (IAdvisor) mocks.CreateMock(typeof (IAdvisor));
+ IAdvisor advisor = A.Fake();
Assert.IsTrue(AopUtils.CanApply(advisor, typeof (TestObject), null));
}
@@ -171,12 +166,10 @@ public void GetAllInterfacesWithObjectThatInheritsInterfaces()
[Test]
public void CanApplyWithTrueIntroductionAdvisor()
{
- IIntroductionAdvisor mockIntroAdvisor = (IIntroductionAdvisor) mocks.CreateMock(typeof(IIntroductionAdvisor));
- Expect.Call(mockIntroAdvisor.TypeFilter).Return(TrueTypeFilter.True);
- mocks.ReplayAll();
+ IIntroductionAdvisor mockIntroAdvisor = A.Fake();
+ A.CallTo(() => mockIntroAdvisor.TypeFilter).Returns(TrueTypeFilter.True);
Assert.IsTrue(AopUtils.CanApply(mockIntroAdvisor, typeof (TestObject), null));
- mocks.VerifyAll();
}
#region Helper Classes
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs
index 89d352bcd..f3a9ce3fd 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryObjectTests.cs
@@ -31,8 +31,10 @@
using AopAlliance.Aop;
using AopAlliance.Intercept;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Aop.Advice;
using Spring.Aop.Framework.Adapter;
using Spring.Aop.Interceptor;
@@ -61,17 +63,14 @@ namespace Spring.Aop.Framework
[TestFixture]
public sealed class ProxyFactoryObjectTests
{
- private MockRepository mocks;
private IObjectFactory factory;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
factory = new XmlObjectFactory(new ReadOnlyXmlTestResource("proxyFactoryTests.xml", GetType()));
}
-
[Test]
public void TargetThrowsInvalidCastException()
{
@@ -477,9 +476,8 @@ public void GlobalsCanAddAspectInterfaces()
public void IsSingletonFalseReturnsNew_ProxyInstance_NotNewProxyTargetSource()
{
GoodCommand target = new GoodCommand();
- IObjectFactory mock = (IObjectFactory) mocks.CreateMock(typeof(IObjectFactory));
- Expect.Call(mock.GetObject("singleton")).Return(target).Repeat.Twice();
- mocks.ReplayAll();
+ IObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObject("singleton")).Returns(target).Twice();
ProxyFactoryObject fac = new ProxyFactoryObject();
fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
@@ -491,17 +489,14 @@ public void IsSingletonFalseReturnsNew_ProxyInstance_NotNewProxyTargetSource()
ICommand one = (ICommand)fac.GetObject();
ICommand two = (ICommand)fac.GetObject();
Assert.IsFalse(ReferenceEquals(one, two));
-
- mocks.VerifyAll();
}
[Test]
public void IsSingletonTrueReturnsNew_ProxyInstance_NotNewProxyTargetSource()
{
GoodCommand target = new GoodCommand();
- IObjectFactory mock = (IObjectFactory)mocks.CreateMock(typeof(IObjectFactory));
- Expect.Call(mock.GetObject("singleton")).Return(target);
- mocks.ReplayAll();
+ IObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObject("singleton")).Returns(target);
ProxyFactoryObject fac = new ProxyFactoryObject();
fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
@@ -513,8 +508,6 @@ public void IsSingletonTrueReturnsNew_ProxyInstance_NotNewProxyTargetSource()
ICommand one = (ICommand)fac.GetObject();
ICommand two = (ICommand)fac.GetObject();
Assert.IsTrue(ReferenceEquals(one, two));
-
- mocks.VerifyAll();
}
private ProxyFactoryObject CreateFrozenProxyFactory()
@@ -562,11 +555,10 @@ public void TargetAtEndOfInterceptorList()
GoodCommand target = new GoodCommand();
NopInterceptor advice = new NopInterceptor();
- IObjectFactory mock = (IObjectFactory) mocks.CreateMock(typeof(IObjectFactory));
- Expect.Call(mock.GetObject("advice")).Return(advice);
- Expect.Call(mock.GetObject("singleton")).Return(target);
- Expect.Call(mock.GetType("singleton")).Return(typeof(GoodCommand));
- mocks.ReplayAll();
+ IObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObject("advice")).Returns(advice);
+ A.CallTo(() => mock.GetObject("singleton")).Returns(target);
+ A.CallTo(() => mock.GetType("singleton")).Returns(typeof(GoodCommand));
ProxyFactoryObject fac = new ProxyFactoryObject();
fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
@@ -581,8 +573,6 @@ public void TargetAtEndOfInterceptorList()
Assert.AreEqual(1, advice.Count);
two.Execute();
Assert.AreEqual(2, advice.Count);
-
- mocks.VerifyAll();
}
[Test]
@@ -591,32 +581,20 @@ public void MakeSurePrototypeTargetIsNotNeedlesslyCreatedDuringInitialization_Un
GoodCommand target = new GoodCommand();
NopInterceptor advice = new NopInterceptor();
- MockRepository mocks = new MockRepository();
- IObjectFactory factory = (IObjectFactory) mocks.CreateMock(typeof(IObjectFactory));
+ IObjectFactory factory = A.Fake();
ProxyFactoryObject fac = new ProxyFactoryObject();
- fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
+ fac.ProxyInterfaces = new[] {typeof(ICommand).FullName};
fac.IsSingleton = false;
- fac.InterceptorNames = new string[] { "advice", "prototype" };
+ fac.InterceptorNames = new[] {"advice", "prototype"};
fac.ObjectFactory = factory;
-// using (mocks.Record())
- {
- using (mocks.Unordered())
- {
- Expect.Call(factory.IsSingleton("advice")).Return(true);
- Expect.Call(factory.GetObject("advice")).Return(advice);
- Expect.Call(factory.GetType("prototype")).Return(target.GetType());
- Expect.Call(factory.GetObject("prototype")).Return(target);
- }
- }
- mocks.ReplayAll();
+ A.CallTo(() => factory.IsSingleton("advice")).Returns(true);
+ A.CallTo(() => factory.GetObject("advice")).Returns(advice);
+ A.CallTo(() => factory.GetType("prototype")).Returns(target.GetType());
+ A.CallTo(() => factory.GetObject("prototype")).Returns(target);
-// using(mocks.Playback())
- {
- fac.GetObject();
- }
- mocks.VerifyAll();
+ fac.GetObject();
}
[Test]
@@ -706,26 +684,20 @@ public void Execute()
[Test]
public void NullNameInInterceptorNamesArrayThrowAopConfigException()
{
- IObjectFactory factory = (IObjectFactory) mocks.CreateMock(typeof(IObjectFactory));
+ IObjectFactory factory = A.Fake();
ProxyFactoryObject fac = new ProxyFactoryObject();
fac.ProxyInterfaces = new string[] { typeof(ICommand).FullName };
fac.IsSingleton = false;
fac.InterceptorNames = new string[] { null, null };
fac.ObjectFactory = factory;
- try
- {
- fac.GetObject();
- Assert.Fail();
- }
- catch (AopConfigException)
- {}
+ Assert.Throws(() => fac.GetObject());
}
[Test]
public void PassEmptyInterceptorNamesArray_WithTargetThatImplementsAnInterfaceCanBeCastToSaidInterface()
{
- IObjectFactory factory = (IObjectFactory) mocks.CreateMock(typeof(IObjectFactory));
+ IObjectFactory factory = A.Fake();
ProxyFactoryObject fac = new ProxyFactoryObject();
fac.ProxyInterfaces = new string[] { };
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs
index 7987ea7d4..cc54de186 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/ProxyFactoryTests.cs
@@ -18,21 +18,19 @@
#endregion
-#region Imports
-
using System;
using System.Runtime.Serialization;
using AopAlliance.Aop;
using AopAlliance.Intercept;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Aop.Interceptor;
using Spring.Aop.Support;
using Spring.Objects;
using Spring.Util;
-#endregion
-
namespace Spring.Aop.Framework
{
///
@@ -44,15 +42,6 @@ namespace Spring.Aop.Framework
[TestFixture]
public sealed class ProxyFactoryTests
{
-
- private MockRepository mocks;
-
- [SetUp]
- public void Setup()
- {
- mocks = new MockRepository();
- }
-
public interface IDoubleClickable
{
event EventHandler DoubleClick;
@@ -132,7 +121,7 @@ public void CacheTest()
object proxy = pf.GetProxy();
}
- // fails when running in resharper/testdriven.net
+ // fails when running in resharper/testdriven.net
// DynamicProxyManager.SaveAssembly();
}
@@ -523,24 +512,21 @@ public void AddAdvisedSupportListener()
//MLP SPRNET-1367
//IDynamicMock mock = new DynamicMock(typeof(IAdvisedSupportListener));
//IAdvisedSupportListener listener = (IAdvisedSupportListener)mock.Object;
- IAdvisedSupportListener listener =
- (IAdvisedSupportListener) mocks.CreateMock(typeof (IAdvisedSupportListener));
- listener.Activated(null);
- LastCall.On(listener).IgnoreArguments();
+ IAdvisedSupportListener listener = A.Fake();
//listener.Activated();
//mock.Expect("Activated");
- mocks.ReplayAll();
ProxyFactory factory = new ProxyFactory(new TestObject());
factory.AddListener(listener);
factory.GetProxy();
- mocks.VerifyAll();
+
+ A.CallTo(() => listener.Activated(A._)).MustHaveHappened();
}
[Test]
public void AdvisedSupportListenerMethodsAreCalledAppropriately()
{
- IAdvisedSupportListener listener = MockRepository.GenerateMock();
+ IAdvisedSupportListener listener = A.Fake();
ProxyFactory factory = new ProxyFactory(new TestObject());
factory.AddListener(listener);
@@ -552,15 +538,15 @@ public void AdvisedSupportListenerMethodsAreCalledAppropriately()
// must fire the InterfacesChanged callback...
factory.AddInterface(typeof(ISerializable));
- listener.AssertWasCalled(x => x.Activated(Arg.Is.NotNull));
- listener.AssertWasCalled(x => x.AdviceChanged(Arg.Is.NotNull));
- listener.AssertWasCalled(x => x.InterfacesChanged(Arg.Is.NotNull));
+ A.CallTo(() => listener.Activated(A.That.Not.IsNull())).MustHaveHappened();
+ A.CallTo(() => listener.AdviceChanged(A.That.Not.IsNull())).MustHaveHappened();
+ A.CallTo(() => listener.InterfacesChanged(A.That.Not.IsNull())).MustHaveHappened();
}
[Test]
public void AdvisedSupportListenerMethodsAre_NOT_CalledIfProxyHasNotBeenCreated()
{
- IAdvisedSupportListener listener = MockRepository.GenerateMock();
+ IAdvisedSupportListener listener = A.Fake();
ProxyFactory factory = new ProxyFactory(new TestObject());
factory.AddListener(listener);
@@ -570,8 +556,8 @@ public void AdvisedSupportListenerMethodsAre_NOT_CalledIfProxyHasNotBeenCreated(
// must not fire the InterfacesChanged callback...
factory.AddInterface(typeof(ISerializable));
- listener.AssertWasNotCalled(x => x.AdviceChanged(Arg.Is.Anything));
- listener.AssertWasNotCalled(x => x.InterfacesChanged(Arg.Is.Anything));
+ A.CallTo(() => listener.AdviceChanged(A._)).MustNotHaveHappened();
+ A.CallTo(() => listener.InterfacesChanged(A._)).MustNotHaveHappened();
}
[Test]
@@ -591,7 +577,7 @@ public void RemoveNullAdvisedSupportListenerIsOk()
[Test]
public void RemoveAdvisedSupportListener()
{
- IAdvisedSupportListener listener = MockRepository.GenerateMock();
+ IAdvisedSupportListener listener = A.Fake();
ProxyFactory factory = new ProxyFactory(new TestObject());
factory.AddListener(listener);
@@ -600,9 +586,9 @@ public void RemoveAdvisedSupportListener()
factory.GetProxy();
// check that no lifecycle callback methods were invoked on the listener...
- listener.AssertWasNotCalled(x => x.Activated(Arg.Is.Anything));
- listener.AssertWasNotCalled(x => x.AdviceChanged(Arg.Is.Anything));
- listener.AssertWasNotCalled(x => x.InterfacesChanged(Arg.Is.Anything));
+ A.CallTo(() => listener.Activated(null)).WithAnyArguments().MustNotHaveHappened();
+ A.CallTo(() => listener.AdviceChanged(null)).WithAnyArguments().MustNotHaveHappened();
+ A.CallTo(() => listener.InterfacesChanged(null)).WithAnyArguments().MustNotHaveHappened();
}
[Test]
@@ -657,7 +643,7 @@ public void NestedProxiesDontInvokeSameAdviceOrIntroductionTwice()
NopInterceptor diUnused = new NopInterceptor(1); // // make instance unique (see SPRNET-847)
TestCountingIntroduction countingMixin = new TestCountingIntroduction();
- pf1.AddAdvice(diUnused);
+ pf1.AddAdvice(diUnused);
pf1.AddAdvisor(new DefaultPointcutAdvisor(di));
pf1.AddIntroduction(new DefaultIntroductionAdvisor(countingMixin));
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs
index 0fe68b0b8..b14c4d630 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Support/DelegatingIntroductionInterceptorTests.cs
@@ -1,13 +1,13 @@
#region License
/*
* Copyright 2002-2010 the original author or authors.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,14 +16,14 @@
*/
#endregion
-#region Imports
using System;
using NUnit.Framework;
using AopAlliance.Aop;
-using Rhino.Mocks;
+
+using FakeItEasy;
+
using Spring.Aop.Framework;
using Spring.Objects;
-#endregion
namespace Spring.Aop.Support
{
@@ -58,9 +58,9 @@ public void TestIntroductionInterceptorWithDelegation()
TestObject raw = new TestObject();
Assert.IsTrue(! (raw is ITimeStamped));
ProxyFactory factory = new ProxyFactory(raw);
-
- ITimeStampedIntroduction ts = MockRepository.GenerateMock();
- ts.Stub(x => x.TimeStamp).Return(EXPECTED_TIMESTAMP);
+
+ ITimeStampedIntroduction ts = A.Fake();
+ A.CallTo(() => ts.TimeStamp).Returns(EXPECTED_TIMESTAMP);
DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(ts);
factory.AddIntroduction(advisor);
@@ -74,17 +74,18 @@ public void TestIntroductionInterceptorWithDelegation()
public interface ISubTimeStampedIntroduction: ISubTimeStamped, IAdvice
{
}
-
- public void TestIntroductionInterceptorWithInterfaceHierarchy()
+
+ [Test]
+ public void TestIntroductionInterceptorWithInterfaceHierarchy()
{
TestObject raw = new TestObject();
Assert.IsTrue(! (raw is ISubTimeStamped));
ProxyFactory factory = new ProxyFactory(raw);
- ISubTimeStampedIntroduction ts = MockRepository.GenerateMock();
- ts.Stub(x => x.TimeStamp).Return(EXPECTED_TIMESTAMP);
+ ISubTimeStampedIntroduction ts = A.Fake();
+ A.CallTo(() => ts.TimeStamp).Returns(EXPECTED_TIMESTAMP);
- DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(ts);
+ DefaultIntroductionAdvisor advisor = new DefaultIntroductionAdvisor(ts);
// we must add introduction, not an advisor
factory.AddIntroduction(advisor);
@@ -93,17 +94,18 @@ public void TestIntroductionInterceptorWithInterfaceHierarchy()
Assert.IsTrue(tsp.TimeStamp == EXPECTED_TIMESTAMP);
}
- public void TestIntroductionInterceptorWithSuperInterface()
+ [Test]
+ public void TestIntroductionInterceptorWithSuperInterface()
{
TestObject raw = new TestObject();
Assert.IsTrue(! (raw is ITimeStamped));
ProxyFactory factory = new ProxyFactory(raw);
- ISubTimeStamped ts = MockRepository.GenerateMock();
- ts.Stub(x => x.TimeStamp).Return(EXPECTED_TIMESTAMP);
+ ISubTimeStampedIntroduction ts = A.Fake();
+ A.CallTo(() => ts.TimeStamp).Returns(EXPECTED_TIMESTAMP);
- factory.AddIntroduction(0, new DefaultIntroductionAdvisor(
- (ISubTimeStampedIntroduction)ts,
+ factory.AddIntroduction(0, new DefaultIntroductionAdvisor(
+ ts,
typeof(ITimeStamped))
);
@@ -121,42 +123,42 @@ private class Test : ITimeStamped, ITest, IAdvice
{
private DateTime _timestamp;
- public Test(DateTime timestamp)
+ public Test(DateTime timestamp)
{
_timestamp = timestamp;
}
- public void Foo()
+ public void Foo()
{
}
- public DateTime TimeStamp
+ public DateTime TimeStamp
{
- get
+ get
{
return _timestamp;
}
}
}
- public void TestAutomaticInterfaceRecognitionInDelegate()
+ public void TestAutomaticInterfaceRecognitionInDelegate()
{
IIntroductionAdvisor ia = new DefaultIntroductionAdvisor(new Test(EXPECTED_TIMESTAMP));
-
+
TestObject target = new TestObject();
ProxyFactory pf = new ProxyFactory(target);
pf.AddIntroduction(0, ia);
ITimeStamped ts = (ITimeStamped) pf.GetProxy();
-
+
Assert.IsTrue(ts.TimeStamp == EXPECTED_TIMESTAMP);
((ITest) ts).Foo();
-
+
int age = ((ITestObject) ts).Age;
}
/*
* The rest of the tests in the original tested subclassing the
* DelegatingIntroductionInterceptor.
- *
+ *
* Since we don't need to subclass anything to make a delegating
* introduction, the rest of the tests are not necessary.
*/
@@ -164,12 +166,12 @@ public void TestAutomaticInterfaceRecognitionInDelegate()
// must be public to be used for AOP
// AOP creates a new assembly which must have access to the
// interfaces that it intends to expose.
- public interface ITest
+ public interface ITest
{
void Foo();
}
- public interface ISubTimeStamped : ITimeStamped
+ public interface ISubTimeStamped : ITimeStamped
{
}
diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs
index 6e09f7f06..151af21cc 100644
--- a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs
@@ -18,17 +18,17 @@
#endregion
-#region Imports
-
using System;
+
using Common.Logging;
using Common.Logging.Simple;
+
+using FakeItEasy;
+
using NUnit.Framework;
+
using Spring.Objects.Factory;
using Spring.Objects.Factory.Xml;
-using Rhino.Mocks;
-
-#endregion
namespace Spring.Aop.Target
{
@@ -79,24 +79,16 @@ public void PrototypeAndSingletonBehaveDifferently()
[Test]
public void TargetType()
{
- MockRepository mocks = new MockRepository();
SideEffectObject target = new SideEffectObject();
- IObjectFactory factory = mocks.CreateMock();
-
- using (mocks.Record())
- {
- Expect.Call(factory.IsPrototype(null)).Return(true);
- Expect.Call(factory.GetType(null)).Return(typeof(SideEffectObject));
- }
+ IObjectFactory factory = A.Fake();
- using (mocks.Playback())
- {
- PrototypeTargetSource source = new PrototypeTargetSource();
- source.ObjectFactory = factory;
- Assert.AreEqual(target.GetType(), source.TargetType, "Wrong TargetType being returned.");
- }
+ A.CallTo(() => factory.IsPrototype(null)).Returns(true);
+ A.CallTo(() => factory.GetType(null)).Returns(typeof(SideEffectObject));
+ PrototypeTargetSource source = new PrototypeTargetSource();
+ source.ObjectFactory = factory;
+ Assert.AreEqual(target.GetType(), source.TargetType, "Wrong TargetType being returned.");
}
[Test]
@@ -109,49 +101,30 @@ public void IsStatic()
[Test]
public void WithNonSingletonTargetObject()
{
- MockRepository mocks = new MockRepository();
-
- IObjectFactory factory = mocks.CreateMock();
+ IObjectFactory factory = A.Fake();
const string objectName = "Foo";
- using (mocks.Record())
- {
- Expect.Call(factory.IsPrototype(objectName)).Return(false);
- }
-
- using (mocks.Playback())
- {
- PrototypeTargetSource source = new PrototypeTargetSource();
- source.TargetObjectName = objectName;
+ A.CallTo(() => factory.IsPrototype(objectName)).Returns(false);
+ PrototypeTargetSource source = new PrototypeTargetSource();
+ source.TargetObjectName = objectName;
- Assert.Throws(delegate { source.ObjectFactory = factory; });
- }
+ Assert.Throws(delegate { source.ObjectFactory = factory; });
}
[Test]
public void GetTarget()
{
- MockRepository mocks = new MockRepository();
-
- IObjectFactory factory = mocks.CreateMock();
+ IObjectFactory factory = A.Fake();
SideEffectObject target = new SideEffectObject();
+ A.CallTo(() => factory.IsPrototype("foo")).Returns(true);
+ A.CallTo(() => factory.GetObject("foo")).Returns(target);
+ A.CallTo(() => factory.GetType("foo")).Returns(typeof(string));
- using (mocks.Record())
- {
- Expect.Call(factory.IsPrototype("foo")).Return(true);
- Expect.Call(factory.GetObject("foo")).Return(target);
- Expect.Call(factory.GetType("foo")).Return(typeof(string));
- }
-
- using (mocks.Playback())
- {
- PrototypeTargetSource source = new PrototypeTargetSource();
- source.TargetObjectName = "foo";
- source.ObjectFactory = factory;
- Assert.IsTrue(object.ReferenceEquals(source.GetTarget(), target),
- "Initial target source reference not being returned by GetTarget().");
- }
-
+ PrototypeTargetSource source = new PrototypeTargetSource();
+ source.TargetObjectName = "foo";
+ source.ObjectFactory = factory;
+ Assert.IsTrue(object.ReferenceEquals(source.GetTarget(), target),
+ "Initial target source reference not being returned by GetTarget().");
}
[Test]
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs
index 86c677e23..ec3f9e056 100644
--- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheParameterAdviceTests.cs
@@ -18,17 +18,15 @@
#endregion
-#region Imports
-
using System;
using System.Reflection;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Caching;
using Spring.Context;
-#endregion
-
namespace Spring.Aspects.Cache
{
///
@@ -38,7 +36,6 @@ namespace Spring.Aspects.Cache
[TestFixture]
public sealed class CacheParameterAdviceTests
{
- private MockRepository mocks;
private IApplicationContext mockContext;
private CacheParameterAdvice advice;
private ICache cache;
@@ -46,8 +43,7 @@ public sealed class CacheParameterAdviceTests
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- mockContext = (IApplicationContext) mocks.CreateMock(typeof (IApplicationContext));
+ mockContext = A.Fake();
advice = new CacheParameterAdvice();
advice.ApplicationContext = mockContext;
@@ -62,14 +58,11 @@ public void TestSimpleParameterCaching()
object[] args = new object[] {new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian")};
ExpectCacheInstanceRetrieval("cache", cache);
- mocks.ReplayAll();
// parameter value should be added to cache
advice.AfterReturning(null, method, args, null);
Assert.AreEqual(1, cache.Count);
Assert.AreEqual(args[0], cache.Get("Nikola Tesla"));
-
- mocks.VerifyAll();
}
[Test]
@@ -79,14 +72,11 @@ public void TestSimpleWithMethodInfoParameterCaching()
object[] args = new object[] { new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian") };
ExpectCacheInstanceRetrieval("cache", cache);
- mocks.ReplayAll();
// parameter value should be added to cache
advice.AfterReturning(null, method, args, null);
Assert.AreEqual(1, cache.Count);
Assert.AreEqual(args[0], cache.Get("Save-Nikola Tesla"));
-
- mocks.VerifyAll();
}
[Test]
@@ -96,16 +86,13 @@ public void TestMultipleParameterCaching()
object[] args = new object[] { new Inventor("Nikola Tesla", new DateTime(1856, 7, 9), "Serbian") };
ExpectCacheInstanceRetrieval("cache", cache);
- ExpectCacheInstanceRetrieval("cache", cache);
- mocks.ReplayAll();
+ ExpectCacheInstanceRetrieval("cache", cache);
// parameter value should be added to both cache
advice.AfterReturning(null, method, args, null);
Assert.AreEqual(2, cache.Count);
Assert.AreEqual(args[0], cache.Get("Nikola Tesla"));
Assert.AreEqual(args[0], cache.Get("Serbian"));
-
- mocks.VerifyAll();
}
[Test]
@@ -119,18 +106,12 @@ public void TestConditionParameterCaching()
Assert.AreEqual(0, cache.Count);
}
- #region Helper methods
-
private void ExpectCacheInstanceRetrieval(string cacheName, ICache cacheToReturn)
{
- Expect.Call(mockContext.GetObject(cacheName)).Return(cacheToReturn);
+ A.CallTo(() => mockContext.GetObject(cacheName)).Returns(cacheToReturn).Once();
}
-
- #endregion
}
- #region Inner Class : CacheParameterTarget
-
public interface ICacheParameterTarget
{
void Save(Inventor inventor);
@@ -163,6 +144,4 @@ public void Save([CacheParameter("cache", "Name", Condition = "Nationality == 'F
{
}
}
-
- #endregion
}
\ No newline at end of file
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs
index b3060b652..8aac6ea1e 100644
--- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/CacheResultAdviceTests.cs
@@ -18,20 +18,18 @@
#endregion
-#region Imports
-
using System.Collections;
using System.IO;
using System.Reflection;
using System.Runtime.Serialization.Formatters.Binary;
using AopAlliance.Intercept;
-using Rhino.Mocks;
+
+using FakeItEasy;
+
using NUnit.Framework;
using Spring.Caching;
using Spring.Context;
-#endregion
-
namespace Spring.Aspects.Cache
{
///
@@ -50,14 +48,12 @@ public sealed class CacheResultAdviceTests
private ICache itemCache;
private ICache binaryFormatterCache;
private CacheResultTarget cacheResultTarget = new CacheResultTarget();
- private MockRepository mocks;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- mockInvocation = mocks.CreateMock();
- mockContext = mocks.CreateMock();
+ mockInvocation = A.Fake();
+ mockContext = A.Fake();
advice = new CacheResultAdvice();
advice.ApplicationContext = mockContext;
@@ -77,24 +73,16 @@ public void CacheResultOfMethodThatReturnsNull()
MethodInfo method = new VoidMethod(cacheResultTarget.ReturnsNothing).Method;
object expectedReturnValue = null;
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, null);
- ExpectCacheInstanceRetrieval("results", resultCache);
- ExpectCallToProceed(expectedReturnValue);
- }
-
- using (mocks.Playback())
- {
- // check that the null retVal is cached as well - it might be
- // the result of an expensive webservice/database call etc.
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(1, resultCache.Count);
- }
-
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, null);
+ ExpectCacheInstanceRetrieval("results", resultCache);
+ ExpectCallToProceed(expectedReturnValue);
+ // check that the null retVal is cached as well - it might be
+ // the result of an expensive webservice/database call etc.
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(1, resultCache.Count);
}
[Test]
@@ -103,26 +91,20 @@ public void CacheResultOfMethodThatReturnsNullWithSerializingCache()
MethodInfo method = new VoidMethod(cacheResultTarget.ReturnsNothing).Method;
object expectedReturnValue = null;
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, null);
- ExpectCacheInstanceRetrieval("results", binaryFormatterCache);
- ExpectCallToProceed(expectedReturnValue);
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, null);
+ ExpectCacheInstanceRetrieval("results", binaryFormatterCache);
+ ExpectCallToProceed(expectedReturnValue);
- using (mocks.Playback())
- {
- // check that the null retVal is cached as well - it might be
- // the result of an expensive webservice/database call etc.
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(1, binaryFormatterCache.Count);
-
- // cached value should be returned
- object cachedValue = advice.Invoke(mockInvocation);
- Assert.IsNull(cachedValue, "Should recognize cached value as null-value marker.");
- }
+ // check that the null retVal is cached as well - it might be
+ // the result of an expensive webservice/database call etc.
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(1, binaryFormatterCache.Count);
+
+ // cached value should be returned
+ object cachedValue = advice.Invoke(mockInvocation);
+ Assert.IsNull(cachedValue, "Should recognize cached value as null-value marker.");
}
[Test]
@@ -131,96 +113,76 @@ public void CacheResultOfMethodThatReturnsObject()
MethodInfo method = new IntMethod(cacheResultTarget.ReturnsScalar).Method;
object expectedReturnValue = CacheResultTarget.Scalar;
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, null);
- ExpectCacheInstanceRetrieval("results", resultCache);
- ExpectCallToProceed(expectedReturnValue);
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, null);
+ ExpectCacheInstanceRetrieval("results", resultCache);
+ ExpectCallToProceed(expectedReturnValue);
- using (mocks.Playback())
- {
- // return value should be added to cache
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(1, resultCache.Count);
-
- // cached value should be returned
- object cachedValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, cachedValue);
- Assert.AreEqual(1, resultCache.Count);
- Assert.AreSame(returnValue, cachedValue);
- }
+ // return value should be added to cache
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(1, resultCache.Count);
+
+ // cached value should be returned
+ object cachedValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, cachedValue);
+ Assert.AreEqual(1, resultCache.Count);
+ Assert.AreSame(returnValue, cachedValue);
}
[Test]
public void CacheResultOfMethodThatReturnsCollection()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.ReturnsCollection).Method;
- object expectedReturnValue = new object[] { "one", "two", "three" };
+ object expectedReturnValue = new object[] {"one", "two", "three"};
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
- ExpectCacheInstanceRetrieval("results", resultCache);
- ExpectCallToProceed(new object[] { "one", "two", "three" });
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+ ExpectCacheInstanceRetrieval("results", resultCache);
+ ExpectCallToProceed(new object[] {"one", "two", "three"});
- using (mocks.Playback())
- {
- // return value should be added to cache
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(1, resultCache.Count);
-
- // cached value should be returned
- object cachedValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, cachedValue);
- Assert.AreNotSame(expectedReturnValue, cachedValue);
- Assert.AreEqual(expectedReturnValue, resultCache.Get(5));
- Assert.AreEqual(1, resultCache.Count);
- Assert.AreSame(returnValue, cachedValue);
- Assert.AreSame(cachedValue, resultCache.Get(5));
- }
+ // return value should be added to cache
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(1, resultCache.Count);
+
+ // cached value should be returned
+ object cachedValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, cachedValue);
+ Assert.AreNotSame(expectedReturnValue, cachedValue);
+ Assert.AreEqual(expectedReturnValue, resultCache.Get(5));
+ Assert.AreEqual(1, resultCache.Count);
+ Assert.AreSame(returnValue, cachedValue);
+ Assert.AreSame(cachedValue, resultCache.Get(5));
}
[Test]
public void CacheResultAndItemsOfMethodThatReturnsCollection()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.ReturnsCollectionAndItems).Method;
- object expectedReturnValue = new object[] { "one", "two", "three" };
+ object expectedReturnValue = new object[] {"one", "two", "three"};
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
- ExpectCacheInstanceRetrieval("results", resultCache);
- ExpectCallToProceed(new object[] { "one", "two", "three" });
- ExpectCacheInstanceRetrieval("items", itemCache);
-
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+ ExpectCacheInstanceRetrieval("results", resultCache);
+ ExpectCallToProceed(new object[] {"one", "two", "three"});
+ ExpectCacheInstanceRetrieval("items", itemCache);
- using (mocks.Playback())
- {
- // return value should be added to result cache and each item to item cache
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(1, resultCache.Count);
- Assert.AreEqual(3, itemCache.Count);
-
- // cached value should be returned
- object cachedValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, cachedValue);
- Assert.AreNotSame(expectedReturnValue, cachedValue);
- Assert.AreEqual(expectedReturnValue, resultCache.Get(5));
- Assert.AreEqual(1, resultCache.Count);
- Assert.AreEqual(3, itemCache.Count);
- Assert.AreSame(returnValue, cachedValue);
- Assert.AreSame(cachedValue, resultCache.Get(5));
+ // return value should be added to result cache and each item to item cache
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(1, resultCache.Count);
+ Assert.AreEqual(3, itemCache.Count);
- }
+ // cached value should be returned
+ object cachedValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, cachedValue);
+ Assert.AreNotSame(expectedReturnValue, cachedValue);
+ Assert.AreEqual(expectedReturnValue, resultCache.Get(5));
+ Assert.AreEqual(1, resultCache.Count);
+ Assert.AreEqual(3, itemCache.Count);
+ Assert.AreSame(returnValue, cachedValue);
+ Assert.AreSame(cachedValue, resultCache.Get(5));
}
[Test]
@@ -229,74 +191,51 @@ public void CacheOnlyItemsOfMethodThatReturnsCollection()
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.ReturnsItems).Method;
object expectedReturnValue = new object[] { "one", "two", "three" };
- mocks.Record();
-
ExpectAttributeRetrieval(method);
ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
ExpectCallToProceed(new object[] { "one", "two", "three" });
ExpectCacheInstanceRetrieval("items", itemCache);
- mocks.ReplayAll();
-
// return value should be added to result cache and each item to item cache
object returnValue = advice.Invoke(mockInvocation);
Assert.AreEqual(expectedReturnValue, returnValue);
Assert.AreEqual(0, resultCache.Count);
Assert.AreEqual(3, itemCache.Count);
- mocks.Verify(mockInvocation);
-
- mocks.BackToRecord(mockInvocation);
-
ExpectAttributeRetrieval(method);
ExpectCallToProceed(new object[] { "one", "two", "three" });
ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
- mocks.Replay(mockInvocation);
-
object newReturnValue = advice.Invoke(mockInvocation);
Assert.AreEqual(expectedReturnValue, newReturnValue);
Assert.AreEqual(0, resultCache.Count);
Assert.AreEqual(3, itemCache.Count);
Assert.AreEqual("two", itemCache.Get("two"));
Assert.AreNotSame(returnValue, newReturnValue);
-
- mocks.VerifyAll();
}
-
[Test]
public void CacheOnlyItemsOfMethodThatReturnsCollectionWithinTwoDifferentCaches()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.MultipleCacheResultItems).Method;
object expectedReturnValue = new object[] { "one", "two", "three" };
- mocks.Record();
-
ExpectAttributeRetrieval(method);
ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
ExpectCallToProceed(new object[] { "one", "two", "three" });
ExpectCacheInstanceRetrieval("items", itemCache);
- mocks.ReplayAll();
-
// return value should be added to result cache and each item to item cache
object returnValue = advice.Invoke(mockInvocation);
Assert.AreEqual(expectedReturnValue, returnValue);
Assert.AreEqual(0, resultCache.Count);
Assert.AreEqual(6, itemCache.Count);
- mocks.Verify(mockInvocation);
-
- mocks.BackToRecord(mockInvocation);
-
// and again, but without Proceed() and item cache access...
ExpectAttributeRetrieval(method);
ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
ExpectCallToProceed(new object[] { "one", "two", "three" });
- mocks.Replay(mockInvocation);
-
// new return value should be returned
object newReturnValue = advice.Invoke(mockInvocation);
Assert.AreEqual(expectedReturnValue, newReturnValue);
@@ -305,57 +244,42 @@ public void CacheOnlyItemsOfMethodThatReturnsCollectionWithinTwoDifferentCaches(
Assert.AreEqual("two", itemCache.Get("two"));
Assert.AreEqual("two", itemCache.Get("TWO"));
Assert.AreNotSame(returnValue, newReturnValue);
-
- mocks.VerifyAll();
}
[Test]
public void CacheOnlyItemsOfMethodThatReturnsCollectionOnCondition()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.CacheResultItemsWithCondition).Method;
- object expectedReturnValue = new object[] { "one", "two", "three" };
-
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
- ExpectCallToProceed(new object[] { "one", "two", "three" });
- ExpectCacheInstanceRetrieval("items", itemCache);
- }
+ object expectedReturnValue = new object[] {"one", "two", "three"};
- using (mocks.Playback())
- {
- // return value should be added to result cache and each item to item cache
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(2, itemCache.Count);
- Assert.AreEqual("two", itemCache.Get("two"));
- Assert.AreEqual("three", itemCache.Get("three"));
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+ ExpectCallToProceed(new object[] {"one", "two", "three"});
+ ExpectCacheInstanceRetrieval("items", itemCache);
+ // return value should be added to result cache and each item to item cache
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(2, itemCache.Count);
+ Assert.AreEqual("two", itemCache.Get("two"));
+ Assert.AreEqual("three", itemCache.Get("three"));
}
[Test]
public void CacheResultOfMethodThatReturnsCollectionOnCondition()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.CacheResultWithCondition).Method;
- object expectedReturnValue = new object[] { };
+ object expectedReturnValue = new object[] {};
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
- ExpectCacheInstanceRetrieval("results", resultCache);
- ExpectCallToProceed(new object[] { });
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+ ExpectCacheInstanceRetrieval("results", resultCache);
+ ExpectCallToProceed(new object[] {});
- using (mocks.Playback())
- {
- // return value should not be added to cache
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(0, resultCache.Count);
- }
+ // return value should not be added to cache
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(0, resultCache.Count);
}
[Test]
@@ -365,16 +289,12 @@ public void AcceptsEnumerableOnlyReturn()
object[] args = new object[] { "one", "two", "three" };
EnumerableOnlyResult expectedReturnValue = new EnumerableOnlyResult(args);
- mocks.Record();
-
ExpectAttributeRetrieval(method);
ExpectCacheKeyGeneration(method, 5, expectedReturnValue.InnerArray);
ExpectCacheInstanceRetrieval("results", resultCache);
ExpectCallToProceed(expectedReturnValue);
ExpectCacheInstanceRetrieval("items", itemCache);
- mocks.ReplayAll();
-
// return value should be added to result cache and each item to item cache
object returnValue = advice.Invoke(mockInvocation);
Assert.AreEqual(1, resultCache.Count);
@@ -382,16 +302,10 @@ public void AcceptsEnumerableOnlyReturn()
Assert.AreSame(expectedReturnValue, returnValue);
Assert.AreSame(expectedReturnValue, resultCache.Get(5));
- mocks.Verify(mockInvocation);
-
- mocks.BackToRecord(mockInvocation);
-
// and again, but without Proceed() and item cache access...
ExpectAttributeRetrieval(method);
ExpectCacheKeyGeneration(method, 5, IGNORED_ARGS);
- mocks.Replay(mockInvocation);
-
// cached value should be returned, cache remains unchanged
object cachedValue = advice.Invoke(mockInvocation);
Assert.AreSame(expectedReturnValue, cachedValue);
@@ -399,42 +313,30 @@ public void AcceptsEnumerableOnlyReturn()
Assert.AreSame(expectedReturnValue, resultCache.Get(5));
Assert.AreEqual(1, resultCache.Count);
Assert.AreEqual(3, itemCache.Count);
-
- mocks.VerifyAll();
}
-
+
[Test]
public void CacheResultOfMethodThatReturnsCollectionContainingNullItems()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.ReturnsEnumerableOnlyAndItems).Method;
object expectedReturnValue = new object[] { null, "two", null };
- mocks.Record();
-
ExpectAttributeRetrieval(method);
ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
ExpectCacheInstanceRetrieval("results", resultCache);
ExpectCallToProceed(expectedReturnValue);
ExpectCacheInstanceRetrieval("items", itemCache);
- mocks.ReplayAll();
-
// return value should be added to result cache and each item to item cache
object returnValue = advice.Invoke(mockInvocation);
Assert.AreSame(expectedReturnValue, returnValue);
Assert.AreEqual(1, resultCache.Count);
Assert.AreEqual(2, itemCache.Count); // 2 null items result into 1 cached item
- mocks.Verify(mockInvocation);
-
- mocks.BackToRecord(mockInvocation);
-
// and again, but without Proceed() and item cache access...
ExpectAttributeRetrieval(method);
ExpectCacheKeyGeneration(method, 5, IGNORED_ARGS);
- mocks.Replay(mockInvocation);
-
// cached value should be returned
object cachedValue = advice.Invoke(mockInvocation);
Assert.AreSame(expectedReturnValue, cachedValue);
@@ -442,95 +344,74 @@ public void CacheResultOfMethodThatReturnsCollectionContainingNullItems()
Assert.AreSame(expectedReturnValue, resultCache.Get(5));
Assert.AreEqual(1, resultCache.Count);
Assert.AreEqual(2, itemCache.Count);
-
- mocks.VerifyAll();
}
[Test]
public void CacheResultWithMethodInfo()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.CacheResultWithMethodInfo).Method;
- object expectedReturnValue = new object[] { "one", "two", "three" };
+ object expectedReturnValue = new object[] {"one", "two", "three"};
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
- ExpectCacheInstanceRetrieval("results", resultCache);
- ExpectCallToProceed(new object[] { "one", "two", "three" });
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+ ExpectCacheInstanceRetrieval("results", resultCache);
+ ExpectCallToProceed(new object[] {"one", "two", "three"});
- using (mocks.Playback())
- {
- // return value should be added to cache
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(1, resultCache.Count);
- Assert.AreEqual(returnValue, resultCache.Get("CacheResultWithMethodInfo-5"));
- }
+ // return value should be added to cache
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(1, resultCache.Count);
+ Assert.AreEqual(returnValue, resultCache.Get("CacheResultWithMethodInfo-5"));
}
[Test]
public void CacheResultItemsWithMethodInfo()
{
MethodInfo method = new EnumerableResultMethod(cacheResultTarget.CacheResultItemsWithMethodInfo).Method;
- object expectedReturnValue = new object[] { "one", "two", "three" };
-
- using (mocks.Record())
- {
- ExpectAttributeRetrieval(method);
- ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
- ExpectCallToProceed(new object[] { "one", "two", "three" });
- ExpectCacheInstanceRetrieval("items", itemCache);
- }
+ object expectedReturnValue = new object[] {"one", "two", "three"};
- using (mocks.Playback())
- {
- // return value should be added to result cache and each item to item cache
- object returnValue = advice.Invoke(mockInvocation);
- Assert.AreEqual(expectedReturnValue, returnValue);
- Assert.AreEqual(0, resultCache.Count);
- Assert.AreEqual(3, itemCache.Count);
- Assert.AreEqual("two", itemCache.Get("CacheResultItemsWithMethodInfo-two"));
- }
+ ExpectAttributeRetrieval(method);
+ ExpectCacheKeyGeneration(method, 5, expectedReturnValue);
+ ExpectCallToProceed(new object[] {"one", "two", "three"});
+ ExpectCacheInstanceRetrieval("items", itemCache);
+ // return value should be added to result cache and each item to item cache
+ object returnValue = advice.Invoke(mockInvocation);
+ Assert.AreEqual(expectedReturnValue, returnValue);
+ Assert.AreEqual(0, resultCache.Count);
+ Assert.AreEqual(3, itemCache.Count);
+ Assert.AreEqual("two", itemCache.Get("CacheResultItemsWithMethodInfo-two"));
}
-
- #region Helper methods
-
private void ExpectAttributeRetrieval(MethodInfo method)
{
- Expect.Call(mockInvocation.Method).Return(method).Repeat.AtLeastOnce();
+ A.CallTo(() => mockInvocation.Method).Returns(method);
}
private void ExpectCacheKeyGeneration(MethodInfo method, params object[] arguments)
{
- Expect.Call(mockInvocation.Arguments).Return(arguments).Repeat.AtLeastOnce();
+ A.CallTo(() => mockInvocation.Arguments).Returns(arguments);
}
private void ExpectCacheInstanceRetrieval(string cacheName, ICache cache)
{
- Expect.Call(mockContext.GetObject(cacheName)).Return(cache).Repeat.AtLeastOnce();
+ A.CallTo(() => mockContext.GetObject(cacheName)).Returns(cache);
}
private void ExpectCacheInstanceRetrieval(string cacheName, ICache cache, int repeatTimes)
{
- Expect.Call(mockContext.GetObject(cacheName)).Return(cache).Repeat.Times(repeatTimes);
+ A.CallTo(() => mockContext.GetObject(cacheName)).Returns(cache).NumberOfTimes(repeatTimes);
}
private void ExpectCallToProceed(object expectedReturnValue, int repeatTimes)
{
- Expect.Call(mockInvocation.Proceed()).Return(expectedReturnValue).Repeat.Times(repeatTimes);
+ A.CallTo(() => mockInvocation.Proceed()).Returns(expectedReturnValue).NumberOfTimes(repeatTimes);
}
private void ExpectCallToProceed(object expectedReturnValue)
{
- Expect.Call(mockInvocation.Proceed()).Return(expectedReturnValue);
+ A.CallTo(() => mockInvocation.Proceed()).Returns(expectedReturnValue);
}
-
- #endregion
-
}
#region Inner Class : CacheResultTarget
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs
index 1519157c9..98b26327d 100644
--- a/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Cache/InvalidateCacheAdviceTests.cs
@@ -18,18 +18,15 @@
#endregion
-#region Imports
-
using System.Reflection;
-using NUnit.Framework;
-using Rhino.Mocks;
+using FakeItEasy;
+
+using NUnit.Framework;
using Spring.Caching;
using Spring.Context;
-#endregion
-
namespace Spring.Aspects.Cache
{
///
@@ -42,13 +39,11 @@ public sealed class InvalidateCacheAdviceTests
private IApplicationContext mockContext;
private InvalidateCacheAdvice advice;
private ICache cache;
- private MockRepository mocks;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- mockContext = (IApplicationContext) mocks.CreateMock(typeof (IApplicationContext));
+ mockContext = A.Fake();
advice = new InvalidateCacheAdvice();
advice.ApplicationContext = mockContext;
@@ -66,7 +61,6 @@ public void TestSingleKeyInvalidation()
object[] args = new object[] { 2 };
ExpectCacheInstanceRetrieval("cache", cache);
- mocks.ReplayAll();
Assert.AreEqual(3, cache.Count);
@@ -74,8 +68,6 @@ public void TestSingleKeyInvalidation()
advice.AfterReturning(null, method, args, null);
Assert.AreEqual(2, cache.Count);
Assert.IsNull(cache.Get(2));
-
- mocks.VerifyAll();
}
[Test]
@@ -85,7 +77,6 @@ public void TestMultiKeyInvalidation()
object[] args = new object[] { 2 };
ExpectCacheInstanceRetrieval("cache", cache);
- mocks.ReplayAll();
Assert.AreEqual(3, cache.Count);
@@ -93,8 +84,6 @@ public void TestMultiKeyInvalidation()
advice.AfterReturning(null, method, args, null);
Assert.AreEqual(1, cache.Count);
Assert.AreEqual("two", cache.Get(2));
-
- mocks.VerifyAll();
}
[Test]
@@ -103,15 +92,12 @@ public void TestWholeCacheInvalidation()
MethodInfo method = typeof(InvalidateCacheTarget).GetMethod("InvalidateAll");
ExpectCacheInstanceRetrieval("cache", cache);
- mocks.ReplayAll();
Assert.AreEqual(3, cache.Count);
// all items should be removed from cache
advice.AfterReturning(null, method, null, null);
Assert.AreEqual(0, cache.Count);
-
- mocks.VerifyAll();
}
[Test]
@@ -122,7 +108,6 @@ public void TestMultipleCachesInvalidation()
ExpectCacheInstanceRetrieval("cache", cache);
ExpectCacheInstanceRetrieval("cache", cache);
- mocks.ReplayAll();
Assert.AreEqual(3, cache.Count);
@@ -130,8 +115,6 @@ public void TestMultipleCachesInvalidation()
// all items except item "two" should be removed from cache
advice.AfterReturning(null, method, args, null);
Assert.AreEqual(0, cache.Count);
-
- mocks.VerifyAll();
}
[Test]
@@ -148,14 +131,10 @@ public void TestConditionInvalidation()
Assert.AreEqual("three", cache.Get(3));
}
- #region Helper methods
-
private void ExpectCacheInstanceRetrieval(string cacheName, ICache cacheToReturn)
{
- Expect.Call(mockContext.GetObject(cacheName)).Return(cacheToReturn);
+ A.CallTo(() => mockContext.GetObject(cacheName)).Returns(cacheToReturn).Once();
}
-
- #endregion
}
#region Inner Class : InvalidateCacheTarget
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs
index 716e0c7cc..853c71265 100644
--- a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs
@@ -18,19 +18,17 @@
#endregion
-#region Imports
-
using System;
using System.Reflection;
using AopAlliance.Intercept;
using Common.Logging;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Aop.Framework;
-#endregion
-
namespace Spring.Aspects.Logging
{
///
@@ -51,12 +49,9 @@ public void DoSomething()
{ }
}
- private MockRepository mocks;
-
[SetUp]
public void Setup()
{
- mocks = new MockRepository();
}
[Test]
@@ -64,101 +59,76 @@ public void IntegrationTest()
{
ProxyFactory pf = new ProxyFactory(new TestTarget());
- ILog log = (ILog)mocks.CreateMock(typeof(ILog));
+ ILog log = A.Fake();
SimpleLoggingAdvice loggingAdvice = new SimpleLoggingAdvice(log);
pf.AddAdvice(loggingAdvice);
- Expect.Call(log.IsTraceEnabled).Return(true).Repeat.Any();
- log.Trace("Entering DoSomething");
- log.Trace("Exiting DoSomething");
-
- mocks.ReplayAll();
+ A.CallTo(() => log.IsTraceEnabled).Returns(true);
object proxy = pf.GetProxy();
ITestTarget ptt = (ITestTarget)proxy;
ptt.DoSomething();
- mocks.VerifyAll();
+ A.CallTo(() => log.Trace("Entering DoSomething")).MustHaveHappened();
+ A.CallTo(() => log.Trace("Exiting DoSomething")).MustHaveHappened();
}
[Test]
public void SunnyDayLoggingCorrectly()
{
- ILog log = (ILog)mocks.CreateMock(typeof(ILog));
- IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+ ILog log = A.Fake();
+ IMethodInvocation methodInvocation = A.Fake();
MethodInfo mi = typeof(string).GetMethod("ToString", Type.EmptyTypes);
//two additional calls the method are to retrieve the method name on entry/exit...
- Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
-
- Expect.Call(log.IsTraceEnabled).Return(true).Repeat.Any();
- log.Trace("Entering ToString");
-
- Expect.Call(methodInvocation.Proceed()).Return(null);
-
- log.Trace("Exiting ToString");
-
- mocks.ReplayAll();
+ A.CallTo(() => methodInvocation.Method).Returns(mi);
+ A.CallTo(() => log.IsTraceEnabled).Returns(true);
+ A.CallTo(() => methodInvocation.Proceed()).Returns(null);
TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
loggingAdvice.CallInvokeUnderLog(methodInvocation, log);
- mocks.VerifyAll();
-
+ A.CallTo(() => log.Trace("Entering ToString")).MustHaveHappened();
+ A.CallTo(() => log.Trace("Exiting ToString")).MustHaveHappened();
}
[Test]
public void SunnyDayLoggingCorrectlyDebugLevel()
{
- ILog log = (ILog)mocks.CreateMock(typeof(ILog));
- IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+ ILog log = A.Fake();
+ IMethodInvocation methodInvocation = A.Fake();
MethodInfo mi = typeof(string).GetMethod("ToString", Type.EmptyTypes);
//two additional calls the method are to retrieve the method name on entry/exit...
- Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
-
- Expect.Call(log.IsTraceEnabled).Return(false).Repeat.Any();
- Expect.Call(log.IsDebugEnabled).Return(true).Repeat.Any();
- log.Debug("Entering ToString");
-
- Expect.Call(methodInvocation.Proceed()).Return(null);
+ A.CallTo(() => methodInvocation.Method).Returns(mi);
- log.Debug("Exiting ToString");
+ A.CallTo(() => log.IsTraceEnabled).Returns(false);
+ A.CallTo(() => log.IsDebugEnabled).Returns(true);
- mocks.ReplayAll();
+ A.CallTo(() => methodInvocation.Proceed()).Returns(null);
TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
loggingAdvice.LogLevel = LogLevel.Debug;
Assert.IsTrue(loggingAdvice.CallIsInterceptorEnabled(methodInvocation, log));
loggingAdvice.CallInvokeUnderLog(methodInvocation, log);
- mocks.VerifyAll();
-
+ A.CallTo(() => log.Debug("Entering ToString")).MustHaveHappened();
+ A.CallTo(() => log.Debug("Exiting ToString")).MustHaveHappened();
}
-
[Test]
public void ExceptionPathStillLogsCorrectly()
{
- ILog log = (ILog)mocks.CreateMock(typeof(ILog));
- IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+ ILog log = A.Fake();
+ IMethodInvocation methodInvocation = A.Fake();
MethodInfo mi = typeof(string).GetMethod("ToString", Type.EmptyTypes);
//two additional calls the method are to retrieve the method name on entry/exit...
- Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
-
- Expect.Call(log.IsTraceEnabled).Return(true).Repeat.Any();
- log.Trace("Entering...");
-
- LastCall.On(log).IgnoreArguments();
+ A.CallTo(() => methodInvocation.Method).Returns(mi);
+ A.CallTo(() => log.IsTraceEnabled).Returns(true);
Exception e = new ArgumentException("bad value");
- Expect.Call(methodInvocation.Proceed()).Throw(e);
-
- log.Trace("Exception...", e);
- LastCall.On(log).IgnoreArguments();
-
- mocks.ReplayAll();
+ A.CallTo(() => methodInvocation.Proceed()).Throws(e);
TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
try
@@ -168,39 +138,27 @@ public void ExceptionPathStillLogsCorrectly()
}
catch (ArgumentException)
{
-
}
- mocks.VerifyAll();
-
+ A.CallTo(() => log.Trace("Entering ToString")).MustHaveHappened();
+ A.CallTo(() => log.Trace("Exception thrown in ToString, ToString", e)).MustHaveHappened();
}
-
[Test]
public void SunnyDayLoggingAllOptionalInformationCorrectly()
{
- ILog log = (ILog)mocks.CreateMock(typeof(ILog));
- IMethodInvocation methodInvocation = (IMethodInvocation)mocks.CreateMock(typeof(IMethodInvocation));
+ ILog log = A.Fake();
+ IMethodInvocation methodInvocation = A.Fake();
MethodInfo mi = typeof(Dog).GetMethod("Bark");
//two additional calls the method are to retrieve the method name on entry/exit...
- Expect.Call(methodInvocation.Method).Return(mi).Repeat.Any();
+ A.CallTo(() => methodInvocation.Method).Returns(mi);
int[] luckyNumbers = new int[] { 1, 2, 3 };
object[] args = new object[] { "hello", luckyNumbers };
-
- Expect.Call(methodInvocation.Arguments).Return(args);
-
- Expect.Call(log.IsTraceEnabled).Return(true).Repeat.Any();
- log.Trace("Entering...");
- LastCall.IgnoreArguments();
-
- Expect.Call(methodInvocation.Proceed()).Return(4);
-
- log.Trace("Exiting...");
- LastCall.IgnoreArguments();
-
- mocks.ReplayAll();
+ A.CallTo(() => methodInvocation.Arguments).Returns(args);
+ A.CallTo(() => log.IsTraceEnabled).Returns(true);
+ A.CallTo(() => methodInvocation.Proceed()).Returns(4);
TestableSimpleLoggingAdvice loggingAdvice = new TestableSimpleLoggingAdvice(true);
loggingAdvice.LogExecutionTime = true;
@@ -209,7 +167,8 @@ public void SunnyDayLoggingAllOptionalInformationCorrectly()
loggingAdvice.CallInvokeUnderLog(methodInvocation, log);
- mocks.VerifyAll();
+ A.CallTo(() => log.Trace(A.That.StartsWith("Entering Bark"))).MustHaveHappened();
+ A.CallTo(() => log.Trace(A.That.StartsWith("Exiting Bark"))).MustHaveHappened();
}
}
diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs
index 638fc40c8..94a025c9a 100644
--- a/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs
+++ b/test/Spring/Spring.Aop.Tests/Aspects/Validation/ParameterValidationAdviceTests.cs
@@ -18,18 +18,16 @@
#endregion
-#region Imports
-
using System;
using System.Reflection;
-using Rhino.Mocks;
+
+using FakeItEasy;
+
using NUnit.Framework;
using Spring.Context;
using Spring.Validation;
using Spring.Validation.Actions;
-#endregion
-
namespace Spring.Aspects.Validation
{
///
@@ -42,13 +40,11 @@ public sealed class ParameterValidationAdviceTests
private IApplicationContext mockContext;
private ParameterValidationAdvice advice;
private RequiredValidator requiredValidator;
- private MockRepository mocks;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- mockContext = mocks.CreateMock();
+ mockContext = A.Fake();
advice = new ParameterValidationAdvice();
advice.ApplicationContext = mockContext;
@@ -65,18 +61,11 @@ public void TestValidArgument()
ValidationTarget target = new ValidationTarget();
object[] args = new object[] {inventor};
- using (mocks.Record())
- {
- ExpectValidatorRetrieval("required", requiredValidator);
- }
-
- using (mocks.Playback())
- {
- advice.Before(method, args, target);
- method.Invoke(target, args);
- Assert.AreEqual("NIKOLA TESLA", inventor.Name);
- }
+ ExpectValidatorRetrieval("required", requiredValidator);
+ advice.Before(method, args, target);
+ method.Invoke(target, args);
+ Assert.AreEqual("NIKOLA TESLA", inventor.Name);
}
[Test]
@@ -84,25 +73,15 @@ public void TestInvalidArgument()
{
MethodInfo method = typeof(ValidationTarget).GetMethod("Save");
- using (mocks.Record())
- {
- ExpectValidatorRetrieval("required", requiredValidator);
- }
+ ExpectValidatorRetrieval("required", requiredValidator);
- using (mocks.Playback())
- {
- Assert.Throws(() => advice.Before(method, new object[] { null }, new ValidationTarget()));
- }
+ Assert.Throws(() => advice.Before(method, new object[] {null}, new ValidationTarget()));
}
- #region Helper methods
-
private void ExpectValidatorRetrieval(string validatorName, IValidator validator)
{
- Expect.Call(mockContext.GetObject(validatorName)).Return(validator);
+ A.CallTo(() => mockContext.GetObject(validatorName)).Returns(validator).Once();
}
-
- #endregion
}
#region Inner Class : ValidationTarget
diff --git a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj
index 2dd4c4a7a..18f5893fa 100644
--- a/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj
+++ b/test/Spring/Spring.Aop.Tests/Spring.Aop.Tests.2010.csproj
@@ -7,10 +7,11 @@
+
- /// Tests
/// Erich Eichinger
@@ -56,15 +54,13 @@ protected override void DoInsert(object key, object value, TimeSpan timeToLive)
TimeSpan expectedPerItemTTL;
TimeSpan expectedPerCacheTTL;
- MockRepository mocks;
ExposingAbstractCache cache;
- string[] KEYS = new string[] { "keyA", "keyB" };
+ string[] KEYS = new string[] {"keyA", "keyB"};
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- cache = (ExposingAbstractCache)mocks.PartialMock(typeof(ExposingAbstractCache));
+ cache = A.Fake(options => options.CallsBaseMethods());
expectedPerItemTTL = new TimeSpan(0, 0, 10);
expectedPerCacheTTL = new TimeSpan(0, 0, 20);
@@ -75,7 +71,7 @@ public void SetUp()
[Test]
public void TestDefaults()
{
- ExposingAbstractCache localCache = (ExposingAbstractCache)mocks.PartialMock(typeof(ExposingAbstractCache));
+ ExposingAbstractCache localCache = A.Fake();
Assert.AreEqual(TimeSpan.Zero, localCache.TimeToLive);
Assert.AreEqual(false, localCache.EnforceTimeToLive);
}
@@ -85,96 +81,78 @@ public void AppliesPerCacheDefaultsIfNoPerItemValuesGiven()
{
// set expectations
cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
- mocks.ReplayAll();
- // verify
cache.Insert("key", "value", expectedPerCacheTTL);
- mocks.VerifyAll();
+ A.CallTo(() => cache.DoInsertExposed("key", "value", expectedPerCacheTTL)).MustHaveHappened();
}
[Test]
public void AppliesPerCacheDefaultsIfTTLLessThanZero()
{
- // set expectations
- cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
- cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
- cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
- cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
- mocks.ReplayAll();
- // verify
cache.Insert("key", "value", new TimeSpan(Timeout.Infinite));
+ A.CallTo(() => cache.DoInsertExposed("key", "value", expectedPerCacheTTL)).MustHaveHappened();
+
cache.Insert("key", "value", new TimeSpan(-1));
- cache.Insert("key", "value", new TimeSpan(Int64.MinValue));
+ A.CallTo(() => cache.DoInsertExposed("key", "value", expectedPerCacheTTL)).MustHaveHappened();
+
+ cache.Insert("key", "value", new TimeSpan(long.MinValue));
+ A.CallTo(() => cache.DoInsertExposed("key", "value", expectedPerCacheTTL)).MustHaveHappened();
+
cache.Insert("key", "value", TimeSpan.MinValue);
- mocks.VerifyAll();
+ A.CallTo(() => cache.DoInsertExposed("key", "value", expectedPerCacheTTL)).MustHaveHappened();
}
[Test]
public void AppliesPerCacheDefaultsIfEnfored()
{
- // set expectations
- cache.DoInsertExposed("key", "value", expectedPerCacheTTL);
- mocks.ReplayAll();
- // verify
cache.EnforceTimeToLive = true;
cache.Insert("key", "value", expectedPerItemTTL);
- mocks.VerifyAll();
+
+ A.CallTo(() => cache.DoInsertExposed("key", "value", expectedPerCacheTTL)).MustHaveHappened();
}
[Test]
public void AppliesZeroTTLIfTTLIsZero()
{
- // set expectations
- cache.DoInsertExposed("key", "value", TimeSpan.Zero);
- mocks.ReplayAll();
- // verify
cache.Insert("key", "value", TimeSpan.Zero);
- mocks.VerifyAll();
+
+ A.CallTo(() => cache.DoInsertExposed("key", "value", TimeSpan.Zero)).MustHaveHappened();
}
[Test]
public void AppliesPerItemTTLIfTTLGreaterZero()
{
- // set expectations
- cache.DoInsertExposed("key", "value", expectedPerItemTTL);
- mocks.ReplayAll();
- // verify
cache.Insert("key", "value", expectedPerItemTTL);
- mocks.VerifyAll();
+
+ A.CallTo(() => cache.DoInsertExposed("key", "value", expectedPerItemTTL)).MustHaveHappened();
}
[Test]
public void RemoveAllCausesCallsToRemove()
{
- // set expectations
- cache.Remove(KEYS[0]);
- cache.Remove(KEYS[1]);
- mocks.ReplayAll();
- // verify
cache.RemoveAll(KEYS);
- mocks.VerifyAll();
+
+ A.CallTo(() => cache.Remove(KEYS[0])).MustHaveHappened();
+ A.CallTo(() => cache.Remove(KEYS[1])).MustHaveHappened();
}
[Test]
public void ClearCausesCallToRemoveAllUsingKeys()
{
- // set expectations
- Expect.Call(cache.Keys).Return(KEYS);
- cache.RemoveAll(KEYS);
- mocks.ReplayAll();
- // verify
+ A.CallTo(() => cache.Keys).Returns(this.KEYS);
+
cache.Clear();
- mocks.VerifyAll();
+
+ A.CallTo(() => cache.Keys).MustHaveHappened();
+ A.CallTo(() => cache.RemoveAll(KEYS)).MustHaveHappened();
}
[Test]
public void CountUsingKeys()
{
// set expectations
- Expect.Call(cache.Keys).Return(this.KEYS);
- mocks.ReplayAll();
- // verify
- Assert.AreEqual( this.KEYS.Length, cache.Count );
- mocks.VerifyAll();
+ A.CallTo(() => cache.Keys).Returns(this.KEYS);
+
+ Assert.AreEqual(this.KEYS.Length, cache.Count);
}
}
}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs b/test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs
index ec98005a4..89f9b2257 100644
--- a/test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs
+++ b/test/Spring/Spring.Core.Tests/Collections/PriorityQueueTests.cs
@@ -70,7 +70,7 @@ public void ThrowsArgumentExceptionForZeroCapacity()
[Test]
public void ThrowsArgumentNullExceptionForNullCollection()
{
- Assert.Throws(() => new PriorityQueue((ICollection) null));
+ Assert.Throws(() => new PriorityQueue(null));
}
[Test]
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
index decbc1a37..e502ed7a4 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractApplicationContextTests.cs
@@ -18,11 +18,11 @@
#endregion
-#region Imports
-
using System;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Core;
using Spring.Core.IO;
using Spring.Objects;
@@ -32,8 +32,6 @@
using Spring.Objects.Factory.Support;
using Spring.Objects.Factory.Xml;
-#endregion
-
namespace Spring.Context.Support
{
[TestFixture]
@@ -60,7 +58,7 @@ public void Destroy()
public void ContextAwareDisplayName()
{
-
+
}
[Test]
@@ -96,8 +94,7 @@ public void ExecutesAllContextEventHandlersAndRethrowsExceptionsThrownDuringCont
[Test]
public void DoesNotSearchParentContextForMessageSource()
{
- MockRepository mocks = new MockRepository();
- IMessageSource msgSource = (IMessageSource) mocks.DynamicMock(typeof (IMessageSource));
+ IMessageSource msgSource = A.Fake();
MockApplicationContext parentCtx = new MockApplicationContext("parentContext");
parentCtx.ObjectFactory.RegisterSingleton(AbstractApplicationContext.MessageSourceObjectName, msgSource);
MockApplicationContext childContext = new MockApplicationContext("childContext", parentCtx);
@@ -112,8 +109,7 @@ public void DoesNotSearchParentContextForMessageSource()
[Test]
public void DoesNotSearchParentContextForEventRegistry()
{
- MockRepository mocks = new MockRepository();
- IEventRegistry eventRegistry = (IEventRegistry)mocks.DynamicMock(typeof(IEventRegistry));
+ IEventRegistry eventRegistry = A.Fake();
MockApplicationContext parentCtx = new MockApplicationContext("parentContext");
parentCtx.ObjectFactory.RegisterSingleton(AbstractApplicationContext.EventRegistryObjectName, eventRegistry);
MockApplicationContext childContext = new MockApplicationContext("childContext", parentCtx);
@@ -398,7 +394,7 @@ public void ThrowsCannotLoadObjectTypeExceptionOnInvalidTypename()
-"));
+"));
myContext.Refresh();
}
catch (Exception e)
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs
index 616a3061d..ef3998c1e 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs
@@ -18,36 +18,30 @@
#endregion
-#region Imports
-
using System.Globalization;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Context.Support
{
[TestFixture]
public sealed class AbstractMessageSourceTests : AbstractMessageSource
{
- private MockRepository mocks;
[SetUp]
public void Init()
{
- mocks = new MockRepository();
- resetMe();
+ ResetMe();
}
[Test]
public void GetResolvableNullCodes()
- {
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.GetCodes()).Return(null);
- Expect.Call(res.DefaultMessage).Return(null);
- mocks.ReplayAll();
+ {
+ var res = A.Fake();
+ A.CallTo(() => res.DefaultMessage).Returns(null);
+
Assert.Throws(() => GetMessage(res, CultureInfo.CurrentCulture));
- mocks.VerifyAll();
}
[Test]
@@ -56,92 +50,79 @@ public void GetResolvableDefaultsToParentMessageSource()
string MSGCODE = "nullCode";
object[] MSGARGS = new object[] { "arg1", "arg2" };
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.GetArguments()).Return(MSGARGS);
- Expect.Call(res.GetCodes()).Return(new string[] {MSGCODE}).Repeat.Once();
-
- IMessageSource parentSource = mocks.StrictMock();
- Expect.Call(parentSource.GetMessage(MSGCODE, null, CultureInfo.CurrentCulture, MSGARGS)).Return(
- "MockMessageSource");
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.GetArguments()).Returns(MSGARGS);
+ A.CallTo(() => res.GetCodes()).Returns(new string[] {MSGCODE}).Once();
+
+ IMessageSource parentSource = A.Fake();
+ A.CallTo(() => parentSource.GetMessage(MSGCODE, null, CultureInfo.CurrentCulture, A._)).Returns("MockMessageSource");
ParentMessageSource = parentSource;
- mocks.ReplayAll();
Assert.AreEqual("MockMessageSource", GetMessage(res, CultureInfo.CurrentCulture), "My Message");
- mocks.VerifyAll();
}
[Test]
public void GetMessageParentMessageSource()
{
object[] args = new object[] {"arguments"};
- IMessageSource parentSource = mocks.StrictMock();
- Expect.Call(parentSource.GetMessage("null", null, CultureInfo.CurrentCulture, args)).Return(
- "my parent message");
+ IMessageSource parentSource = A.Fake();
+ A.CallTo(() => parentSource.GetMessage("null", null, CultureInfo.CurrentCulture, A._)).Returns("my parent message");
ParentMessageSource = parentSource;
- mocks.ReplayAll();
Assert.AreEqual("my parent message", GetMessage("null", "message", CultureInfo.CurrentCulture, args[0]));
- mocks.VerifyAll();
}
[Test]
public void GetMessageResolvableDefaultMessage()
{
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.DefaultMessage).Return("MyDefaultMessage").Repeat.AtLeastOnce();
- Expect.Call(res.GetCodes()).Return(null);
- Expect.Call(res.GetArguments()).Return(null);
- mocks.ReplayAll();
-
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.DefaultMessage).Returns("MyDefaultMessage");
+ A.CallTo(() => res.GetCodes()).Returns(null);
+ A.CallTo(() => res.GetArguments()).Returns(null);
+
Assert.AreEqual("MyDefaultMessage", GetMessage(res, CultureInfo.CurrentCulture), "Default");
-
- mocks.VerifyAll();
}
[Test]
public void GetMessageResolvableReturnsFirstCode()
{
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.DefaultMessage).Returns(null);
+ A.CallTo(() => res.GetCodes()).Returns(new string[] {"null"});
+ A.CallTo(() => res.GetArguments()).Returns(null);
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.DefaultMessage).Return(null).Repeat.AtLeastOnce();
- Expect.Call(res.GetCodes()).Return(new string[] {"null"});
- Expect.Call(res.GetArguments()).Return(null).Repeat.AtLeastOnce();
- mocks.ReplayAll();
UseCodeAsDefaultMessage = true;
- Assert.AreEqual("null", GetMessage(res, CultureInfo.CurrentCulture), "Code");
- mocks.VerifyAll();
+ Assert.AreEqual("null", GetMessage(res, CultureInfo.CurrentCulture), "Code");
}
[Test]
public void GetMessageResolvableNoValidMessage()
{
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.DefaultMessage).Return(null).Repeat.AtLeastOnce();
- Expect.Call(res.GetCodes()).Return(null);
- Expect.Call(res.GetArguments()).Return(null).Repeat.AtLeastOnce();
- mocks.ReplayAll();
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.DefaultMessage).Returns(null);
+ A.CallTo(() => res.GetCodes()).Returns(null);
+ A.CallTo(() => res.GetArguments()).Returns(null);
+
Assert.Throws(() => GetMessage(res, CultureInfo.CurrentCulture));
}
[Test]
public void GetMessageResolvableValidMessageAndCode()
{
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.GetCodes()).Return(new string[] {"code1"});
- Expect.Call(res.GetArguments()).Return(new object[] { "my", "arguments" }).Repeat.AtLeastOnce();
- mocks.ReplayAll();
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.GetCodes()).Returns(new string[] {"code1"});
+ A.CallTo(() => res.GetArguments()).Returns(new object[] { "my", "arguments" });
+
Assert.AreEqual("my arguments", GetMessage(res, CultureInfo.CurrentCulture), "Resolve");
- mocks.VerifyAll();
}
[Test]
public void GetMessageResolvableValidMessageAndCodeNullCulture()
{
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.GetCodes()).Return(new string[] { "code1" });
- Expect.Call(res.GetArguments()).Return(new object[] { "my", "arguments" }).Repeat.AtLeastOnce();
- mocks.ReplayAll();
- Assert.AreEqual("my arguments", GetMessage(res, null), "Resolve");
- mocks.VerifyAll();
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.GetCodes()).Returns(new string[] { "code1" });
+ A.CallTo(() => res.GetArguments()).Returns(new object[] { "my", "arguments" });
+
+ Assert.AreEqual("my arguments", GetMessage(res, null), "Resolve");
}
[Test]
@@ -179,28 +160,25 @@ public void GetMessageNoValidMessage()
[Test]
public void GetMessageWithResolvableArguments()
{
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.GetCodes()).Return(new string[] { "code1" });
- Expect.Call(res.GetArguments()).Return(new object[] { "my", "resolvable" }).Repeat.AtLeastOnce();
- mocks.ReplayAll();
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.GetCodes()).Returns(new string[] { "code1" });
+ A.CallTo(() => res.GetArguments()).Returns(new object[] { "my", "resolvable" });
+
Assert.AreEqual("spring my resolvable", GetMessage("code2", CultureInfo.CurrentCulture, new object[] {"spring", res}), "Resolve");
- mocks.VerifyAll();
}
[Test]
public void GetMessageResolvableValidMessageAndCodNullMessageFormat()
{
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.DefaultMessage).Return("myDefaultMessage").Repeat.AtLeastOnce();
- Expect.Call(res.GetCodes()).Return(new string[] { "nullCode" });
- Expect.Call(res.GetArguments()).Return(null).Repeat.AtLeastOnce();
- mocks.ReplayAll();
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.DefaultMessage).Returns("myDefaultMessage");
+ A.CallTo(() => res.GetCodes()).Returns(new string[] { "nullCode" });
+ A.CallTo(() => res.GetArguments()).Returns(null);
Assert.AreEqual("myDefaultMessage", GetMessage(res, null), "Resolve");
- mocks.VerifyAll();
}
- private void resetMe()
+ private void ResetMe()
{
ParentMessageSource = null;
UseCodeAsDefaultMessage = false;
@@ -215,7 +193,7 @@ protected override string ResolveMessage(string code, CultureInfo cultureInfo)
else if (code.Equals("nullCode"))
{
return null;
- }
+ }
else
{
return "{0} {1}";
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs
index 2f5237d1b..5c7c19853 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/DefaultMessageSourceResolvableTests.cs
@@ -18,13 +18,11 @@
#endregion
-#region Imports
-
using System.Text;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Context.Support
{
@@ -34,14 +32,11 @@ namespace Spring.Context.Support
[TestFixture]
public sealed class DefaultMessageSourceResolvableTests
{
- private MockRepository mocks;
[SetUp]
public void Init()
{
- mocks = new MockRepository();
}
-
[Test]
public void InstantiationWithASingleCodeDefaultsToEmptyDefaultMessage()
{
@@ -49,7 +44,7 @@ public void InstantiationWithASingleCodeDefaultsToEmptyDefaultMessage()
Assert.AreEqual(string.Empty, dmr.DefaultMessage,
"Not defaulting to non null empty string value (it must).");
}
-
+
[Test]
public void NullLastCode()
{
@@ -86,16 +81,15 @@ public void ResolvableToStringNullArguments()
[Test]
public void DefaultResolvableFromExistingResolvable()
{
- IMessageSourceResolvable res = mocks.StrictMock();
- Expect.Call(res.DefaultMessage).Return("defaultMessageFromMock").Repeat.AtLeastOnce();
- Expect.Call(res.GetCodes()).Return(new string[] { "code1FromMock" });
- Expect.Call(res.GetArguments()).Return(new object[] { "ArgumentFromMock" }).Repeat.AtLeastOnce();
- mocks.ReplayAll();
- DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(res);
+ IMessageSourceResolvable res = A.Fake();
+ A.CallTo(() => res.DefaultMessage).Returns("defaultMessageFromMock");
+ A.CallTo(() => res.GetCodes()).Returns(new string[] { "code1FromMock" });
+ A.CallTo(() => res.GetArguments()).Returns(new object[] { "ArgumentFromMock" });
+
+ DefaultMessageSourceResolvable dmr = new DefaultMessageSourceResolvable(res);
Assert.AreEqual("defaultMessageFromMock", dmr.DefaultMessage, "default");
Assert.AreEqual("code1FromMock", dmr.LastCode, "codes");
Assert.AreEqual("ArgumentFromMock", (dmr.GetArguments())[0], "arguments");
- mocks.VerifyAll();
}
private string getResolvableString()
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs
index f772a8598..9fbd48126 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/DelegatingMessageSourceTests.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,14 +18,12 @@
#endregion
-#region Imports
-
using System;
using System.Globalization;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Context.Support
{
@@ -36,16 +34,14 @@ namespace Spring.Context.Support
[TestFixture]
public sealed class DelegatingMessageSourceTests
{
- private MockRepository mocks;
-
- private const string LookupKey = "rick";
+ private const string LookupKey = "rick";
private IMessageSource _messageSource;
private IMessageSource MockMessageSource
{
get
{
- return _messageSource;
+ return _messageSource;
}
}
@@ -55,16 +51,14 @@ private IMessageSource MockMessageSource
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- _messageSource = mocks.StrictMock();
+ _messageSource = A.Fake();
}
[Test]
public void Instantiation()
{
DelegatingMessageSource source = new DelegatingMessageSource();
- Assert.IsNotNull(source.ParentMessageSource,
- "ParentMessageSource property must *never* be null.");
+ Assert.IsNotNull(source.ParentMessageSource, "ParentMessageSource property must *never* be null.");
}
[Test]
@@ -80,14 +74,11 @@ DelegatingMessageSource source
[Test]
public void GetMessage()
{
- const string expectedName = "Rick Evans";
- Expect.Call(MockMessageSource.GetMessage(LookupKey)).Return(expectedName);
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- mocks.ReplayAll();
+ const string expectedName = "Rick Evans";
+ A.CallTo(() => MockMessageSource.GetMessage(LookupKey)).Returns(expectedName);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
string name = source.GetMessage(LookupKey);
Assert.AreEqual(expectedName, name);
- mocks.VerifyAll();
}
[Test]
@@ -101,13 +92,10 @@ public void GetMessageNoDelegateTarget()
public void GetMessageWithCulture()
{
const string expectedName = "Rick Evans";
- Expect.Call(MockMessageSource.GetMessage(LookupKey, CultureInfo.InvariantCulture)).Return(expectedName);
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- mocks.ReplayAll();
+ A.CallTo(() => MockMessageSource.GetMessage(LookupKey, CultureInfo.InvariantCulture)).Returns(expectedName);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
string name = source.GetMessage(LookupKey, CultureInfo.InvariantCulture);
Assert.AreEqual(expectedName, name);
- mocks.VerifyAll();
}
[Test]
@@ -121,13 +109,10 @@ public void GetMessageWithCultureNoDelegateTarget()
public void GetMessageWithParams()
{
const string expectedName = "Rick Evans";
- Expect.Call(MockMessageSource.GetMessage(LookupKey, new string[] {"Rick", "Evans"})).Return(expectedName);
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- mocks.ReplayAll();
- string name = source.GetMessage(LookupKey, "Rick", "Evans");
+ A.CallTo(() => MockMessageSource.GetMessage(LookupKey, new string[] {"Rick", "Evans"})).Returns(expectedName);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
+ string name = source.GetMessage(LookupKey, "Rick", "Evans");
Assert.AreEqual(expectedName, name);
- mocks.VerifyAll();
}
[Test]
@@ -141,14 +126,10 @@ public void GetMessageWithParamsNoDelegateTarget()
public void GetMessageWithCultureAndParams()
{
const string expectedName = "Rick Evans";
- Expect.Call(MockMessageSource.GetMessage(LookupKey, CultureInfo.InvariantCulture, new string[] {"Rick", "Evans"}))
- .Return(expectedName);
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- mocks.ReplayAll();
+ A.CallTo(() => MockMessageSource.GetMessage(LookupKey, CultureInfo.InvariantCulture, new string[] {"Rick", "Evans"})).Returns(expectedName);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
string name = source.GetMessage(LookupKey, CultureInfo.InvariantCulture, "Rick", "Evans");
Assert.AreEqual(expectedName, name);
- mocks.VerifyAll();
}
[Test]
@@ -162,14 +143,11 @@ public void GetMessageWithCultureAndParamsNoDelegateTarget()
public void GetMessageWithMessageSourceResolvableAndCulture()
{
const string expectedName = "Rick Evans";
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- Expect.Call(MockMessageSource.GetMessage((IMessageSourceResolvable)null, CultureInfo.InvariantCulture)).Return(expectedName);
- mocks.ReplayAll();
- string name = source.GetMessage(
- (IMessageSourceResolvable) null, CultureInfo.InvariantCulture);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
+ A.CallTo(() => MockMessageSource.GetMessage((IMessageSourceResolvable)null, CultureInfo.InvariantCulture)).Returns(expectedName);
+
+ string name = source.GetMessage((IMessageSourceResolvable) null, CultureInfo.InvariantCulture);
Assert.AreEqual(expectedName, name);
- mocks.VerifyAll();
}
[Test]
@@ -177,16 +155,12 @@ public void GetMessageWithNoParentMessageSourceAndMessageSourceResolvableAndCult
{
const string expectedName = "Rick Evans";
- IMessageSourceResolvable resolvable = mocks.StrictMock();
- Expect.Call(resolvable.DefaultMessage).Return(expectedName);
- Expect.Call(resolvable.DefaultMessage).Return(expectedName);
+ IMessageSourceResolvable resolvable = A.Fake();
+ A.CallTo(() => resolvable.DefaultMessage).Returns(expectedName);
DelegatingMessageSource source = new DelegatingMessageSource();
- mocks.ReplayAll();
string name = source.GetMessage(resolvable, CultureInfo.InvariantCulture);
Assert.AreEqual(expectedName, name);
- //mock.Verify();
- mocks.VerifyAll();
}
[Test]
@@ -211,13 +185,10 @@ public void GetMessageWithNoParentMessageSourceAndNullDefaultMessageSourceResolv
public void GetResourceObject()
{
const string expectedName = "Rick Evans";
- Expect.Call(MockMessageSource.GetResourceObject(LookupKey)).Return(expectedName);
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- mocks.ReplayAll();
+ A.CallTo(() => MockMessageSource.GetResourceObject(LookupKey)).Returns(expectedName);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
string name = (string) source.GetResourceObject(LookupKey);
Assert.AreEqual(expectedName, name);
- mocks.VerifyAll();
}
[Test]
@@ -231,13 +202,10 @@ public void GetResourceObjectWithNoParentMessageSource()
public void GetResourceObjectWithCulture()
{
const string expectedName = "Rick Evans";
- Expect.Call(MockMessageSource.GetResourceObject(LookupKey, CultureInfo.InvariantCulture)).Return(expectedName);
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- mocks.ReplayAll();
+ A.CallTo(() => MockMessageSource.GetResourceObject(LookupKey, CultureInfo.InvariantCulture)).Returns(expectedName);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
string name = (string) source.GetResourceObject(LookupKey, CultureInfo.InvariantCulture);
Assert.AreEqual(expectedName, name);
- mocks.VerifyAll();
}
[Test]
@@ -250,12 +218,9 @@ public void GetResourceObjectWithNoParentMessageSourceWithCulture()
[Test]
public void ApplyResources()
{
- MockMessageSource.ApplyResources((object) 12, "rick", CultureInfo.InvariantCulture);
- DelegatingMessageSource source
- = new DelegatingMessageSource(MockMessageSource);
- mocks.ReplayAll();
+ MockMessageSource.ApplyResources(12, "rick", CultureInfo.InvariantCulture);
+ DelegatingMessageSource source = new DelegatingMessageSource(MockMessageSource);
source.ApplyResources(12, "rick", CultureInfo.InvariantCulture);
- mocks.VerifyAll();
}
[Test]
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs
index 10345a7b3..f9a8ac388 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/MessageSourceAccessorTests.cs
@@ -20,8 +20,9 @@
using System.Globalization;
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Globalization;
namespace Spring.Context.Support
@@ -47,29 +48,25 @@ public void TestFixtureTearDown()
private readonly string MSGRESULT = "my message";
- private MockRepository mocks;
private IMessageSource mockMsgSource;
private IMessageSourceResolvable mockMsgSourceResolvable;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- mockMsgSource = mocks.StrictMock();
- mockMsgSourceResolvable = mocks.StrictMock();
+ mockMsgSource = A.Fake();
+ mockMsgSourceResolvable = A.Fake();
}
[TearDown]
public void TearDown()
{
- mocks.VerifyAll();
}
[Test]
public void GetMessageCodeCultureArgs()
{
- Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Return(MSGRESULT);
- mocks.ReplayAll();
+ A.CallTo(() => mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Returns(MSGRESULT);
MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGCULTURE, MSGARGS));
@@ -78,8 +75,7 @@ public void GetMessageCodeCultureArgs()
[Test]
public void GetMessageCodeArgs()
{
- Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Return(MSGRESULT);
- mocks.ReplayAll();
+ A.CallTo(() => mockMsgSource.GetMessage(MSGCODE, MSGCULTURE, MSGARGS)).Returns(MSGRESULT);
MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource, MSGCULTURE);
Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGARGS));
@@ -88,8 +84,7 @@ public void GetMessageCodeArgs()
[Test]
public void GetMessageCodeArgsDefaultsToCurrentUICulture()
{
- Expect.Call(mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture, MSGARGS)).Return(MSGRESULT);
- mocks.ReplayAll();
+ A.CallTo(() => mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture, MSGARGS)).Returns(MSGRESULT);
MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGARGS));
@@ -98,8 +93,7 @@ public void GetMessageCodeArgsDefaultsToCurrentUICulture()
[Test]
public void GetMessageCodeCulture()
{
- Expect.Call(mockMsgSource.GetMessage(MSGCODE, MSGCULTURE)).Return(MSGRESULT);
- mocks.ReplayAll();
+ A.CallTo(() => mockMsgSource.GetMessage(MSGCODE, MSGCULTURE)).Returns(MSGRESULT);
MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE, MSGCULTURE));
@@ -108,8 +102,7 @@ public void GetMessageCodeCulture()
[Test]
public void GetMessageCodeDefaultsToCurrentUICulture()
{
- Expect.Call(mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture)).Return(MSGRESULT);
- mocks.ReplayAll();
+ A.CallTo(() => mockMsgSource.GetMessage(MSGCODE, CultureInfo.CurrentUICulture)).Returns(MSGRESULT);
MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(MSGCODE));
@@ -118,8 +111,7 @@ public void GetMessageCodeDefaultsToCurrentUICulture()
[Test]
public void GetMessageResolvableCulture()
{
- Expect.Call(mockMsgSource.GetMessage(mockMsgSourceResolvable, MSGCULTURE)).Return(MSGRESULT);
- mocks.ReplayAll();
+ A.CallTo(() => mockMsgSource.GetMessage(mockMsgSourceResolvable, MSGCULTURE)).Returns(MSGRESULT);
MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(mockMsgSourceResolvable, MSGCULTURE));
@@ -128,8 +120,7 @@ public void GetMessageResolvableCulture()
[Test]
public void GetMessageResolvableDefaultsToCurrentUICulture()
{
- Expect.Call(mockMsgSource.GetMessage(mockMsgSourceResolvable, CultureInfo.CurrentUICulture)).Return(MSGRESULT);
- mocks.ReplayAll();
+ A.CallTo(() => mockMsgSource.GetMessage(mockMsgSourceResolvable, CultureInfo.CurrentUICulture)).Returns(MSGRESULT);
MessageSourceAccessor msgSourceAccessor = new MessageSourceAccessor(mockMsgSource);
Assert.AreEqual(MSGRESULT, msgSourceAccessor.GetMessage(mockMsgSourceResolvable));
diff --git a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
index e87407e19..f8758104d 100644
--- a/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Context/Support/ResourceSetMessageSourceTests.cs
@@ -108,17 +108,17 @@ public void DoTestMessageAccess(bool hasParentContext, bool useCodeAsDefaultMess
// MessageSourceAccessor functionality
MessageSourceAccessor accessor = new MessageSourceAccessor(ac);
- Assert.AreEqual("message3", accessor.GetMessage("code3", CultureInfo.CurrentUICulture, (object[])null));
+ Assert.AreEqual("message3", accessor.GetMessage("code3", CultureInfo.CurrentUICulture, null));
// IMessageSourceResolveable
- Assert.AreEqual("message3", ac.GetMessage("code3", CultureInfo.CurrentUICulture, (object[])null));
+ Assert.AreEqual("message3", ac.GetMessage("code3", CultureInfo.CurrentUICulture, null));
IMessageSourceResolvable resolvable = new DefaultMessageSourceResolvable("code3");
Assert.AreEqual("message3", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
resolvable = new DefaultMessageSourceResolvable(new string[] { "code4", "code3" });
Assert.AreEqual("message3", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
- Assert.AreEqual("message3", ac.GetMessage("code3", CultureInfo.CurrentUICulture, (object[])null));
+ Assert.AreEqual("message3", ac.GetMessage("code3", CultureInfo.CurrentUICulture, null));
resolvable = new DefaultMessageSourceResolvable(new string[] { "code4", "code3" });
Assert.AreEqual("message3", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
@@ -130,7 +130,7 @@ public void DoTestMessageAccess(bool hasParentContext, bool useCodeAsDefaultMess
Assert.AreEqual("default", ac.GetMessage(null, "default", CultureInfo.CurrentUICulture, null));
Assert.AreEqual("default", ac.GetMessage(null, "default", CultureInfo.CurrentUICulture, arguments));
- /* not supported
+ /* not supported
Assert.AreEqual("{0}, default", ac.GetMessage(null, "{0}, default", CultureInfo.CurrentUICulture, null));
*/
@@ -142,7 +142,7 @@ public void DoTestMessageAccess(bool hasParentContext, bool useCodeAsDefaultMess
resolvable = new DefaultMessageSourceResolvable(null, arguments, "default");
Assert.AreEqual("default", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
- /* not supported
+ /* not supported
resolvable = new DefaultMessageSourceResolvable(null, null, "{0}, default");
Assert.AreEqual("{0}, default", ac.GetMessage(resolvable, CultureInfo.CurrentUICulture));
*/
@@ -154,12 +154,12 @@ public void DoTestMessageAccess(bool hasParentContext, bool useCodeAsDefaultMess
// test message args
Assert.AreEqual("Arg1, Arg2", ac.GetMessage("hello", CultureInfo.CurrentUICulture, new object[] { "Arg1", "Arg2" }));
- /* not supported
+ /* not supported
Assert.AreEqual("{0}, {1}", ac.GetMessage("hello", CultureInfo.CurrentUICulture, null));
*/
- /* not supported
+ /* not supported
Assert.AreEqual("Hello\nWorld", ac.GetMessage("escaped"));
}
else
@@ -277,7 +277,7 @@ private void GetMessageLocalizationFallbacks(IMessageSource msgSource)
Assert.AreEqual("Ово је Spring.NET",
msgSource.GetMessage("MyMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName),
new object[] { "Spring", ".NET" }), "message not as expected");
-
+
Assert.AreEqual("Visual Studio voli Spring.NET",
msgSource.GetMessage("MyNewMessage", new CultureInfo(CultureInfoUtils.SerbianCyrillicCultureName), new object[] { "Spring", ".NET" }), "message not as expected");
diff --git a/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs
index 9e7863b02..287ae2390 100644
--- a/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs
+++ b/test/Spring/Spring.Core.Tests/Core/TypeResolution/CachedTypeResolverTests.cs
@@ -18,45 +18,39 @@
#endregion
-#region Imports
-
using System;
-using NUnit.Framework;
-using Rhino.Mocks;
+using FakeItEasy;
-#endregion
+using NUnit.Framework;
namespace Spring.Core.TypeResolution
{
- ///
- /// Unit tests for the CachedTypeResolver class.
+ ///
+ /// Unit tests for the CachedTypeResolver class.
///
/// Rick Evans
- [TestFixture]
+ [TestFixture]
public sealed class CachedTypeResolverTests
{
- private MockRepository mocks;
-
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
}
[Test]
- public void ResolveWithNullTypeName() {
-
- ITypeResolver mockResolver = (ITypeResolver) mocks.DynamicMock(typeof(ITypeResolver));
+ public void ResolveWithNullTypeName()
+ {
+ ITypeResolver mockResolver = A.Fake();
CachedTypeResolver resolver = new CachedTypeResolver(mockResolver);
Assert.Throws(() => resolver.Resolve(null));
}
- [Test]
- public void InstantiateWithNullTypeResolver()
- {
+ [Test]
+ public void InstantiateWithNullTypeResolver()
+ {
Assert.Throws(() => new CachedTypeResolver(null));
- }
+ }
}
-}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
index 468142dfa..baa489053 100644
--- a/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
+++ b/test/Spring/Spring.Core.Tests/Expressions/ExpressionEvaluatorTests.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -324,7 +324,7 @@ public void TestExpandoObjectWithNotExistedProperty()
[Test(Description = "SPRNET-944")]
public void DateTests()
{
- string dateLiteral = (string)ExpressionEvaluator.GetValue(null, "'date'");
+ string dateLiteral = (string)ExpressionEvaluator.GetValue(null, "'date'");
Assert.AreEqual("date", dateLiteral);
}
@@ -1739,11 +1739,11 @@ public void TestDelegateFunctionExpressions()
result = (double) ExpressionEvaluator.GetValue(null, "#max(5,25)", vars);
Assert.AreEqual(25, result);
-
+
}
private delegate double DoubleFunction(double arg);
-
+
private double Sqrt(double arg)
{
return Math.Sqrt(arg);
@@ -1820,7 +1820,7 @@ public void TestCountAggregator()
[Test]
public void TestCustomCollectionProcessor()
{
- // Test for the purposes of creating documentation example.
+ // Test for the purposes of creating documentation example.
Dictionary vars = new Dictionary();
vars["EvenSum"] = new IntEvenSumCollectionProcessor();
Assert.AreEqual(6, ExpressionEvaluator.GetValue(null, "{1, 2, 3, 4}.EvenSum()", vars));
@@ -1841,7 +1841,7 @@ public object Process(ICollection source, object[] args)
if ((int)item % 2 == 0)
{
total = NumberUtils.Add(total, item);
- }
+ }
}
else
{
@@ -2308,26 +2308,26 @@ public void TestSetEnumTypePropertyOrFieldFromNumeric()
expField.SetValue(o, TestEnumTypePropertyClass.ESampleEnumType.Trunk);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
- expField.SetValue(o, ((Int16)1));
+ expField.SetValue(o, (short) 1);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
- expField.SetValue(o, ((Int32)1));
+ expField.SetValue(o, 1);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
- expField.SetValue(o, ((Int64)1));
+ expField.SetValue(o, (long) 1);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
// test property set operations
expProperty.SetValue(o, TestEnumTypePropertyClass.ESampleEnumType.Trunk);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
- expProperty.SetValue(o, ((Int16)1));
+ expProperty.SetValue(o, (short) 1);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
- expProperty.SetValue(o, ((Int32)1));
+ expProperty.SetValue(o, 1);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
- expProperty.SetValue(o, ((Int64)1));
+ expProperty.SetValue(o, (long) 1);
Assert.AreEqual(TestEnumTypePropertyClass.ESampleEnumType.Trunk, o.SampleEnumField);
expProperty.SetValue(o, "Trunk");
@@ -2335,7 +2335,7 @@ public void TestSetEnumTypePropertyOrFieldFromNumeric()
try
{
- expProperty.SetValue(o, ((double)1.0));
+ expProperty.SetValue(o, 1.0);
Assert.Fail("should throw");
}
catch (TypeMismatchException e)
diff --git a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs
index 893f58d4c..26767e08c 100644
--- a/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs
+++ b/test/Spring/Spring.Core.Tests/Globalization/Formatters/FilteringFormatterTests.cs
@@ -18,17 +18,14 @@
#endregion
-#region Imports
+using FakeItEasy;
using NUnit.Framework;
-using Rhino.Mocks;
-
-#endregion
namespace Spring.Globalization.Formatters
{
///
- ///
+ ///
///
/// Erich Eichinger
[TestFixture]
@@ -47,7 +44,7 @@ protected override string FilterValueToParse(string value)
public virtual string DoFilterValueToParse(string value)
{
- return base.FilterValueToParse(value);
+ return base.FilterValueToParse(value);
}
protected override object FilterValueToFormat(object value)
@@ -65,29 +62,24 @@ public virtual object DoFilterValueToFormat(object value)
[Test]
public void FiltersOnParseAndFormat()
{
- MockRepository mocks = new MockRepository();
- IFormatter underlyingFormatter = mocks.StrictMock();
- TestFilteringFormatter formatter = (TestFilteringFormatter) mocks.PartialMock(typeof (TestFilteringFormatter), underlyingFormatter);
+ IFormatter underlyingFormatter = A.Fake();
+ TestFilteringFormatter formatter = A.Fake(x => x
+ .CallsBaseMethods()
+ .WithArgumentsForConstructor(new[] {underlyingFormatter}));
string inputText = "inputText";
string filteredInputText = "filteredInputText";
object outputValue = new object();
object filteredOutputValue = new object();
- using(mocks.Ordered())
- {
- Expect.Call(formatter.DoFilterValueToParse(inputText)).Return(filteredInputText);
- Expect.Call(underlyingFormatter.Parse(filteredInputText)).Return(outputValue);
+ A.CallTo(() => formatter.DoFilterValueToParse(inputText)).Returns(filteredInputText);
+ A.CallTo(() => underlyingFormatter.Parse(filteredInputText)).Returns(outputValue);
- Expect.Call(formatter.DoFilterValueToFormat(outputValue)).Return(filteredOutputValue);
- Expect.Call(underlyingFormatter.Format(filteredOutputValue)).Return(inputText);
- }
- mocks.ReplayAll();
+ A.CallTo(() => formatter.DoFilterValueToFormat(outputValue)).Returns(filteredOutputValue);
+ A.CallTo(() => underlyingFormatter.Format(filteredOutputValue)).Returns(inputText);
Assert.AreSame(outputValue, formatter.Parse(inputText));
Assert.AreEqual(inputText, formatter.Format(outputValue));
-
- mocks.VerifyAll();
}
}
}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs
index 5185be19c..e467a3d47 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/AbstractFactoryObjectTests.cs
@@ -18,13 +18,11 @@
#endregion
-#region Imports
-
using System;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Objects.Factory.Config
{
@@ -35,41 +33,38 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public sealed class AbstractFactoryObjectTests
{
- private MockRepository mocks;
-
[SetUp]
public void Setup()
{
- mocks = new MockRepository();
}
[Test]
public void DisposeCallbackIsNotInvokedOnDisposeIfInPrototypeMode()
{
- IDisposable disposable = mocks.StrictMock();
+ IDisposable disposable = A.Fake();
DummyFactoryObject factory = new DummyFactoryObject(disposable);
- mocks.ReplayAll();
+
factory.IsSingleton = false;
factory.GetObject();
factory.Dispose();
+
// in prototype mode, so the Dispose() method of the object must not be called...
- mocks.VerifyAll();
+ A.CallTo(() => disposable.Dispose()).MustNotHaveHappened();
}
[Test]
public void DisposeCallbackIsInvokedOnDispose()
{
- IDisposable disposable = mocks.StrictMock();
- disposable.Dispose();
- LastCall.On(disposable).Repeat.Once();
- DummyFactoryObject factory = new DummyFactoryObject(disposable);
- mocks.ReplayAll();
+ IDisposable disposable = A.Fake();
+
+ DummyFactoryObject factory = new DummyFactoryObject(disposable);
factory.AfterPropertiesSet();
factory.Dispose();
- mocks.VerifyAll();
+
+ A.CallTo(() => disposable.Dispose()).MustHaveHappenedOnceExactly();
}
- private sealed class DummyFactoryObject : AbstractFactoryObject
+ private sealed class DummyFactoryObject : AbstractFactoryObject
{
public object theObject;
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs
index fe739a110..b52230814 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CommandLineArgsVariableSourceTests.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright © 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ public void TestVariablesResolutionWithCustomPrefixAndSeparator()
public void TestLiveVariablesResolutionWithTestDriven()
{
CommandLineArgsVariableSource vs = new CommandLineArgsVariableSource();
- Assert.IsTrue(((string) vs.ResolveVariable("AssemblyName")).StartsWith("TestDriven.TestRunner.Server"));
+ Assert.IsTrue(vs.ResolveVariable("AssemblyName").StartsWith("TestDriven.TestRunner.Server"));
}
}
}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs
index 53cb8ceeb..b54bc325b 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/CustomConverterConfigurerTests.cs
@@ -18,16 +18,14 @@
#endregion
-#region Imports
-
using System;
using System.Collections;
using System.ComponentModel;
using System.Drawing;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Objects.Factory.Config
{
@@ -38,15 +36,12 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public sealed class CustomConverterConfigurerTests
{
- private MockRepository mocks;
private IConfigurableListableObjectFactory factory;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- factory = mocks.StrictMock();
-
+ factory = A.Fake();
}
[Test]
@@ -93,9 +88,6 @@ public void DontSupplyAnyCustomConverters()
CustomConverterConfigurer config = new CustomConverterConfigurer();
config.CustomConverters = null;
config.PostProcessObjectFactory(factory);
- mocks.ReplayAll();
-
- mocks.VerifyAll();
}
[Test]
@@ -106,21 +98,16 @@ public void SunnyDayScenario()
DateTimeConverter dateTimeConverter = new DateTimeConverter();
Type colorType = typeof(Color);
ColorConverter colorConverter = new ColorConverter();
-
+
converters.Add(dateTimeType, dateTimeConverter);
converters.Add(colorType, colorConverter);
factory.RegisterCustomConverter(dateTimeType, dateTimeConverter);
factory.RegisterCustomConverter(colorType, colorConverter);
- mocks.ReplayAll();
-
CustomConverterConfigurer config = new CustomConverterConfigurer();
config.CustomConverters = converters;
config.PostProcessObjectFactory(factory);
-
- mocks.VerifyAll();
-
}
}
}
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs
index 4747c1fe9..cd9b035c6 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectFactoryCreatingFactoryObjectTests.cs
@@ -18,13 +18,11 @@
#endregion
-#region Imports
-
using System;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Objects.Factory.Config
{
@@ -36,28 +34,23 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public sealed class ObjectFactoryCreatingFactoryObjectTests
{
- private MockRepository mocks;
-
[SetUp]
public void Setup()
{
- mocks = new MockRepository();
}
[Test]
public void SunnyDay()
{
TestObject dude = new TestObject("Rick Evans", 30);
- IObjectFactory objectFactory = mocks.StrictMock();
+ IObjectFactory objectFactory = A.Fake();
const string lookupObjectName = "rick";
- Expect.Call(objectFactory.GetObject(lookupObjectName)).Return(dude).Repeat.Twice();
+ A.CallTo(() => objectFactory.GetObject(lookupObjectName)).Returns(dude).Twice();
ObjectFactoryCreatingFactoryObject factory = new ObjectFactoryCreatingFactoryObject();
factory.ObjectFactory = objectFactory;
factory.TargetObjectName = lookupObjectName;
factory.AfterPropertiesSet();
- mocks.ReplayAll();
-
IGenericObjectFactory gof = (IGenericObjectFactory) factory.GetObject();
IGenericObjectFactory gofOther = (IGenericObjectFactory) factory.GetObject();
Assert.IsTrue(Object.ReferenceEquals(gof, gofOther),
@@ -68,23 +61,21 @@ public void SunnyDay()
Assert.IsNotNull(two, "Must never return null (IFactoryObject contract).");
Assert.IsTrue(Object.ReferenceEquals(one, two),
"Not returning the same instance.");
- mocks.VerifyAll();
}
[Test]
public void PrototypeModeWithSingletonTarget()
{
- TestObject dude = new TestObject("Rick Evans", 30);
- IObjectFactory objectFactory = mocks.StrictMock();
- const string lookupObjectName = "rick";
- Expect.Call(objectFactory.GetObject(lookupObjectName)).Return(dude).Repeat.Twice();
+ TestObject dude = new TestObject("Rick Evans", 30);
+ IObjectFactory objectFactory = A.Fake();
+ const string lookupObjectName = "rick";
+ A.CallTo(() => objectFactory.GetObject(lookupObjectName)).Returns(dude).Twice();
ObjectFactoryCreatingFactoryObject factory = new ObjectFactoryCreatingFactoryObject();
factory.ObjectFactory = objectFactory;
factory.TargetObjectName = lookupObjectName;
factory.IsSingleton = false;
factory.AfterPropertiesSet();
- mocks.ReplayAll();
IGenericObjectFactory gofOne = (IGenericObjectFactory) factory.GetObject();
IGenericObjectFactory gofTwo = (IGenericObjectFactory) factory.GetObject();
Assert.IsFalse(Object.ReferenceEquals(gofOne, gofTwo),
@@ -95,7 +86,6 @@ public void PrototypeModeWithSingletonTarget()
Assert.IsNotNull(two, "Must never return null (IFactoryObject contract).");
Assert.IsTrue(Object.ReferenceEquals(one, two),
"Not returning the same instance to singleton object.");
- mocks.VerifyAll();
}
[Test]
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs
index a5dc0d68c..4c11d6334 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ObjectReferenceFactoryObjectTests.cs
@@ -18,115 +18,98 @@
#endregion
-#region Imports
-
using System;
-using NUnit.Framework;
-using Rhino.Mocks;
-#endregion
+using FakeItEasy;
+
+using NUnit.Framework;
namespace Spring.Objects.Factory.Config
{
- ///
- /// Unit tests for the ObjectReferenceFactoryObject class.
+ ///
+ /// Unit tests for the ObjectReferenceFactoryObject class.
///
/// Rick Evans
- [TestFixture]
+ [TestFixture]
public sealed class ObjectReferenceFactoryObjectTests
{
- private MockRepository mocks;
- private IObjectFactory factory;
+ private IObjectFactory factory;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- factory = mocks.StrictMock();
+ factory = A.Fake();
}
[Test]
public void NullTargetObjectName()
- {
- ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+ {
+ ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
// simulate IFactoryObjectAware interface...
Assert.Throws(() => fac.ObjectFactory = null);
}
-
- [Test]
- public void WhitespaceTargetObjectName()
- {
- ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
- fac.TargetObjectName = string.Empty;
+
+ [Test]
+ public void WhitespaceTargetObjectName()
+ {
+ ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+ fac.TargetObjectName = string.Empty;
// simulate IFactoryObjectAware interface...
Assert.Throws(() => fac.ObjectFactory = null);
- }
-
- [Test]
- public void FactoryDoesNotContainTargetObject()
- {
- Expect.Call(factory.ContainsObject("bojangles")).Return(false);
- mocks.ReplayAll();
-
- ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
- fac.TargetObjectName = "bojangles";
- try
- {
- // simulate IFactoryObjectAware interface...
- fac.ObjectFactory = factory;
- Assert.Fail("Must have bailed with a " +
- "NoSuchObjectDefinitionException 'cos the object doesn't " +
- "exist in the associated factory.");
- }
- catch (NoSuchObjectDefinitionException)
- {
- mocks.VerifyAll();
- }
- }
-
- [Test]
- public void DelegatesThroughToFactoryFor_IsSingleton()
- {
- Expect.Call(factory.ContainsObject("bojangles")).Return(true);
- Expect.Call(factory.IsSingleton("bojangles")).Return(true);
- mocks.ReplayAll();
+ }
+
+ [Test]
+ public void FactoryDoesNotContainTargetObject()
+ {
+ A.CallTo(() => factory.ContainsObject("bojangles")).Returns(false);
ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
- fac.TargetObjectName = "bojangles";
- fac.ObjectFactory = factory;
-
- Assert.IsTrue(fac.IsSingleton);
- mocks.VerifyAll();
- }
-
- [Test]
- public void DelegatesThroughToFactoryFor_GetObject()
- {
- Expect.Call(factory.ContainsObject("bojangles")).Return(true);
- Expect.Call(factory.GetObject("bojangles")).Return("Rick");
- mocks.ReplayAll();
-
- ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
- fac.TargetObjectName = "bojangles";
- fac.ObjectFactory = factory;
-
- Assert.AreEqual("Rick", fac.GetObject());
- mocks.VerifyAll();
- }
-
- [Test]
- public void DelegatesThroughToFactoryFor_ObjectType()
- {
- Expect.Call(factory.ContainsObject("bojangles")).Return(true);
- Expect.Call(factory.GetType("bojangles")).Return(GetType());
- mocks.ReplayAll();
-
- ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
- fac.TargetObjectName = "bojangles";
- fac.ObjectFactory = factory;
-
- Assert.AreEqual(GetType(), fac.ObjectType);
- mocks.VerifyAll();
- }
+ fac.TargetObjectName = "bojangles";
+
+ // simulate IFactoryObjectAware interface...
+ Assert.Throws(() => fac.ObjectFactory = factory,
+ "Must have bailed with a " +
+ "NoSuchObjectDefinitionException 'cos the object doesn't " +
+ "exist in the associated factory.");
+ }
+
+ [Test]
+ public void DelegatesThroughToFactoryFor_IsSingleton()
+ {
+ A.CallTo(() => factory.ContainsObject("bojangles")).Returns(true);
+ A.CallTo(() => factory.IsSingleton("bojangles")).Returns(true);
+
+ ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+ fac.TargetObjectName = "bojangles";
+ fac.ObjectFactory = factory;
+
+ Assert.IsTrue(fac.IsSingleton);
+ }
+
+ [Test]
+ public void DelegatesThroughToFactoryFor_GetObject()
+ {
+ A.CallTo(() => factory.ContainsObject("bojangles")).Returns(true);
+ A.CallTo(() => factory.GetObject("bojangles")).Returns("Rick");
+
+ ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+ fac.TargetObjectName = "bojangles";
+ fac.ObjectFactory = factory;
+
+ Assert.AreEqual("Rick", fac.GetObject());
+ }
+
+ [Test]
+ public void DelegatesThroughToFactoryFor_ObjectType()
+ {
+ A.CallTo(() => factory.ContainsObject("bojangles")).Returns(true);
+ A.CallTo(() => factory.GetType("bojangles")).Returns(GetType());
+
+ ObjectReferenceFactoryObject fac = new ObjectReferenceFactoryObject();
+ fac.TargetObjectName = "bojangles";
+ fac.ObjectFactory = factory;
+
+ Assert.AreEqual(GetType(), fac.ObjectType);
+ }
}
-}
+}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs
index 80753be10..f12a1e1d2 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyOverrideConfigurerTests.cs
@@ -18,19 +18,17 @@
#endregion
-#region Imports
-
using System.Collections.Specialized;
using Common.Logging;
using Common.Logging.Simple;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Context.Support;
using Spring.Core.IO;
using Spring.Objects.Factory.Xml;
-#endregion
-
namespace Spring.Objects.Factory.Config
{
///
@@ -40,13 +38,9 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public sealed class PropertyOverrideConfigurerTests
{
-
- private MockRepository mocks;
-
[SetUp]
public void Setup()
{
- mocks = new MockRepository();
}
///
@@ -56,7 +50,7 @@ public void Setup()
public void FixtureSetUp()
{
// enable (null appender) logging, just to ensure that the logging code is correct
- LogManager.Adapter = new NoOpLoggerFactoryAdapter();
+ LogManager.Adapter = new NoOpLoggerFactoryAdapter();
}
[Test]
@@ -90,7 +84,7 @@ public void OverridePropertyValue()
pvs.Add("Age", 27);
pvs.Add("Name", "Bruno");
ac.RegisterSingleton("tb1", typeof(TestObject), pvs);
-
+
pvs = new MutablePropertyValues();
pvs.Add("Properties", "();
+ IConfigurableListableObjectFactory objectFactory = A.Fake();
IConfigurableListableObjectFactory fac = objectFactory;
PropertyOverrideConfigurer cfg = new PropertyOverrideConfigurer();
NameValueCollection defaultProperties = new NameValueCollection();
defaultProperties.Add("malformedKey", "Rick Evans");
cfg.Properties = defaultProperties;
- mocks.ReplayAll();
- try
- {
- cfg.PostProcessObjectFactory(fac);
- Assert.Fail("Should have had a FatalObjectException at this point because of a malformed key.");
- }
- catch (FatalObjectException)
- {
- }
- mocks.VerifyAll();
+
+ Assert.Throws(() => cfg.PostProcessObjectFactory(fac));
}
[Test]
@@ -168,20 +154,17 @@ public void MissingObjectDefinitionDoesntRaiseFatalException()
{
const string valueTo_NOT_BeOveridden = "Jenny Lewis";
TestObject foo = new TestObject(valueTo_NOT_BeOveridden, 30);
- IConfigurableListableObjectFactory objectFactory = mocks.StrictMock();
- Expect.Call(objectFactory.GetObjectDefinition("rubbish")).Return(null);
+ IConfigurableListableObjectFactory objectFactory = A.Fake();
+ A.CallTo(() => objectFactory.GetObjectDefinition("rubbish")).Returns(null);
IConfigurableListableObjectFactory fac = objectFactory;
PropertyOverrideConfigurer cfg = new PropertyOverrideConfigurer();
NameValueCollection defaultProperties = new NameValueCollection();
defaultProperties.Add("rubbish.Name", "Rick Evans");
cfg.Properties = defaultProperties;
- mocks.ReplayAll();
- cfg.PostProcessObjectFactory(fac);
- Assert.AreEqual(valueTo_NOT_BeOveridden, foo.Name,
- "Property value was overridden, but a rubbish objectName root was supplied.");
- mocks.VerifyAll();
+ cfg.PostProcessObjectFactory(fac);
+ Assert.AreEqual(valueTo_NOT_BeOveridden, foo.Name, "Property value was overridden, but a rubbish objectName root was supplied.");
}
[Test]
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs
index 5e35eeca9..4cce955d4 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPathFactoryObjectTests.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright � 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,14 +18,12 @@
#endregion
-#region Imports
-
using System;
+
+using FakeItEasy;
using NUnit.Framework;
-using Rhino.Mocks;
-using Spring.Core;
-#endregion
+using Spring.Core;
namespace Spring.Objects.Factory.Config
{
@@ -36,22 +34,19 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public sealed class PropertyPathFactoryObjectTests
{
- private MockRepository mocks;
private IObjectFactory mockFactory;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- mockFactory = mocks.StrictMock();
+ mockFactory = A.Fake();
}
[Test]
public void GetObject_ViaTargetObjectName()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
- Expect.Call(mockFactory.GetObject("foo")).Return(new TestObject("Fiona Apple", 28));
- mocks.ReplayAll();
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(new TestObject("Fiona Apple", 28));
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.TargetObjectName = "foo";
@@ -59,17 +54,15 @@ public void GetObject_ViaTargetObjectName()
fac.ObjectFactory = mockFactory;
string name = (string) fac.GetObject();
Assert.AreEqual("Fiona Apple", name);
- mocks.VerifyAll();
}
[Test]
public void GetObject_ViaTargetObjectNameWithNestedPropertyPath()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
TestObject target = new TestObject("Fiona Apple", 28);
- target.Spouse = target;
- Expect.Call(mockFactory.GetObject("foo")).Return(target);
- mocks.ReplayAll();
+ target.Spouse = target;
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(target);
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.TargetObjectName = "foo";
@@ -77,30 +70,26 @@ public void GetObject_ViaTargetObjectNameWithNestedPropertyPath()
fac.ObjectFactory = mockFactory;
string name = (string) fac.GetObject();
Assert.AreEqual("Fiona Apple", name);
- mocks.VerifyAll();
}
[Test]
public void GetObject_ViaObjectName()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
- Expect.Call(mockFactory.GetObject("foo")).Return(new TestObject("Fiona Apple", 28));
- mocks.ReplayAll();
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(new TestObject("Fiona Apple", 28));
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.ObjectName = "foo.name";
fac.ObjectFactory = mockFactory;
string name = (string) fac.GetObject();
Assert.AreEqual("Fiona Apple", name);
- mocks.VerifyAll();
}
[Test]
public void GetObject_ViaObjectNameThatStartsWithAPeriod()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
- Expect.Call(mockFactory.GetObject("foo")).Return(new TestObject("Fiona Apple", 28));
- mocks.ReplayAll();
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(new TestObject("Fiona Apple", 28));
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.ObjectName = ".foo.name";
@@ -110,41 +99,36 @@ public void GetObject_ViaObjectNameThatStartsWithAPeriod()
[Test]
public void GetObject_MakeSureLeadingAndTrailingWhitspaceIsTrimmed()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
- Expect.Call(mockFactory.GetObject("foo")).Return(new TestObject("Fiona Apple", 28));
- mocks.ReplayAll();
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(new TestObject("Fiona Apple", 28));
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.ObjectName = " \nfoo.name ";
fac.ObjectFactory = mockFactory;
string name = (string) fac.GetObject();
Assert.AreEqual("Fiona Apple", name);
- mocks.VerifyAll();
}
[Test]
public void GetObject_ViaObjectNameWithNestedPropertyPath()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
TestObject target = new TestObject("Fiona Apple", 28);
- target.Spouse = target;
- Expect.Call(mockFactory.GetObject("foo")).Return(target);
- mocks.ReplayAll();
+ target.Spouse = target;
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(target);
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.ObjectName = "foo.spouse.name";
fac.ObjectFactory = mockFactory;
string name = (string) fac.GetObject();
Assert.AreEqual("Fiona Apple", name);
- mocks.VerifyAll();
}
[Test]
public void GetObject_ViaObjectNameWithNullInNestedPropertyPath()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
- Expect.Call(mockFactory.GetObject("foo")).Return(new TestObject("Fiona Apple", 28));
- mocks.ReplayAll();
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(new TestObject("Fiona Apple", 28));
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.ObjectName = "foo.spouse.name";
@@ -154,9 +138,8 @@ public void GetObject_ViaObjectNameWithNullInNestedPropertyPath()
[Test]
public void GetObject_PropertyPathEvaluatesToNull()
{
- Expect.Call(mockFactory.IsSingleton("foo")).Return(true);
- Expect.Call(mockFactory.GetObject("foo")).Return(new TestObject(null, 28));
- mocks.ReplayAll();
+ A.CallTo(() => mockFactory.IsSingleton("foo")).Returns(true);
+ A.CallTo(() => mockFactory.GetObject("foo")).Returns(new TestObject(null, 28));
PropertyPathFactoryObject fac = new PropertyPathFactoryObject();
fac.ObjectName = "foo.name";
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs
index d15490a64..d74e8e9ca 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/PropertyPlaceholderConfigurerTests.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright � 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,22 +18,21 @@
#endregion
-#region Imports
-
using System;
using System.Collections;
using System.Collections.Specialized;
using System.IO;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Collections;
using Spring.Context;
using Spring.Context.Support;
using Spring.Core.IO;
using Spring.Objects.Factory.Support;
using Spring.Objects.Factory.Xml;
-
-#endregion
+using Spring.Util;
namespace Spring.Objects.Factory.Config
{
@@ -44,37 +43,34 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public sealed class PropertyPlaceholderConfigurerTests
{
- private MockRepository mocks;
private static string testConnectionString = @"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=;";
private static string testConnectionStringTwo = @"Provider=Microsoft.Jet.OLEDB.4.0; Data Source=c:\Northwind.mdb;User ID=Admin;Password=Ernie;";
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
}
[Test]
public void MismatchBetweenNumberOfConfigNamesAndNumberOfLocations()
{
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
- cfg.Locations = new IResource[] { mocks.StrictMock() }; // will never get to the point where we check the validity
+ cfg.Locations = new IResource[] { A.Fake() }; // will never get to the point where we check the validity
cfg.ConfigSections = new string[] { "", "" };
- Assert.Throws(() => cfg.PostProcessObjectFactory((IConfigurableListableObjectFactory) mocks.DynamicMock(typeof(IConfigurableListableObjectFactory))));
+ Assert.Throws(() => cfg.PostProcessObjectFactory(A.Fake()));
}
[Test]
public void OneConfigNameIsOKForLotsOfLocations()
{
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
- IResource mock = mocks.StrictMock();
- Expect.Call(mock.Exists).Return(true);
- Expect.Call(mock.InputStream).Throw(new FileNotFoundException());
- mocks.ReplayAll();
+ IResource mock = A.Fake();
+ A.CallTo(() => mock.Exists).Returns(true);
+ A.CallTo(() => mock.InputStream).Throws(new FileNotFoundException());
cfg.Locations = new IResource [] {mock};
cfg.ConfigSections = new string[] { "" };
- Assert.Throws(() => cfg.PostProcessObjectFactory((IConfigurableListableObjectFactory) mocks.DynamicMock(typeof(IConfigurableListableObjectFactory))));
+ Assert.Throws(() => cfg.PostProcessObjectFactory(A.Fake()));
}
[Test]
@@ -82,13 +78,12 @@ public void ChokesOnBadResourceLocationIfIgnoreBadResourcesFlagNotSetToTrue()
{
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.IgnoreResourceNotFound = false;
- IResource mock = mocks.StrictMock();
- Expect.Call(mock.Exists).Return(false);
- mocks.ReplayAll();
+ IResource mock = A.Fake();
+ A.CallTo(() => mock.Exists).Returns(false);
cfg.Locations = new IResource [] { mock};
cfg.ConfigSections = new string[] { "" };
- Assert.Throws(() => cfg.PostProcessObjectFactory((IConfigurableListableObjectFactory) mocks.DynamicMock(typeof(IConfigurableListableObjectFactory))));
+ Assert.Throws(() => cfg.PostProcessObjectFactory(A.Fake()));
}
[Test]
@@ -96,17 +91,14 @@ public void DoesNotChokeOnBadResourceLocationIfIgnoreBadResourcesFlagSetToTrue()
{
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.IgnoreResourceNotFound = true;
- IResource mockResource = mocks.StrictMock();
- Expect.Call(mockResource.Exists).Return(false);
+ IResource mockResource = A.Fake();
+ A.CallTo(() => mockResource.Exists).Returns(false);
cfg.Location = mockResource;
cfg.ConfigSections = new string[] { "" };
- IConfigurableListableObjectFactory mockFactory = (IConfigurableListableObjectFactory)mocks.DynamicMock(typeof(IConfigurableListableObjectFactory));
- Expect.Call(mockFactory.GetObjectDefinitionNames(false)).Return(new string[] {});
- mocks.ReplayAll();
+ IConfigurableListableObjectFactory mockFactory = A.Fake();
+ A.CallTo(() => mockFactory.GetObjectDefinitionNames(false)).Returns(new string[] {});
cfg.PostProcessObjectFactory(mockFactory);
-
- mocks.VerifyAll();
}
[Test]
@@ -143,12 +135,10 @@ public void WithDefaultProperties()
pvs.Add(theProperty, placeholder);
RootObjectDefinition def = new RootObjectDefinition(typeof(TestObject), pvs);
- IConfigurableListableObjectFactory mock = mocks.StrictMock();
- Expect.Call(mock.GetObjectDefinitionNames(false)).Return(new string [] {defName});
- Expect.Call(mock.GetObjectDefinition(defName, false)).Return(def);
- Expect.Call(() => mock.AddEmbeddedValueResolver(null)).IgnoreArguments();
- mocks.ReplayAll();
-
+ IConfigurableListableObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string [] {defName});
+ A.CallTo(() => mock.GetObjectDefinition(defName, false)).Returns(def);
+
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
NameValueCollection defaultProperties = new NameValueCollection();
const string expectedName = "Rick Evans";
@@ -158,7 +148,7 @@ public void WithDefaultProperties()
Assert.AreEqual(expectedName, def.PropertyValues.GetPropertyValue(theProperty).Value,
"Property placeholder value was not replaced with the resolved value.");
- mocks.VerifyAll();
+ A.CallTo(() => mock.AddEmbeddedValueResolver(A._)).MustHaveHappened();
}
[Test]
@@ -173,11 +163,9 @@ public void IncludingAncestors()
pvs.Add(theProperty, placeholder);
RootObjectDefinition def = new RootObjectDefinition(typeof(TestObject), pvs);
- IConfigurableListableObjectFactory mock = mocks.StrictMock();
- Expect.Call(mock.GetObjectDefinitionNames(true)).Return(new string[] { defName });
- Expect.Call(mock.GetObjectDefinition(defName, true)).Return(def);
- Expect.Call(() => mock.AddEmbeddedValueResolver(null)).IgnoreArguments();
- mocks.ReplayAll();
+ IConfigurableListableObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObjectDefinitionNames(true)).Returns(new string[] { defName });
+ A.CallTo(() => mock.GetObjectDefinition(defName, true)).Returns(def);
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.IncludeAncestors = true;
@@ -190,14 +178,14 @@ public void IncludingAncestors()
Assert.AreEqual(expectedName, def.PropertyValues.GetPropertyValue(theProperty).Value,
"Property placeholder value was not replaced with the resolved value.");
- mocks.VerifyAll();
+ A.CallTo(() => mock.AddEmbeddedValueResolver(A._)).MustHaveHappened();
}
- ///
- /// Fallback is the default mode. Check if the PROCESSOR_ARCHITECTURE
- /// variable is replaced.
- ///
- [Test]
+ ///
+ /// Fallback is the default mode. Check if the PROCESSOR_ARCHITECTURE
+ /// variable is replaced.
+ ///
+ [Test]
public void WithEnvironmentVariableFallback()
{
StaticApplicationContext ac = new StaticApplicationContext();
@@ -415,10 +403,9 @@ public void ChokesOnCircularReferenceToPlaceHolder()
const string expectedName = "ba${foo}r";
properties.Add("foo", expectedName);
- IConfigurableListableObjectFactory mock = mocks.StrictMock();
- Expect.Call(mock.GetObjectDefinitionNames(false)).Return(new string[] {"foo"});
- Expect.Call(mock.GetObjectDefinition(null, false)).IgnoreArguments().Return(def);
- mocks.ReplayAll();
+ IConfigurableListableObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string[] {"foo"});
+ A.CallTo(() => mock.GetObjectDefinition(null, false)).WithAnyArguments().Returns(def);
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.Properties = properties;
@@ -430,7 +417,6 @@ public void ChokesOnCircularReferenceToPlaceHolder()
catch (ObjectDefinitionStoreException)
{
}
- mocks.VerifyAll();
}
[Test]
@@ -446,19 +432,17 @@ public void ReplacesNamedCtorArgument()
const string expectedName = "Rick";
properties.Add("hope.floats", expectedName);
- IConfigurableListableObjectFactory mock = mocks.StrictMock();
- Expect.Call(mock.GetObjectDefinitionNames(false)).Return(new string[] {"foo"});
- Expect.Call(mock.GetObjectDefinition(null, false)).IgnoreArguments().Return(def);
- Expect.Call(delegate { mock.AddEmbeddedValueResolver(null); }).IgnoreArguments();
- mocks.ReplayAll();
+ IConfigurableListableObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string[] {"foo"});
+ A.CallTo(() => mock.GetObjectDefinition(null, false)).WithAnyArguments().Returns(def);
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.Properties = properties;
cfg.PostProcessObjectFactory(mock);
- mocks.VerifyAll();
+ A.CallTo(() => mock.AddEmbeddedValueResolver(A._)).MustHaveHappened();
- Assert.AreEqual(expectedName,
+ Assert.AreEqual(expectedName,
def.ConstructorArgumentValues.GetNamedArgumentValue("name").Value,
"Named argument placeholder value was not replaced.");
}
@@ -476,20 +460,18 @@ public void UsingCustomMarkers()
const string expectedName = "Rick";
properties.Add("hope.floats", expectedName);
- IConfigurableListableObjectFactory mock = mocks.StrictMock();
- Expect.Call(mock.GetObjectDefinitionNames(false)).Return(new string[] {"foo"});
- Expect.Call(mock.GetObjectDefinition(null, false)).IgnoreArguments().Return(def);
- Expect.Call(() => mock.AddEmbeddedValueResolver(null)).IgnoreArguments();
- mocks.ReplayAll();
+ IConfigurableListableObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string[] {"foo"});
+ A.CallTo(() => mock.GetObjectDefinition(null, false)).WithAnyArguments().Returns(def);
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.PlaceholderPrefix = cfg.PlaceholderSuffix = "#";
cfg.Properties = properties;
cfg.PostProcessObjectFactory(mock);
- mocks.VerifyAll();
+ A.CallTo(() => mock.AddEmbeddedValueResolver(null)).WithAnyArguments().MustHaveHappened();
- Assert.AreEqual(expectedName,
+ Assert.AreEqual(expectedName,
def.ConstructorArgumentValues.GetNamedArgumentValue("name").Value,
"Named argument placeholder value was not replaced.");
}
@@ -574,21 +556,19 @@ public void WithIgnoreUnresolvablePlaceholder()
pvs.Add("name", placeholder);
RootObjectDefinition def = new RootObjectDefinition(typeof(TestObject), pvs);
- IConfigurableListableObjectFactory mock = mocks.StrictMock();
- Expect.Call(mock.GetObjectDefinitionNames(false)).Return(new string [] {defName});
- Expect.Call(mock.GetObjectDefinition(defName, false)).Return(def);
- Expect.Call(() => mock.AddEmbeddedValueResolver(null)).IgnoreArguments();
- mocks.ReplayAll();
+ IConfigurableListableObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObjectDefinitionNames(false)).Returns(new string [] {defName});
+ A.CallTo(() => mock.GetObjectDefinition(defName, false)).Returns(def);
PropertyPlaceholderConfigurer cfg = new PropertyPlaceholderConfigurer();
cfg.IgnoreUnresolvablePlaceholders = true;
cfg.PostProcessObjectFactory(mock);
Assert.AreEqual(placeholder, foo.Name);
- mocks.VerifyAll();
+ A.CallTo(() => mock.AddEmbeddedValueResolver(null)).WithAnyArguments().MustHaveHappened();
}
- [Test]
+ [Test]
public void ViaXML()
{
IResource resource = new ReadOnlyXmlTestResource("PropertyResourceConfigurerTests.xml", GetType());
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs
index 37c1357c4..c028bab44 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/ResourceHandlerConfigurerTests.cs
@@ -19,16 +19,16 @@
#endregion
using System.Collections;
-using NUnit.Framework;
-using Rhino.Mocks;
+using FakeItEasy;
+
+using NUnit.Framework;
using Spring.Core.IO;
using Spring.Util;
namespace Spring.Objects.Factory.Config
{
-
///
/// Unit tests for the TypeAliasConfigurer class
///
@@ -36,12 +36,9 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public class ResourceHandlerConfigurerTests
{
- private MockRepository mocks;
-
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
}
[Test]
@@ -68,7 +65,7 @@ public void UseInvalidTypeForDictionaryValue()
ResourceHandlerConfigurer resourceHandlerConfiguer = new ResourceHandlerConfigurer();
resourceHandlerConfiguer.ResourceHandlers = resourceHandlers;
- Assert.Throws(() => resourceHandlerConfiguer.PostProcessObjectFactory((IConfigurableListableObjectFactory) mocks.DynamicMock(typeof(IConfigurableListableObjectFactory))));
+ Assert.Throws(() => resourceHandlerConfiguer.PostProcessObjectFactory(A.Fake()));
}
[Test]
@@ -81,7 +78,7 @@ public void UseNonResolvableTypeForDictionaryValue()
resourceHandlerConfiguer.ResourceHandlers = resourceHandlers;
- Assert.Throws(() => resourceHandlerConfiguer.PostProcessObjectFactory((IConfigurableListableObjectFactory) mocks.DynamicMock(typeof(IConfigurableListableObjectFactory))));
+ Assert.Throws(() => resourceHandlerConfiguer.PostProcessObjectFactory(A.Fake()));
}
[Test]
@@ -112,7 +109,7 @@ private void CreateConfigurerAndTestNewProtcol(IDictionary resourceHandlers)
resourceHandlerConfiguer.Order = 1;
- resourceHandlerConfiguer.PostProcessObjectFactory((IConfigurableListableObjectFactory) mocks.DynamicMock(typeof(IConfigurableListableObjectFactory)));
+ resourceHandlerConfiguer.PostProcessObjectFactory(A.Fake());
//todo investigate mocking the typeregistry, for now ask the actual one for information.
Assert.IsTrue(ResourceHandlerRegistry.IsHandlerRegistered("httpsss"),
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs
index c113e93e3..70d615f9d 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/SharedStateAwareProcessorTests.cs
@@ -1,7 +1,7 @@
#region License
/*
- * Copyright � 2002-2011 the original author or authors.
+ * Copyright � 2002-2011 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,8 +22,10 @@
using System;
using System.Collections;
+
+using FakeItEasy;
using NUnit.Framework;
-using Rhino.Mocks;
+
using Spring.Objects.Factory.Support;
using Spring.Objects.Support;
@@ -113,25 +115,19 @@ public void IgnoresAlreadyPopulatedState()
{
DefaultListableObjectFactory of = new DefaultListableObjectFactory();
- MockRepository mocks = new MockRepository();
- ISharedStateFactory ssf1 = mocks.StrictMock();
- ISharedStateAware ssa = (ISharedStateAware)mocks.DynamicMock( typeof( ISharedStateAware ) );
+ ISharedStateFactory ssf1 = A.Fake();
+ ISharedStateAware ssa = A.Fake();
SharedStateAwareProcessor ssap = new SharedStateAwareProcessor();
- ssap.SharedStateFactories = new ISharedStateFactory[] { ssf1 };
- of.RegisterSingleton( "ssap", ssap );
+ ssap.SharedStateFactories = new ISharedStateFactory[] {ssf1};
+ of.RegisterSingleton("ssap", ssap);
- using (Record( mocks ))
- {
- // preset SharedState - ssap must ignore it
- Expect.Call( ssa.SharedState ).Return( new Hashtable() );
- // expect nothing else!
- }
+ // preset SharedState - ssap must ignore it
+ A.CallTo(() => ssa.SharedState).Returns(new Hashtable());
- using (Playback( mocks ))
- {
- ssap.PostProcessBeforeInitialization( ssa, "myPage" );
- }
+ ssap.PostProcessBeforeInitialization(ssa, "myPage");
+
+ A.CallTo(ssa).Where(x => x.Method.Name == "set_SharedState").MustNotHaveHappened();
}
[Test]
@@ -139,53 +135,33 @@ public void ProbesSharedStateFactories()
{
DefaultListableObjectFactory of = new DefaultListableObjectFactory();
- MockRepository mocks = new MockRepository();
- ISharedStateFactory ssf1 = mocks.StrictMock();
- ISharedStateFactory ssf2 = mocks.StrictMock();
- ISharedStateFactory ssf3 = mocks.StrictMock();
- ISharedStateFactory ssf4 = mocks.StrictMock();
+ ISharedStateFactory ssf1 = A.Fake();
+ ISharedStateFactory ssf2 = A.Fake();
+ ISharedStateFactory ssf3 = A.Fake();
+ ISharedStateFactory ssf4 = A.Fake();
IDictionary ssf3ProvidedState = new Hashtable();
SharedStateAwareProcessor ssap = new SharedStateAwareProcessor();
- ssap.SharedStateFactories = new ISharedStateFactory[] { ssf1, ssf2, ssf3, ssf4 };
- of.RegisterSingleton( "ssap", ssap );
+ ssap.SharedStateFactories = new ISharedStateFactory[] {ssf1, ssf2, ssf3, ssf4};
+ of.RegisterSingleton("ssap", ssap);
- ISharedStateAware ssa = (ISharedStateAware)mocks.DynamicMock( typeof( ISharedStateAware ) );
+ ISharedStateAware ssa = A.Fake();
// Ensure we iterate over configured SharedStateFactories until
// the first provider is found that
// a) true == provider.CanProvideState( instance, name )
// b) null != provider.GetSharedState( instance, name )
- using (Record( mocks ))
- {
- Expect.Call( ssa.SharedState ).Return( null );
- Expect.Call( ssf1.CanProvideState( ssa, "pageName" ) ).Return( false );
- Expect.Call( ssf2.CanProvideState( ssa, "pageName" ) ).Return( true );
- Expect.Call( ssf2.GetSharedStateFor( ssa, "pageName" ) ).Return( null );
- Expect.Call( ssf3.CanProvideState( ssa, "pageName" ) ).Return( true );
- Expect.Call( ssf3.GetSharedStateFor( ssa, "pageName" ) ).Return( ssf3ProvidedState );
- Expect.Call( ssa.SharedState = ssf3ProvidedState );
- }
-
- using (Playback( mocks ))
- {
- ssap.PostProcessBeforeInitialization( ssa, "pageName" );
- }
- }
+ A.CallTo(() => ssa.SharedState).Returns(null).Once();
+ A.CallTo(() => ssf1.CanProvideState(ssa, "pageName")).Returns(false).Once();
+ A.CallTo(() => ssf2.CanProvideState(ssa, "pageName")).Returns(true).Once();
+ A.CallTo(() => ssf2.GetSharedStateFor(ssa, "pageName")).Returns(null);
+ A.CallTo(() => ssf3.CanProvideState(ssa, "pageName")).Returns(true).Once();
+ A.CallTo(() => ssf3.GetSharedStateFor(ssa, "pageName")).Returns(ssf3ProvidedState).Once();
- #region Rhino.Mocks Compatibility Adapter
+ ssap.PostProcessBeforeInitialization(ssa, "pageName");
- private static IDisposable Record( MockRepository mocks )
- {
- return mocks.Record();
+ Assert.That(Equals(ssa.SharedState, ssf3ProvidedState));
}
-
- private static IDisposable Playback( MockRepository mocks )
- {
- return mocks.Playback();
- }
-
- #endregion Rhino.Mocks Compatibility Adapter
}
}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs
index f1f71e943..fd827aa0f 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/TypeAliasConfigurerTests.cs
@@ -20,8 +20,10 @@
using System;
using System.Collections;
+
+using FakeItEasy;
+
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Collections;
using Spring.Context.Support;
using Spring.Core.TypeResolution;
@@ -37,14 +39,12 @@ namespace Spring.Objects.Factory.Config
[TestFixture]
public class TypeAliasConfigurerTests
{
- private MockRepository mocks;
private IConfigurableListableObjectFactory factory;
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
- factory = mocks.StrictMock();
+ factory = A.Fake();
}
[Test]
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs
index 825f49ee2..7db159398 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/VariablePlaceholderConfigurerTests.cs
@@ -21,9 +21,9 @@
using System;
using System.Collections;
-using NUnit.Framework;
+using FakeItEasy;
-using Rhino.Mocks;
+using NUnit.Framework;
using Spring.Context.Support;
using Spring.Objects.Factory.Support;
@@ -31,18 +31,15 @@
namespace Spring.Objects.Factory.Config
{
///
- /// This class contains tests for
+ /// This class contains tests for
///
/// Mark Pollack
[TestFixture]
public class VariablePlaceholderConfigurerTests
{
- private MockRepository mocks;
-
[SetUp]
public void SetUp()
{
- mocks = new MockRepository();
}
[Test]
@@ -68,7 +65,7 @@ public void ThrowsOnInvalidVariableSourcesElement()
StaticApplicationContext ac = new StaticApplicationContext();
VariablePlaceholderConfigurer vphc = new VariablePlaceholderConfigurer();
vphc.VariableSources = new ArrayList(new object[] { new object() });
-
+
try
{
vphc.PostProcessObjectFactory(ac.ObjectFactory);
@@ -300,10 +297,9 @@ public void InlcludeAncestors()
pvs.Add(theProperty, placeholder);
RootObjectDefinition def = new RootObjectDefinition(typeof(TestObject), pvs);
- IConfigurableListableObjectFactory mock = mocks.StrictMock();
- Expect.Call(mock.GetObjectDefinitionNames(true)).Return(new string[] { defName });
- Expect.Call(mock.GetObjectDefinition(defName, true)).Return(def);
- mocks.ReplayAll();
+ IConfigurableListableObjectFactory mock = A.Fake();
+ A.CallTo(() => mock.GetObjectDefinitionNames(true)).Returns(new string[] { defName });
+ A.CallTo(() => mock.GetObjectDefinition(defName, true)).Returns(def);
VariablePlaceholderConfigurer vpc = new VariablePlaceholderConfigurer();
vpc.IgnoreUnresolvablePlaceholders = true;
@@ -311,8 +307,6 @@ public void InlcludeAncestors()
vpc.IncludeAncestors = true;
vpc.PostProcessObjectFactory(mock);
-
- mocks.VerifyAll();
}
}
}
\ No newline at end of file
diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
index 8a0829bc6..e87214b5d 100644
--- a/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
+++ b/test/Spring/Spring.Core.Tests/Objects/Factory/DefaultListableObjectFactoryTests.cs
@@ -18,8 +18,6 @@
#endregion
-#region Imports
-
using System;
using System.Collections;
using System.Collections.Generic;
@@ -27,15 +25,12 @@
using System.Reflection;
using System.Runtime.Serialization;
using NUnit.Framework;
-using Rhino.Mocks;
using Spring.Core.TypeConversion;
using Spring.Objects.Factory.Config;
using Spring.Objects.Factory.Support;
using Spring.Objects.Factory.Xml;
using Spring.Objects.Support;
-#endregion
-
namespace Spring.Objects.Factory
{
///
@@ -46,13 +41,11 @@ namespace Spring.Objects.Factory
[TestFixture]
public sealed class DefaultListableObjectFactoryTests
{
- private MockRepository mocks;
-
[SetUp]
public void Setup()
{
- mocks = new MockRepository();
}
+
///
/// The setup logic executed before the execution of this test fixture.
///
@@ -79,7 +72,7 @@ public Class1( ICollaborator collaborator, IStrategy strategy)
TheStrategy = strategy;
}
}
-
+
class Class2
{
private IStrategy _strategy;
@@ -293,8 +286,8 @@ public void Dispose()
[Test]
public void GetObjectPostProcessorCount()
{
- IObjectPostProcessor proc1 = mocks.StrictMock();
- IObjectPostProcessor proc2 = mocks.StrictMock();
+ IObjectPostProcessor proc1 = FakeItEasy.A.Fake();
+ IObjectPostProcessor proc2 = FakeItEasy.A.Fake();
DefaultListableObjectFactory lof = new DefaultListableObjectFactory();
@@ -315,9 +308,8 @@ public void GetObjectPostProcessorCount()
[Test]
public void GetObjectPostProcessorCountDoesntRespectHierarchy()
{
-
- IObjectPostProcessor proc1 = mocks.StrictMock();
- IObjectPostProcessor proc2 = mocks.StrictMock();
+ IObjectPostProcessor proc1 = FakeItEasy.A.Fake();
+ IObjectPostProcessor proc2 = FakeItEasy.A.Fake();
DefaultListableObjectFactory child = new DefaultListableObjectFactory();
DefaultListableObjectFactory parent = new DefaultListableObjectFactory(child);
@@ -1535,7 +1527,7 @@ public void DoubleBooleanAutowire()
DefaultListableObjectFactory fac = new DefaultListableObjectFactory();
fac.RegisterObjectDefinition("foo", def);
- Assert.Throws(() => fac.GetObject("foo"),
+ Assert.Throws(() => fac.GetObject("foo"),
"Error creating object with name 'foo' : Unsatisfied dependency " +
"expressed through constructor argument with index 1 of type [System.Boolean] : " +
"No unique object of type [System.Boolean] is defined : Unsatisfied dependency of type [System.Boolean]: expected at least 1 matching object to wire the [b2] parameter on the constructor of object [foo]");
@@ -1650,7 +1642,7 @@ public void GetObjectDefinitionResolvesAliases()
[Test]
public void IgnoreObjectPostProcessorDuplicates()
{
- IObjectPostProcessor proc1 = mocks.StrictMock();
+ IObjectPostProcessor proc1 = FakeItEasy.A.Fake