Exposed NUnit to C++ code for use in unit tests. Fixed bugs.

git-svn-id: https://mono-soc-2010.googlecode.com/svn/trunk/cppinterop@46 a470b8cb-0e6f-1642-1b45-71e107334c4b

CPPInterop.sln

@@ -7,6 +7,8 @@ Project("{2857B73E-F847-4B02-9238-064979017E93}") = "CPPTestLib", "CPPTestLib\CP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{3C290CBE-CA39-47F6-B3A0-ACD16C5A38C8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestDebugHarness", "TestDebugHarness\TestDebugHarness.csproj", "{AD562CD3-5DEB-4D19-9819-5279C0649AE8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{4A864586-93C5-4DC1-8A80-F094A88506D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A864586-93C5-4DC1-8A80-F094A88506D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A864586-93C5-4DC1-8A80-F094A88506D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD562CD3-5DEB-4D19-9819-5279C0649AE8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B01E6282-144E-481A-8E1F-95F708DFBC2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B01E6282-144E-481A-8E1F-95F708DFBC2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B01E6282-144E-481A-8E1F-95F708DFBC2D}.Release|Any CPU.ActiveCfg = Release|Any CPU

CPPTestLib/CPPTestLib.cproj

@@ -35,5 +35,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CSimpleClass.cpp" />
+    <Compile Include="VirtualMethodTestClass.cpp" />
+    <Compile Include="NUnit.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="NUnit.h" />
   </ItemGroup>
 </Project>

CPPTestLib/CSimpleClass.cpp

@@ -8,11 +8,9 @@
  */
 
 #include <stdio.h>
+#include "NUnit.h"
 
-/* The classes below are exported */
+class EXPORT CSimpleClass {
-#pragma GCC visibility push(default)
-
-class CSimpleClass {
 public:
       int value;
       CSimpleClass (int value) : value (value)
@@ -54,7 +52,7 @@ public:
       }
 };
 
