Removed references to 'entity' and replaced with 'object'

Author: robdmoore

NTestDataBuilder/DataBuilder.cs

@@ -19,22 +19,22 @@ public interface IDataBuilder<out T> where T : class
     }
 
     /// <summary>
-    /// Base class definining infrastructure for a class that generates objects of type <see cref="TEntity"/>.
+    /// Base class definining infrastructure for a class that generates objects of type <see cref="TObject"/>.
     /// </summary>
-    /// <typeparam name="TEntity">The type of object this class generates</typeparam>
+    /// <typeparam name="TObject">The type of object this class generates</typeparam>
     /// <typeparam name="TBuilder">The type for this class, yes this is a recursive type definition</typeparam>
-    public abstract class DataBuilder<TEntity, TBuilder> : IDataBuilder<TEntity>
-        where TEntity : class
-        where TBuilder : class, IDataBuilder<TEntity>
+    public abstract class DataBuilder<TObject, TBuilder> : IDataBuilder<TObject>
+        where TObject : class
+        where TBuilder : class, IDataBuilder<TObject>
     {
         private readonly Dictionary<string, object> _properties = new Dictionary<string, object>();
-        private ProxyBuilder<TEntity> _proxyBuilder;
+        private ProxyBuilder<TObject> _proxyBuilder;
 
         /// <summary>
         /// Build the object.
         /// </summary>
         /// <returns>The built object</returns>
-        public TEntity Build()
+        public TObject Build()
         {
             if (_proxyBuilder != null)
             {
@@ -50,15 +50,15 @@ public TEntity Build()
         /// Build the actual object
         /// </summary>
         /// <returns>The built object</returns>
-        protected abstract TEntity BuildObject();
+        protected abstract TObject BuildObject();
 
         /// <summary>
         /// Return an NSubstitute proxy object when .Build() is called rather than a real object.
         /// </summary>
         /// <returns>The builder so that other method calls can be chained</returns>
         public TBuilder AsProxy()
         {
-            _proxyBuilder = new ProxyBuilder<TEntity>(_properties);
+            _proxyBuilder = new ProxyBuilder<TObject>(_properties);
             return this as TBuilder;
         }
 
@@ -67,26 +67,26 @@ public TBuilder AsProxy()
         /// This allows you to add any .Returns() values that are more complex than the public properties that are proxied by default.
         /// </summary>
         /// <param name="proxy">The proxy object</param>
-        protected virtual void AlterProxy(TEntity proxy) {}
+        protected virtual void AlterProxy(TObject proxy) {}
 
         /// <summary>
-        /// Records the given value for the given property from <see cref="TEntity"/>.
+        /// Records the given value for the given property from <see cref="TObject"/>.
         /// </summary>
         /// <typeparam name="TValue">The type of the property</typeparam>
         /// <param name="property">A lambda expression specifying the property to record a value for</param>
         /// <param name="value">The value to record</param>
-        public void Set<TValue>(Expression<Func<TEntity, TValue>> property, TValue value)
+        public void Set<TValue>(Expression<Func<TObject, TValue>> property, TValue value)
         {
             _properties[GetPropertyName(property)] = value;
         }
 
         /// <summary>
-        /// Gets the recorded value for the given property from <see cref="TEntity"/>.
+        /// Gets the recorded value for the given property from <see cref="TObject"/>.
         /// </summary>
         /// <typeparam name="TValue">The type of the property</typeparam>
         /// <param name="property">A lambda expression specifying the property to retrieve the recorded value for</param>
         /// <returns>The recorded value of the property</returns>
-        public TValue Get<TValue>(Expression<Func<TEntity, TValue>> property)
+        public TValue Get<TValue>(Expression<Func<TObject, TValue>> property)
         {
             if (!Has(property))
                 throw new ArgumentException(
@@ -101,13 +101,13 @@ public TValue Get<TValue>(Expression<Func<TEntity, TValue>> property)
         }
 
         /// <summary>
-        /// Gets the recorded value for the given property from <see cref="TEntity"/> or if no
+        /// Gets the recorded value for the given property from <see cref="TObject"/> or if no
         /// value has been recorded the default value for <see cref="TValue"/>.
         /// </summary>
         /// <typeparam name="TValue">The type of the property</typeparam>
         /// <param name="property">A lambda expression specifying the property to retrieve the recorded value for</param>
         /// <returns>The recorded value of the property or teh default value for <see cref="TValue"/> if no value recorded</returns>
-        public TValue GetOrDefault<TValue>(Expression<Func<TEntity, TValue>> property)
+        public TValue GetOrDefault<TValue>(Expression<Func<TObject, TValue>> property)
         {
             return Has(property)
                 ? Get(property)
@@ -126,25 +126,25 @@ public static IListBuilder<TBuilder> CreateListOfSize(int size)
         }
 
         /// <summary>
-        /// Returns whether or not there is currently a value recorded against the given property from <see cref="TEntity"/>.
+        /// Returns whether or not there is currently a value recorded against the given property from <see cref="TObject"/>.
         /// </summary>
         /// <typeparam name="TValue">The type of the property</typeparam>
         /// <param name="property">A lambda expression specifying the property to retrieve the recorded value for</param>
         /// <returns>Whether or not there is a recorded value for the property</returns>
-        protected bool Has<TValue>(Expression<Func<TEntity, TValue>> property)
+        protected bool Has<TValue>(Expression<Func<TObject, TValue>> property)
         {
             return _properties.ContainsKey(GetPropertyName(property));
         }
 
-        private static string GetPropertyName<TValue>(Expression<Func<TEntity, TValue>> property)
+        private static string GetPropertyName<TValue>(Expression<Func<TObject, TValue>> property)
         {
             var memExp = property.Body as MemberExpression;
             if (memExp == null)
                 throw new ArgumentException(
                     string.Format(
                         "Given property expression ({0}) didn't specify a property on {1}",
                         property,
-                        typeof(TEntity).Name
+                        typeof(TObject).Name
                     ),
                     "property"
                 );

NTestDataBuilder/DataBuilderExtensions.cs

@@ -5,20 +5,20 @@
 namespace NTestDataBuilder
 {
     /// <summary>
-    /// Extension methods against the <see cref="DataBuilder{TEntity,TBuilder}"/> class.
+    /// Extension methods against the <see cref="DataBuilder{TObject,TBuilder}"/> class.
     /// </summary>
     public static class DataBuilderExtensions
     {
         /// <summary>
         /// Builds a list of entities given an NBuilder list expression of data builders.
         /// </summary>
         /// <typeparam name="TBuilder">The type of the builder being built using NBuilder</typeparam>
-        /// <typeparam name="TEntity">The type of object being generated</typeparam>
+        /// <typeparam name="TObject">The type of object being generated</typeparam>
         /// <param name="builderList">The NBuilder list of builders</param>
         /// <returns>The built list of objects</returns>
-        public static IList<TEntity> BuildDataList<TEntity, TBuilder>(this IOperable<TBuilder> builderList)
-            where TBuilder : IDataBuilder<TEntity>
-            where TEntity : class
+        public static IList<TObject> BuildDataList<TObject, TBuilder>(this IOperable<TBuilder> builderList)
+            where TBuilder : IDataBuilder<TObject>
+            where TObject : class
         {
             return builderList.Build().Select(b => b.Build()).ToList();
         }
@@ -27,14 +27,14 @@ public static IList<TEntity> BuildDataList<TEntity, TBuilder>(this IOperable<TBu
         /// Builds a list of entities given an NBuilder list expression of data builders.
         /// </summary>
         /// <typeparam name="TBuilder">The type of the builder being built using NBuilder</typeparam>
-        /// <typeparam name="TEntity">The type of object being generated</typeparam>
+        /// <typeparam name="TObject">The type of object being generated</typeparam>
         /// <param name="builderList">The NBuilder list of builders</param>
         /// <returns>The built list of objects</returns>
-        public static IList<TEntity> BuildDataList<TEntity, TBuilder>(this IListBuilder<TBuilder> builderList)
-            where TBuilder : IDataBuilder<TEntity>
-            where TEntity : class
+        public static IList<TObject> BuildDataList<TObject, TBuilder>(this IListBuilder<TBuilder> builderList)
+            where TBuilder : IDataBuilder<TObject>
+            where TObject : class
         {
-            return builderList.All().BuildDataList<TEntity, TBuilder>();
+            return builderList.All().BuildDataList<TObject, TBuilder>();
         }
     }
 }

NTestDataBuilder/ProxyBuilder.cs

@@ -28,14 +28,14 @@ public ProxyBuilder(Dictionary<string, object> properties)
         /// <returns>The proxy object</returns>
         public T Build()
         {
-            var proxyEntity = Substitute.For<T>();
-            var entityProperties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-            foreach (var property in entityProperties.Where(property => _properties.ContainsKey(property.Name)))
+            var proxy = Substitute.For<T>();
+            var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            foreach (var property in properties.Where(property => _properties.ContainsKey(property.Name)))
             {
-                property.GetValue(proxyEntity, null).Returns(_properties[property.Name]);
+                property.GetValue(proxy, null).Returns(_properties[property.Name]);
             }
 
-            return proxyEntity;
+            return proxy;
         }
     }
 }