fixed Oid test. fixed an issue with indexers in the DefaultMemberFind…

…er. Allowed private setters in the DefaultMemberFinder.
karanbajaj · May 23, 2010 · f452be7 · f452be7
1 parent 9dd25f6
commit f452be7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/source/MongoDB.Tests/UnitTests/TestOid.cs b/source/MongoDB.Tests/UnitTests/TestOid.cs
@@ -136,7 +136,7 @@ public void TestNotEquals()
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
+        [ExpectedException(typeof(ArgumentException))]
         public void TestNullValue()
         {
             new Oid(String.Empty);

diff --git a/source/MongoDB/Configuration/Mapping/Auto/AutoMappingProfile.cs b/source/MongoDB/Configuration/Mapping/Auto/AutoMappingProfile.cs
@@ -74,7 +74,7 @@ public AutoMappingProfile()
         {
             _conventions = new ConventionProfile();
             _isSubClass = t => false;
-            _memberFinder = PublicOrProtectedMemberFinder.Instance;
+            _memberFinder = DefaultMemberFinder.Instance;
         }
 
         /// <summary>

diff --git a/...ing/Auto/PublicOrProtectedMemberFinder.cs → ...ation/Mapping/Auto/DefaultMemberFinder.cs b/...ing/Auto/PublicOrProtectedMemberFinder.cs → ...ation/Mapping/Auto/DefaultMemberFinder.cs
@@ -7,16 +7,16 @@ namespace MongoDB.Configuration.Mapping.Auto
     /// <summary>
     /// 
     /// </summary>
-    public class PublicOrProtectedMemberFinder : IMemberFinder
+    public class DefaultMemberFinder : IMemberFinder
     {
         ///<summary>
         ///</summary>
-        public static readonly PublicOrProtectedMemberFinder Instance = new PublicOrProtectedMemberFinder();
+        public static readonly DefaultMemberFinder Instance = new DefaultMemberFinder();
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PublicOrProtectedMemberFinder"/> class.
+        /// Initializes a new instance of the <see cref="DefaultMemberFinder"/> class.
         /// </summary>
-        private PublicOrProtectedMemberFinder()
+        private DefaultMemberFinder()
         {
         }
 
@@ -32,18 +32,18 @@ public IEnumerable<MemberInfo> FindMembers(Type type)
                 var getMethod = prop.GetGetMethod(true);
                 var setMethod = prop.GetSetMethod(true);
 
-                if(getMethod==null||setMethod==null)
+                if(getMethod==null || getMethod.IsPrivate || setMethod==null)
                     continue;
 
-                if(getMethod.IsPrivate||setMethod.IsPrivate)
+                if (setMethod.GetParameters().Length != 1) //an indexer
                     continue;
 
                 yield return prop;
             }
 
-            foreach (var field in type.GetFields())
+            foreach (var field in type.GetFields()) //all public fields
             {
-                if (!field.IsInitOnly && !field.IsLiteral)
+                if (!field.IsInitOnly && !field.IsLiteral) //readonly
                     yield return field;
             }
         }

diff --git a/source/MongoDB/Configuration/Mapping/Model/MemberReflectionOptimizer.cs b/source/MongoDB/Configuration/Mapping/Model/MemberReflectionOptimizer.cs
@@ -164,7 +164,7 @@ public static class MemberReflectionOptimizer
 
             if (!propertyInfo.CanWrite)
                 throw new InvalidOperationException("Cannot create a setter for a readonly property.");
-            
+
             ParameterExpression instanceParameter = Expression.Parameter(typeof(object), "target");
             ParameterExpression valueParameter = Expression.Parameter(typeof(object), "value");
 

diff --git a/source/MongoDB/MongoDB.csproj b/source/MongoDB/MongoDB.csproj
@@ -231,7 +231,7 @@
     <Compile Include="Configuration\Mapping\Auto\IAutoMappingProfile.cs" />
     <Compile Include="Configuration\Mapping\Auto\IMemberFinder.cs" />
     <Compile Include="Configuration\Mapping\Auto\MemberOverrides.cs" />
-    <Compile Include="Configuration\Mapping\Auto\PublicOrProtectedMemberFinder.cs" />
+    <Compile Include="Configuration\Mapping\Auto\DefaultMemberFinder.cs" />
     <Compile Include="Configuration\Mapping\Conventions\ConventionProfile.cs" />
     <Compile Include="Configuration\Mapping\Conventions\DefaultCollectionAdapterConvention.cs" />
     <Compile Include="Configuration\Mapping\Conventions\DefaultDefaultValueConvention.cs" />