-class CSimpleSubClass : CSimpleClass {
+class EXPORT CSimpleSubClass : CSimpleClass {
 public:
         CSimpleSubClass (int value) : CSimpleClass (value)
         {
@@ -82,5 +80,3 @@ extern "C" {
                 delete obj;
         }
 }
-
-#pragma GCC visibility pop

CPPTestLib/NUnit.cpp

@@ -0,0 +1,13 @@
+
+#include "TestFramework.h"
+
+NUnit* NUnit::Assert;
+
+extern "C" {
+	
+	void SetNUnitInterface (NUnit* nunit)
+	{
+		NUnit::Assert = nunit;
+	}
+	
+}

CPPTestLib/NUnit.h

@@ -0,0 +1,106 @@
+
+#ifndef _CPPINTEROP_TESTFRAMEWORK_H_
+#define _CPPINTEROP_TESTFRAMEWORK_H_
+
+#ifdef __GNUC__
+#define EXPORT
+#elif defined(_MSC_VER)
+#define EXPORT __declspec(dllexport)
+#else
+#error Unknown compiler!
+#endif
+
+typedef const char* string;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+class NUnit {
+	public:
+		static NUnit* Assert;
+		
+	    virtual void Fail (string message);
+        virtual void Fail ();
+        virtual void IsTrue (bool condition, string message);
+        virtual void IsTrue (bool condition);
+        virtual void IsFalse (bool condition, string message);
+        virtual void IsFalse (bool condition);
+        virtual void IsEmpty (string aString, string message);
+        virtual void IsEmpty (string aString);
+        virtual void IsNotEmpty (string aString, string message);
+        virtual void IsNotEmpty (string aString);
+        virtual void AreEqual (int expected, int actual, string message);
+        virtual void AreEqual (int expected, int actual);
+        virtual void AreEqual (long expected, long actual, string message);
+        virtual void AreEqual (long expected, long actual);
+        virtual void AreEqual (uint expected, uint actual, string message);
+        virtual void AreEqual (uint expected, uint actual);
+        virtual void AreEqual (ulong expected, ulong actual, string message);
+        virtual void AreEqual (ulong expected, ulong actual);
+        virtual void AreEqual (double expected, double actual, double delta, string message);
+        virtual void AreEqual (double expected, double actual, double delta);
+        virtual void AreEqual (float expected, float actual, float delta, string message);
+        virtual void AreEqual (float expected, float actual, float delta);
+        virtual void AreNotEqual (int expected, int actual, string message);
+        virtual void AreNotEqual (int expected, int actual);
+        virtual void AreNotEqual (long expected, long actual, string message);
+        virtual void AreNotEqual (long expected, long actual);
+        virtual void AreNotEqual (uint expected, uint actual, string message);
+        virtual void AreNotEqual (uint expected, uint actual);
+        virtual void AreNotEqual (ulong expected, ulong actual, string message);
+        virtual void AreNotEqual (ulong expected, ulong actual);
+        virtual void AreNotEqual (double expected, double actual, string message);
+        virtual void AreNotEqual (double expected, double actual);
+        virtual void AreNotEqual (float expected, float actual, string message);
+        virtual void AreNotEqual (float expected, float actual);
+        virtual void Greater (int expected, int actual, string message);
+        virtual void Greater (int expected, int actual);
+        virtual void Greater (long expected, long actual, string message);
+        virtual void Greater (long expected, long actual);
+        virtual void Greater (uint expected, uint actual, string message);
+        virtual void Greater (uint expected, uint actual);
+        virtual void Greater (ulong expected, ulong actual, string message);
+        virtual void Greater (ulong expected, ulong actual);
+        virtual void Greater (double expected, double actual, string message);
+        virtual void Greater (double expected, double actual);
+        virtual void Greater (float expected, float actual, string message);
+        virtual void Greater (float expected, float actual);
+        virtual void Less (int expected, int actual, string message);
+        virtual void Less (int expected, int actual);
+        virtual void Less (long expected, long actual, string message);
+        virtual void Less (long expected, long actual);
+        virtual void Less (uint expected, uint actual, string message);
+        virtual void Less (uint expected, uint actual);
+        virtual void Less (ulong expected, ulong actual, string message);
+        virtual void Less (ulong expected, ulong actual);
+        virtual void Less (double expected, double actual, string message);
+        virtual void Less (double expected, double actual);
+        virtual void Less (float expected, float actual, string message);
+        virtual void Less (float expected, float actual);
+        virtual void GreaterOrEqual (int expected, int actual, string message);
+        virtual void GreaterOrEqual (int expected, int actual);
+        virtual void GreaterOrEqual (long expected, long actual, string message);
+        virtual void GreaterOrEqual (long expected, long actual);
+        virtual void GreaterOrEqual (uint expected, uint actual, string message);
+        virtual void GreaterOrEqual (uint expected, uint actual);
+        virtual void GreaterOrEqual (ulong expected, ulong actual, string message);
+        virtual void GreaterOrEqual (ulong expected, ulong actual);
+        virtual void GreaterOrEqual (double expected, double actual, string message);
+        virtual void GreaterOrEqual (double expected, double actual);
+        virtual void GreaterOrEqual (float expected, float actual, string message);
+        virtual void GreaterOrEqual (float expected, float actual);
+        virtual void LessOrEqual (int expected, int actual, string message);
+        virtual void LessOrEqual (int expected, int actual);
+        virtual void LessOrEqual (long expected, long actual, string message);
+        virtual void LessOrEqual (long expected, long actual);
+        virtual void LessOrEqual (uint expected, uint actual, string message);
+        virtual void LessOrEqual (uint expected, uint actual);
+        virtual void LessOrEqual (ulong expected, ulong actual, string message);
+        virtual void LessOrEqual (ulong expected, ulong actual);
+        virtual void LessOrEqual (double expected, double actual, string message);
+        virtual void LessOrEqual (double expected, double actual);
+        virtual void LessOrEqual (float expected, float actual, string message);
+        virtual void LessOrEqual (float expected, float actual);
+};
+
+
+#endif /* _CPPINTEROP_TESTFRAMEWORK_H_ */

CPPTestLib/VirtualMethodTestClass.cpp

@@ -0,0 +1,25 @@
+
+#include "NUnit.h"
+
+class EXPORT VirtualMethodTestClass {
+	
+	virtual void V0 (int a1, int a2, int a3)
+	{
+		NUnit::Assert->AreEqual (1, a1, "V0 #A1");
+		NUnit::Assert->AreEqual (2, a2, "V0 #A2");
+		NUnit::Assert->AreEqual (3, a3, "V0 #A3");
+	}
+	
+};
+
+extern "C" {
+	VirtualMethodTestClass* CreateVirtualMethodTestClass ()
+	{
+		return new VirtualMethodTestClass ();
+	}
+	
+	void DestroyVirtualMethodTestClass (VirtualMethodTestClass* vmtc)
+	{
+		delete vmtc;
+	}
+}

Mono.VisualC.Interop/ABI/CppAbi.cs

@@ -136,9 +136,8 @@ namespace Mono.VisualC.Interop.ABI {
 
                 protected virtual void DefineImplType ()
                 {
-
+                        string implTypeName = interface_type.Name + "_" + layout_type.Name + "_" + this.GetType ().Name + "_Impl";
-                        impl_type = impl_module.DefineType (interface_type.Name + "_" + layout_type.Name + "_Impl",
+                        impl_type = impl_module.DefineType (implTypeName, TypeAttributes.Class | TypeAttributes.Sealed);
-                                                          TypeAttributes.Class | TypeAttributes.Sealed);
                         impl_type.AddInterfaceImplementation (interface_type);
 
                         vtable_field = impl_type.DefineField ("_vtable", typeof (VTable), FieldAttributes.InitOnly | FieldAttributes.Private);
@@ -267,6 +266,9 @@ namespace Mono.VisualC.Interop.ABI {
                  */
                 protected virtual Delegate GetManagedOverrideTrampoline (MethodInfo interfaceMethod, MemberFilter binder)
                 {
+                        if (wrapper_type == null)
+                                return null;
+
                         MethodInfo targetMethod = FindManagedOverrideTarget (interfaceMethod, binder);
                         if (targetMethod == null)
                                 return null;
@@ -285,12 +287,12 @@ namespace Mono.VisualC.Interop.ABI {
 
                         // for static methods:
                         OpCode callInstruction = OpCodes.Call;
-                        int argLoadStart = 0;
+                        int argLoadStart = 1;
 
                         // for instance methods, we need an instance to call them on!
                         if (!targetMethod.IsStatic) {
                                 callInstruction = OpCodes.Callvirt;
-                                argLoadStart = 1;
+                                //argLoadStart = 1;
 
                                 il.Emit (OpCodes.Ldarg_0);
                                 il.Emit (OpCodes.Ldc_I4, NativeSize);

Mono.VisualC.Interop/CppInstancePtr.cs

@@ -22,6 +22,8 @@ namespace Mono.VisualC.Interop {
 
                 private static Dictionary<Type,object> implCache = new Dictionary<Type,object> ();
 
+                // TODO: the managed instance argument may only be NULL if all methods in TWrapper
+                //  that correspond to the virtual methods in Iface are static.
                 public static CppInstancePtr ForManagedObject<Iface,TWrapper> (TWrapper managed)
                         where Iface : ICppClassOverridable<TWrapper>
                 {

Mono.VisualC.Interop/CppLibrary.cs

@@ -55,7 +55,17 @@ namespace Mono.VisualC.Interop {
 			get { return abi; }
 		}
 
-		// For a class that may have fields with no virtual methods to be overridden
+                // For working with a class that you are not instantiating
+                //  from managed code and where access to fields is not necessary
+                public Iface GetClass<Iface> (string className)
+                                where Iface : ICppClass
+                {
+
+                        return Abi.ImplementClass<Iface> (null, Name, className);
+                }
+
+                // For instantiating or working with a class that may have fields
+                //  but where overriding virtual methods in managed code is not necessary
 		public Iface GetClass<Iface,NativeLayout> (string className)
                                 where Iface : ICppClassInstantiatable
                                 where NativeLayout : struct
@@ -64,7 +74,11 @@ namespace Mono.VisualC.Interop {
 			return Abi.ImplementClass<Iface, NativeLayout> (null, Name, className);
 		}
 
-		// For a class that may have fields and virtual methods to be overridden
+		/* The most powerful override. Allows the following from managed code:
+                 *      + Instantiation
+                 *      + Field access
+                 *      + Virtual method overriding
+                 */
 		public Iface GetClass<Iface,NativeLayout,Managed> (string className)
                                 where Iface : ICppClassOverridable<Managed>
                                 where NativeLayout : struct
@@ -73,9 +87,6 @@ namespace Mono.VisualC.Interop {
 
 			return Abi.ImplementClass<Iface, NativeLayout> (typeof (Managed), Name, className);
 		}
-		// TODO: Define a method for pure virtual classes (no NativeLayout)?
-
-
-	}
 
+        }
 }

Mono.VisualC.Interop/Interfaces.cs

@@ -17,11 +17,11 @@ namespace Mono.VisualC.Interop {
 
         public interface ICppClass {
                 VTable ClassVTable { get; }
-                void Destruct (CppInstancePtr instance);
         }
 
         public interface ICppClassInstantiatable : ICppClass {
                 CppInstancePtr Alloc ();
+                void Destruct (CppInstancePtr instance);
         }
 
         // It is recommended that managed wrappers implement ICppObject, but
@@ -29,5 +29,6 @@ namespace Mono.VisualC.Interop {
         //  C++ via CppInstancePtr.ForManagedObject.
         public interface ICppClassOverridable<T> : ICppClass /* where T : ICppObject */ {
                 CppInstancePtr Alloc (T managed);
+                void Destruct (CppInstancePtr instance);
         }
 }

Mono.VisualC.Interop/Util.cs

@@ -12,9 +12,14 @@ namespace Mono.VisualC.Interop {
 
                 public static Type GetDelegateTypeForMethodInfo (ModuleBuilder mod, MethodInfo targetMethod)
                 {
+                        // TODO: Actually return the same delegate type instead of creating a new one if
+                        //  a suitable type already exists??
+                        string delTypeName = mod.Name + "_" + targetMethod.Name + "_VTdel";
+                        while (mod.GetType (delTypeName) != null)
+                                delTypeName += "_";
 
                         TypeAttributes typeAttr = TypeAttributes.Class | TypeAttributes.Sealed | TypeAttributes.AnsiClass | TypeAttributes.AutoClass;
-                        TypeBuilder del = mod.DefineType (mod.Name + "_" + targetMethod.Name + "_VTdel", typeAttr, typeof(MulticastDelegate));
+                        TypeBuilder del = mod.DefineType (delTypeName, typeAttr, typeof(MulticastDelegate));
 
 
                         MethodAttributes ctorAttr = MethodAttributes.RTSpecialName | MethodAttributes.HideBySig | MethodAttributes.Public;

Tests/CppInstancePtrTests.cs

@@ -16,7 +16,7 @@ using Tests.Support;
 
 namespace Tests {
         [TestFixture]
-        public class CppInstancePtrTests : CPPTestLibBase {
+        public class CppInstancePtrTests {
 
                 static CppInstancePtr uninitialized;
 
@@ -24,16 +24,24 @@ namespace Tests {
                 [ExpectedException (typeof (ObjectDisposedException))]
                 public void TestUninitialized ()
                 {
-                        Assert.IsFalse (uninitialized.IsManagedAlloc, "cppip.IsManagedAlloc");
+                        Assert.IsFalse (uninitialized.IsManagedAlloc, "#A1");
-                        Assert.AreEqual (IntPtr.Zero, uninitialized.Native, "cppip.Native wasn't null pointer");
+                        Assert.AreEqual (IntPtr.Zero, uninitialized.Native, "#A2");
                 }
 
                 [Test]
                 public void TestForManagedObject ()
                 {
-                        CppInstancePtr cppip = CppInstancePtr.ForManagedObject<EmptyTestInterface,CPPTestLibBase> (this);
+                        CppInstancePtr cppip = CppInstancePtr.ForManagedObject<EmptyTestInterface,CppMockObject> (CppMockObject.Instance);
-                        Assert.AreNotEqual (IntPtr.Zero, cppip.Native, "cppip.Native was null pointer");
+                        Assert.AreNotEqual (IntPtr.Zero, cppip.Native, "#A1");
-                        Assert.IsTrue (cppip.IsManagedAlloc, "cppip.IsManagedAlloc was not true");
+                        Assert.IsTrue (cppip.IsManagedAlloc, "#A2");
+                        cppip.Dispose ();
+                }
+
+                [Test]
+                [ExpectedException (typeof(ArgumentNullException))]
+                public void TestForNonStaticWrapperWithNull ()
+                {
+                        CppInstancePtr cppip = CppInstancePtr.ForManagedObject<CSimpleClass.ICSimpleClass,CSimpleClass> (null);
                         cppip.Dispose ();
                 }
 
@@ -41,7 +49,7 @@ namespace Tests {
                 [ExpectedException (typeof (ObjectDisposedException))]
                 public void TestDisposed ()
                 {
-                        CppInstancePtr cppip = CppInstancePtr.ForManagedObject<EmptyTestInterface,CPPTestLibBase> (this);
+                        CppInstancePtr cppip = CppInstancePtr.ForManagedObject<EmptyTestInterface,CppMockObject> (CppMockObject.Instance);
                         cppip.Dispose ();
                         // should throw
                         Console.WriteLine (cppip.Native);
@@ -53,7 +61,7 @@ namespace Tests {
                         IntPtr native = CreateCSimpleSubClass (0);
                         CppInstancePtr cppip = new CppInstancePtr (native);
                         Assert.AreEqual (native, cppip.Native);
-                        Assert.IsFalse (cppip.IsManagedAlloc, "cppip.IsManagedAlloc was not false");
+                        Assert.IsFalse (cppip.IsManagedAlloc, "#A1");
                         cppip.Dispose ();
                         DestroyCSimpleSubClass (native);
                 }

Tests/CppLibraryTests.cs

@@ -17,7 +17,7 @@ using Tests.Support;
 
 namespace Tests {
         [TestFixture]
-        public class CppLibraryTests : CPPTestLibBase {
+        public class CppLibraryTests {
 
                 [Test]
                 [ExpectedException (typeof (ArgumentNullException))]
@@ -47,7 +47,7 @@ namespace Tests {
                 {
                         VirtualOnlyAbi abi = new VirtualOnlyAbi ();
                         CppLibrary cppl = new CppLibrary ("FooLib", abi);
-                        EmptyTestInterface klass = cppl.GetClass<EmptyTestInterface,EmptyTestStruct,CPPTestLibBase> ("FooClass");
+                        EmptyTestInterface klass = cppl.GetClass<EmptyTestInterface,EmptyTestStruct,CppMockObject> ("FooClass");
                         Assert.IsNotNull (klass, "#A1");
                 }
         }

Tests/ItaniumAbiTests.cs

@@ -10,17 +10,16 @@
 using System;
 using NUnit.Framework;
 
-using Mono.VisualC.Interop;
 using Mono.VisualC.Interop.ABI;
-using Tests.Support;
 
 namespace Tests {
         [TestFixture]
-        public class ItaniumAbiTests : CPPTestLibBase {
+        public class ItaniumAbiTests : SharedAbiTests {
 
                 public ItaniumAbiTests () : base (new ItaniumAbi ())
                 {
                 }
+                
         }
 }
 

Tests/MsvcAbiTests.cs

@@ -10,13 +10,11 @@
 using System;
 using NUnit.Framework;
 
-using Mono.VisualC.Interop;
 using Mono.VisualC.Interop.ABI;
-using Tests.Support;
 
 namespace Tests {
         [TestFixture]
-        public class MsvcAbiTests : CPPTestLibBase {
+        public class MsvcAbiTests : SharedAbiTests {
 
                 public MsvcAbiTests () : base (new MsvcAbi ())
                 {

Tests/SharedAbiTests.cs

@@ -0,0 +1,34 @@
+using System;
+using NUnit.Framework;
+
+using Mono.VisualC.Interop;
+using Mono.VisualC.Interop.ABI;
+
+using Tests.Support;
+
+namespace Tests {
+        public class SharedAbiTests {
+
+                protected CppLibrary test_lib { get; private set; }
+                protected IVirtualMethodTestClass virtual_test_class { get; private set; }
+
+                protected SharedAbiTests (CppAbi abi)
+                {
+                        this.test_lib = new CppLibrary ("CPPTestLib", abi);
+                        this.virtual_test_class = test_lib.GetClass<IVirtualMethodTestClass> ("VirtualMethodTestClass");
+                        CppNUnitAsserts.Init ();
+                }
+
+                [Test]
+                public void TestVirtualMethods ()
+                {
+                        CppInstancePtr vmtc = VirtualMethodTestClass.Create ();
+
+                        virtual_test_class.V0 (vmtc, 1, 2, 3);
+
+                        VirtualMethodTestClass.Destroy (vmtc);
+                }
+                
+        }
+}
+

Tests/Support/CPPTestLibBase.cs

@@ -1,49 +0,0 @@
-using System;
-using NUnit.Framework;
-
-using Mono.VisualC.Interop;
-using Mono.VisualC.Interop.ABI;
-
-namespace Tests.Support {
-        public class CPPTestLibBase : ICppObject {
-
-                protected CppLibrary TestLib { get; private set; }
-
-                protected CPPTestLibBase ()
-                {
-                }
-
-                protected CPPTestLibBase (CppAbi abi)
-                {
-                        this.TestLib = new CppLibrary ("CPPTestLib", abi);
-                }
-
-
-                protected CSimpleClass.ICSimpleClass Klass {
-                        get {
-                                if (CSimpleClass._impl == null)
-                                        CSimpleClass.Bind (TestLib);
-                                return CSimpleClass._impl;
-                        }
-                }
-                public IntPtr Native {
-                        get {
-                                throw new System.NotImplementedException ();
-                        }
-                }
-
-                public void Dispose ()
-                {
-                        throw new System.NotImplementedException ();
-                }
-                
-
-        }
-
-        public interface EmptyTestInterface : ICppClassOverridable<CPPTestLibBase> {
-        }
-
-        public struct EmptyTestStruct {
-        }
-}
-

Tests/Support/CSimpleClass.cs

@@ -35,65 +35,64 @@ namespace Tests.Support {
 		}
                 #endregion
 
-		public static ICSimpleClass _impl;
+		private CppInstancePtr native;
+                private ICSimpleClass impl;
 
-		public static void Bind(CppLibrary lib) {
+		public CSimpleClass(ICSimpleClass impl, int value) {
-			_impl = lib.GetClass<ICSimpleClass,_CSimpleClass,CSimpleClass>("CSimpleClass");
+                        this.impl = impl;
+			this.native = impl.Alloc(this);
+                        impl.CSimpleClass(native, value);
 		}
 
-		private CppInstancePtr _native;
+		public CSimpleClass(ICSimpleClass impl, IntPtr native) {
-
+                        this.impl = impl;
-		public CSimpleClass(int value) {
+			this.native = native;
-			_native = _impl.Alloc(this);
-                        _impl.CSimpleClass(_native, value);
 		}
 
-		public CSimpleClass(IntPtr native) {
+		public IntPtr Native {
-			_native = native;
+			get { return (IntPtr)native; }
 		}
 
-		public virtual IntPtr Native {
+                public ICSimpleClass Implementation {
-			get {
+                        get { return impl; }
-				return (IntPtr)_native;
+                }
-			}
-		}
 
 		public virtual int value {
 			get {
-				return _impl.value[_native];
+				return impl.value[native];
 			}
 			set {
-				_impl.value[_native] = value;
+				impl.value[native] = value;
 			}
 		}
 
 		public void M0() {
-			_impl.M0(_native);
+			impl.M0(native);
 		}
 
 		public void M1(int x) {
-	                _impl.M1(_native, x);
+	                impl.M1(native, x);
 	        }
 
 		public void M2(int x, int y) {
-			_impl.M2(_native, x, y);
+			impl.M2(native, x, y);
 		}
 
 		[OverrideNative]
 		public virtual void V0(int x, int y) {
 			Console.WriteLine("Managed V0({0}, {1})", x, y);
-			_impl.V0(_native, x, y);
+			impl.V0(native, x, y);
 		}
 
 		[OverrideNative]
 		public virtual void V1(int x) {
 			Console.WriteLine("Managed V1({0})", x);
-			_impl.V1(_native, x);
+			impl.V1(native, x);
 		}
 
 		public void Dispose() {
-			_impl.Destruct(_native);
+			impl.Destruct(native);
-			_native.Dispose();
+			native.Dispose();
 		}
 	}
 

Tests/Support/CppMockObject.cs

@@ -0,0 +1,45 @@
+//
+// CPPTestLibBase.cs: Base class for supporting tests using CPPTestLib
+//
+// Author:
+//   Alexander Corrado (alexander.corrado@gmail.com)
+//
+// Copyright (C) 2010 Alexander Corrado
+//
+
+using System;
+using NUnit.Framework;
+
+using Mono.VisualC.Interop;
+using Mono.VisualC.Interop.ABI;
+
+namespace Tests.Support {
+        public class CppMockObject : ICppObject {
+
+                public static CppMockObject Instance = new CppMockObject ();
+
+                protected CppMockObject ()
+                {
+                }
+
+                public IntPtr Native {
+                        get {
+                                throw new System.NotImplementedException ();
+                        }
+                }
+
+                public void Dispose ()
+                {
+                        throw new System.NotImplementedException ();
+                }
+                
+
+        }
+
+        public interface EmptyTestInterface : ICppClassOverridable<CppMockObject> {
+        }
+
+        public struct EmptyTestStruct {
+        }
+}
+

Tests/Support/CppNUnitAsserts.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Runtime.InteropServices;
+using NUnit.Framework;
+using Mono.VisualC.Interop;
+
+namespace Tests.Support {
+        public static class CppNUnitAsserts {
+
+                private interface IAssert : ICppClassOverridable<Assert> {
+                        [Virtual] void Fail (CppInstancePtr @this, string message);
+                        [Virtual] void Fail (CppInstancePtr @this);
+                        [Virtual] void IsTrue (CppInstancePtr @this, bool condition, string message);
+                        [Virtual] void IsTrue (CppInstancePtr @this, bool condition);
+                        [Virtual] void IsFalse (CppInstancePtr @this, bool condition, string message);
+                        [Virtual] void IsFalse (CppInstancePtr @this, bool condition);
+                        [Virtual] void IsEmpty (CppInstancePtr @this, string aString, string message);
+                        [Virtual] void IsEmpty (CppInstancePtr @this, string aString);
+                        [Virtual] void IsNotEmpty (CppInstancePtr @this, string aString, string message);
+                        [Virtual] void IsNotEmpty (CppInstancePtr @this, string aString);
+                        [Virtual] void AreEqual (CppInstancePtr @this, int expected, int actual, string message);
+                        [Virtual] void AreEqual (CppInstancePtr @this, int expected, int actual);
+                        [Virtual] void AreEqual (CppInstancePtr @this, long expected, long actual, string message);
+                        [Virtual] void AreEqual (CppInstancePtr @this, long expected, long actual);
+                        [Virtual] void AreEqual (CppInstancePtr @this, uint expected, uint actual, string message);
+                        [Virtual] void AreEqual (CppInstancePtr @this, uint expected, uint actual);
+                        [Virtual] void AreEqual (CppInstancePtr @this, ulong expected, ulong actual, string message);
+                        [Virtual] void AreEqual (CppInstancePtr @this, ulong expected, ulong actual);
+                        [Virtual] void AreEqual (CppInstancePtr @this, double expected, double actual, double delta, string message);
+                        [Virtual] void AreEqual (CppInstancePtr @this, double expected, double actual, double delta);
+                        [Virtual] void AreEqual (CppInstancePtr @this, float expected, float actual, float delta, string message);
+                        [Virtual] void AreEqual (CppInstancePtr @this, float expected, float actual, float delta);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, int expected, int actual, string message);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, int expected, int actual);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, long expected, long actual, string message);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, long expected, long actual);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, uint expected, uint actual, string message);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, uint expected, uint actual);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, ulong expected, ulong actual, string message);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, ulong expected, ulong actual);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, double expected, double actual, string message);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, double expected, double actual);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, float expected, float actual, string message);
+                        [Virtual] void AreNotEqual (CppInstancePtr @this, float expected, float actual);
+                        [Virtual] void Greater (CppInstancePtr @this, int expected, int actual, string message);
+                        [Virtual] void Greater (CppInstancePtr @this, int expected, int actual);
+                        [Virtual] void Greater (CppInstancePtr @this, long expected, long actual, string message);
+                        [Virtual] void Greater (CppInstancePtr @this, long expected, long actual);
+                        [Virtual] void Greater (CppInstancePtr @this, uint expected, uint actual, string message);
+                        [Virtual] void Greater (CppInstancePtr @this, uint expected, uint actual);
+                        [Virtual] void Greater (CppInstancePtr @this, ulong expected, ulong actual, string message);
+                        [Virtual] void Greater (CppInstancePtr @this, ulong expected, ulong actual);
+                        [Virtual] void Greater (CppInstancePtr @this, double expected, double actual, string message);
+                        [Virtual] void Greater (CppInstancePtr @this, double expected, double actual);
+                        [Virtual] void Greater (CppInstancePtr @this, float expected, float actual, string message);
+                        [Virtual] void Greater (CppInstancePtr @this, float expected, float actual);
+                        [Virtual] void Less (CppInstancePtr @this, int expected, int actual, string message);
+                        [Virtual] void Less (CppInstancePtr @this, int expected, int actual);
+                        [Virtual] void Less (CppInstancePtr @this, long expected, long actual, string message);
+                        [Virtual] void Less (CppInstancePtr @this, long expected, long actual);
+                        [Virtual] void Less (CppInstancePtr @this, uint expected, uint actual, string message);
+                        [Virtual] void Less (CppInstancePtr @this, uint expected, uint actual);
+                        [Virtual] void Less (CppInstancePtr @this, ulong expected, ulong actual, string message);
+                        [Virtual] void Less (CppInstancePtr @this, ulong expected, ulong actual);
+                        [Virtual] void Less (CppInstancePtr @this, double expected, double actual, string message);
+                        [Virtual] void Less (CppInstancePtr @this, double expected, double actual);
+                        [Virtual] void Less (CppInstancePtr @this, float expected, float actual, string message);
+                        [Virtual] void Less (CppInstancePtr @this, float expected, float actual);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, int expected, int actual, string message);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, int expected, int actual);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, long expected, long actual, string message);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, long expected, long actual);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, uint expected, uint actual, string message);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, uint expected, uint actual);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, ulong expected, ulong actual, string message);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, ulong expected, ulong actual);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, double expected, double actual, string message);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, double expected, double actual);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, float expected, float actual, string message);
+                        [Virtual] void GreaterOrEqual (CppInstancePtr @this, float expected, float actual);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, int expected, int actual, string message);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, int expected, int actual);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, long expected, long actual, string message);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, long expected, long actual);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, uint expected, uint actual, string message);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, uint expected, uint actual);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, ulong expected, ulong actual, string message);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, ulong expected, ulong actual);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, double expected, double actual, string message);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, double expected, double actual);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, float expected, float actual, string message);
+                        [Virtual] void LessOrEqual (CppInstancePtr @this, float expected, float actual);
+                }
+
+                private static CppInstancePtr? nunitInterface;
+                public static void Init ()
+                {
+                        if (!nunitInterface.HasValue)
+                                nunitInterface = CppInstancePtr.ForManagedObject<IAssert,Assert> (null);
+
+                        SetNUnitInterface ((IntPtr)nunitInterface.Value);
+                }
+
+                [DllImport("CPPTestLib")]
+                private static extern void SetNUnitInterface (IntPtr nunit);
+        }
+}
+

