Merge pull request #3 from financialforcedev/master

Update of local repo

Author: ImJohnMDaniel

fflib/src/classes/fflib_SObjectMocks.cls

@@ -186,98 +186,47 @@ public class fflib_SObjectMocks
 
 		public void registerNew(SObject record)
 		{
-			if (mocks.Verifying)
-			{
-				mocks.verifyMethodCall(this, 'registerNew', new List<Object> {record});
-			}
-			else
-			{
-				mocks.recordMethod(this, 'registerNew', new List<Object> {record});
-			}
+			mocks.mockVoidMethod(this, 'registerNew', new List<Object> {record});
 		}
 
 		public void registerNew(List<SObject> records)
 		{
-			for(SObject record : records)
-			{
-				registerNew(record);
-			}
+			mocks.mockVoidMethod(this, 'registerNew', new List<Object> {records});
 		}
 
 		public void registerNew(SObject record, Schema.sObjectField relatedToParentField, SObject relatedToParentRecord)
 		{
-			if (mocks.Verifying)
-			{
-				mocks.verifyMethodCall(this, 'registerNew', new List<Object> {record, relatedToParentField, relatedToParentRecord});
-			}
-			else
-			{
-				mocks.recordMethod(this, 'registerNew', new List<Object> {record, relatedToParentField, relatedToParentRecord});
-			}
+			mocks.mockVoidMethod(this, 'registerNew', new List<Object> {record, relatedToParentField, relatedToParentRecord});
 		}
 
 		public void registerRelationship(SObject record, Schema.sObjectField relatedToField, SObject relatedTo)
 		{
-			if (mocks.Verifying)
-			{
-				mocks.verifyMethodCall(this, 'registerRelationship', new List<Object> {record, relatedToField, relatedTo});
-			}
-			else
-			{
-				mocks.recordMethod(this, 'registerRelationship', new List<Object> {record, relatedToField, relatedTo});
-			}
+			mocks.mockVoidMethod(this, 'registerRelationship', new List<Object> {record, relatedToField, relatedTo});
 		}
 
 		public void registerDirty(SObject record)
 		{
-			if (mocks.Verifying)
-			{
-				mocks.verifyMethodCall(this, 'registerDirty', new List<Object> {record});
-			}
-			else
-			{
-				mocks.recordMethod(this, 'registerDirty', new List<Object> {record});
-			}
+			mocks.mockVoidMethod(this, 'registerDirty', new List<Object> {record});
 		}
 
 		public void registerDirty(List<SObject> records)
 		{
-			for(SObject record : records)
-			{
-				registerDirty(record);
-			}
+			mocks.mockVoidMethod(this, 'registerDirty', new List<Object> {records});
 		}
 
 		public void registerDeleted(SObject record)
 		{
-			if (mocks.Verifying)
-			{
-				mocks.verifyMethodCall(this, 'registerDeleted', new List<Object> {record});
-			}
-			else
-			{
-				mocks.recordMethod(this, 'registerDeleted', new List<Object> {record});
-			}
+			mocks.mockVoidMethod(this, 'registerDeleted', new List<Object> {record});
 		}
 
 		public void registerDeleted(List<SObject> records)
 		{
-			for(SObject record : records)
-			{
-				registerDeleted(record);
-			}
+			mocks.mockVoidMethod(this, 'registerDeleted', new List<Object> {records});
 		}
 
 		public void commitWork()
 		{
-			if (mocks.Verifying)
-			{
-				mocks.verifyMethodCall(this, 'commitWork', new List<Object> {});
-			}
-			else
-			{
-				mocks.recordMethod(this, 'commitWork', new List<Object> {});
-			}
+			mocks.mockVoidMethod(this, 'commitWork', new List<Object> {});
 		}
 	}
 }

fflib/src/classes/fflib_SObjectSelector.cls

@@ -35,7 +35,8 @@ public abstract with sharing class fflib_SObjectSelector
      **/
     private static Set<String> STANDARD_WITHOUT_CURRENCYISO = new Set<String> { AsyncApexJob.SObjectType.getDescribe().getName()
                                                                                 , ApexClass.SObjectType.getDescribe().getName()
-                                                                                , Attachment.SObjectType.getDescribe().getName()  };
+                                                                                , Attachment.SObjectType.getDescribe().getName()
+                                                                                , RecordType.getSObjectType.getDescribe().getName() };
 
     /**
      * Should this selector automatically include the FieldSet fields when building queries?