Used unit namespaces, removed all efforts to support earlier than XE2…

… (pointless).

README.md

@@ -1,6 +1,6 @@
 # Delphi Mocks
 
-Delphi Mocks is a simple mocking framework for Delphi XE2 or later. It makes use of RTTI features that are only available in Delphi XE2, however I do hope to be able to get it working with earlier versions of Delphi (2010 or later) at some stage.
+Delphi Mocks is a simple mocking framework for Delphi XE2 or later. It makes use of RTTI features that are only available in Delphi XE2.
 
 # Example
 
@@ -43,7 +43,7 @@ type
 implementation
 
 uses
-  Rtti;
+  System.Rtti;
 
 { TMockObjectTests }
 

Source/Delphi.Mocks.AutoMock.pas

@@ -3,7 +3,7 @@
 interface
 
 uses
-  TypInfo,
+  System.TypInfo,
   System.Generics.Collections,
   Delphi.Mocks,
   Delphi.Mocks.WeakReference;

Source/Delphi.Mocks.Behavior.pas

@@ -28,8 +28,8 @@
 interface
 
 uses
-  Rtti,
-  SysUtils,
+  System.Rtti,
+  System.SysUtils,
   Delphi.Mocks,
   Delphi.Mocks.Interfaces,
   Delphi.Mocks.ParamMatcher;

Source/Delphi.Mocks.Expectation.pas

@@ -29,7 +29,7 @@ interface
 
 
 uses
-  Rtti,
+  System.Rtti,
   Delphi.Mocks,
   Delphi.Mocks.ParamMatcher,
   Delphi.Mocks.Interfaces,
@@ -96,7 +96,7 @@   TExpectation = class(TInterfacedObject,IExpectation)
 implementation
 
 uses
-  SysUtils,
+  System.SysUtils,
   Delphi.Mocks.Helpers;
 
 { TExpectation }

Source/Delphi.Mocks.Helpers.pas

@@ -33,7 +33,7 @@
 interface
 
 uses
-  Rtti;
+  System.Rtti;
 
 type
   //TValue really needs to have an Equals operator overload!
@@ -85,11 +85,11 @@ function SameValue(const Left, Right: TValue): Boolean;
 implementation
 
 uses
-  SysUtils,
-  Math,
-  TypInfo,
-  Variants,
-  StrUtils;
+  System.SysUtils,
+  System.Math,
+  System.TypInfo,
+  System.Variants,
+  System.StrUtils;
 
 var
   Context : TRttiContext;
@@ -107,11 +107,11 @@ function CompareValue(const Left, Right: TValue): Integer;
   if leftIsEmpty or rightIsEmpty then
     Result := EmptyResults[leftIsEmpty, rightIsEmpty]
   else if left.IsOrdinal and right.IsOrdinal then
-    Result := Math.CompareValue(left.AsOrdinal, right.AsOrdinal)
+    Result := System.Math.CompareValue(left.AsOrdinal, right.AsOrdinal)
   else if left.IsFloat and right.IsFloat then
-    Result := Math.CompareValue(left.AsExtended, right.AsExtended)
+    Result := System.Math.CompareValue(left.AsExtended, right.AsExtended)
   else if left.IsString and right.IsString then
-    Result := SysUtils.AnsiCompareStr(left.AsString, right.AsString)
+    Result := System.SysUtils.AnsiCompareStr(left.AsString, right.AsString)
   else if left.IsObject and right.IsObject then
     Result := NativeInt(left.AsObject) - NativeInt(right.AsObject) // TODO: instance comparer
   else if Left.IsInterface and Right.IsInterface then

Source/Delphi.Mocks.Interfaces.pas

@@ -28,12 +28,12 @@
 interface
 
 uses
-  SysUtils,
-  TypInfo,
-  Generics.Collections,
+  System.SysUtils,
+  System.TypInfo,
+  System.Rtti,
+  System.Generics.Collections,
   Delphi.Mocks,