Tests/Support/VirtualMethodTestClass.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Runtime.InteropServices;
+using Mono.VisualC.Interop;
+
+namespace Tests
+{
+        public interface IVirtualMethodTestClass : ICppClass {
+                [Virtual] void V0 (CppInstancePtr @this, int a1, int a2, int a3);
+        }
+
+        public static class VirtualMethodTestClass {
+
+                public static CppInstancePtr Create ()
+                {
+                        return CreateVirtualMethodTestClass ();
+                }
+
+                public static void Destroy (CppInstancePtr vmtc)
+                {
+                        DestroyVirtualMethodTestClass ((IntPtr)vmtc);
+                }
+
+
+                [DllImport("CPPTestLib")]
+                private static extern IntPtr CreateVirtualMethodTestClass ();
+
+                [DllImport("CPPTestLib")]
+                private static extern void DestroyVirtualMethodTestClass (IntPtr vmtc);
+        }
+
+}
+

Tests/Tests.csproj

@@ -38,11 +38,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CppInstancePtrTests.cs" />
-    <Compile Include="Support\CPPTestLibBase.cs" />
     <Compile Include="Support\CSimpleClass.cs" />
     <Compile Include="CppLibraryTests.cs" />
     <Compile Include="ItaniumAbiTests.cs" />
     <Compile Include="MsvcAbiTests.cs" />
+    <Compile Include="Support\CppMockObject.cs" />
+    <Compile Include="Support\CppNUnitAsserts.cs" />
+    <Compile Include="SharedAbiTests.cs" />
+    <Compile Include="Support\VirtualMethodTestClass.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>