-  Delphi.Mocks.ParamMatcher,
-  Rtti;
+  Delphi.Mocks.ParamMatcher;
 
 type
   TBehaviorType = (WillReturn,ReturnDefault,WillRaise,WillRaiseAlways,WillExecute,WillExecuteWhen);

Source/Delphi.Mocks.MethodData.pas

@@ -31,9 +31,9 @@
 interface
 
 uses
-  Rtti,
-  SysUtils,
-  Generics.Collections,
+  System.Rtti,
+  System.SysUtils,
+  System.Generics.Collections,
   Delphi.Mocks,
   Delphi.Mocks.Interfaces,
   Delphi.Mocks.ParamMatcher;

Source/Delphi.Mocks.ObjectProxy.pas

@@ -28,14 +28,13 @@
 interface
 
 uses
-  Rtti,
-  SysUtils,
-  TypInfo,
-  Generics.Collections,
+  System.Rtti,
+  System.SysUtils,
+  System.TypInfo,
+  System.Generics.Collections,
   Delphi.Mocks,
   Delphi.Mocks.Interfaces,
-  Delphi.Mocks.Proxy,
-  Delphi.Mocks.VirtualMethodInterceptor;
+  Delphi.Mocks.Proxy;
 
 type
   TObjectProxy<T> = class(TProxy<T>)

Source/Delphi.Mocks.ParamMatcher.pas

@@ -28,10 +28,10 @@
 interface
 
 uses
-  Generics.Collections,
-  SysUtils,
-  TypInfo,
-  Rtti;
+  System.Generics.Collections,
+  System.SysUtils,
+  System.TypInfo,
+  System.Rtti;
 
 
 type
@@ -67,8 +67,8 @@   TMatcherFactory = class
 implementation
 
 uses
-  Classes,
-  SyncObjs;
+  System.Classes,
+  System.SyncObjs;
 
 
 { TMatcherFactory }

Source/Delphi.Mocks.Proxy.TypeInfo.pas

@@ -28,10 +28,10 @@
 interface
 
 uses
-  Rtti,
-  SysUtils,
-  Generics.Collections,
-  TypInfo,
+  System.Rtti,
+  System.SysUtils,
+  System.Generics.Collections,
+  System.TypInfo,
   Delphi.Mocks,
   Delphi.Mocks.Proxy,
   Delphi.Mocks.WeakReference,

Source/Delphi.Mocks.Proxy.pas

@@ -28,10 +28,10 @@
 interface
 
 uses
-  Rtti,
-  SysUtils,
-  TypInfo,
-  Generics.Collections,
+  System.Rtti,
+  System.SysUtils,
+  System.TypInfo,
+  System.Generics.Collections,
   Delphi.Mocks,
   Delphi.Mocks.WeakReference,
   Delphi.Mocks.Interfaces,

Source/Delphi.Mocks.ReturnTypePatch.pas

@@ -54,8 +54,8 @@ initialization
 interface
 
 uses
-  Rtti,
-  TypInfo;
+  System.Rtti,
+  System.TypInfo;
 
 type
   ReturnTypePatchAttribute = class(TCustomAttribute)

Source/Delphi.Mocks.Utils.pas

@@ -29,8 +29,8 @@
 interface
 
 uses
-  TypInfo,
-  RTTI;
+  System.TypInfo,
+  System.Rtti;
 
 function CheckInterfaceHasRTTI(const info : PTypeInfo) : boolean;
 
@@ -45,8 +45,8 @@ function ArgsToString(const Args: TArray<TValue>; OffSet: Integer = 0): string;
 implementation
 
 uses
-  Variants,
-  SysUtils;
+  System.Variants,
+  System.SysUtils;
 
 function CheckInterfaceHasRTTI(const info : PTypeInfo) : boolean;
 var

Source/Delphi.Mocks.Validation.pas

@@ -3,7 +3,7 @@
 interface
 
 uses
-  typInfo;
+  System.TypInfo;
 
 type
   TMocksValidation = class(TObject)