From 601ef7f28fc7a7f47bdcd644282fb965b83a6c79 Mon Sep 17 00:00:00 2001
From: Alex Corrado <alexander.corrado@gmail.com>
Date: Tue, 14 Jun 2011 00:10:36 -0400
Subject: [PATCH] Add failing virtual dispatch tests

---
 tests/Native/VirtualTests.h |  1 +
 tests/VirtualTests.cs       | 47 +++++++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/tests/Native/VirtualTests.h b/tests/Native/VirtualTests.h
index 2a93664c..7ffc25fc 100644
--- a/tests/Native/VirtualTests.h
+++ b/tests/Native/VirtualTests.h
@@ -35,6 +35,7 @@ class ClassWithNonVirtualBases : public AdderClass, public MultiplierClass {
 public:
 	// num is not shared between AdderClass and MultiplierClass; Add and Multiply should operate on different numbers
 	ClassWithNonVirtualBases (int addN, int multN) : AdderClass (addN), MultiplierClass (multN) {}
+	virtual void CallMultiply (int n) { this->Multiply (n); }
 };
 class ClassWithVirtualBases : public AdderClassWithVirtualBase, public MultiplierClassWithVirtualBase {
 public:
diff --git a/tests/VirtualTests.cs b/tests/VirtualTests.cs
index 380ab8c0..7200a1e5 100644
--- a/tests/VirtualTests.cs
+++ b/tests/VirtualTests.cs
@@ -25,7 +25,6 @@ namespace Tests {
 		}
 
 		[Test]
-		[Ignore ("virtual inheritance not implemented yet")]
 		public void TestVirtualCallOnVirtualBaseClass ()
 		{
 			var cls = new AdderClassWithVirtualBase (8);
@@ -52,7 +51,6 @@ namespace Tests {
 		}
 
 		[Test]
-		[Ignore ("virtual inheritance not implemented yet")]
 		public void TestMultipleVirtualBases ()
 		{
 			var cls = new ClassWithVirtualBases (4);
@@ -78,6 +76,51 @@ namespace Tests {
 			Assert.AreEqual (5, cls.BaseNumber, "#4");
 		}
 
+		class ManagedOverride1 : NumberClass {
+
+			public ManagedOverride1 () : base (3)
+			{
+			}
+
+			public override int Number {
+				get {
+					return 25;
+				}
+			}
+		}
+
+		[Test]
+		public void TestManagedOverride1 ()
+		{
+			var cls = new ManagedOverride1 ();
+			Assert.AreEqual (-25, cls.NegativeNumber, "#1");
+		}
+
+		class ManagedOverride2 : ClassWithNonVirtualBases {
+
+			public ManagedOverride2 () : base (5, 3)
+			{
+			}
+
+			// override virtual member inherited from non-primary base
+			public override void Multiply (int n)
+			{
+				this.MultiplierClass.Multiply (10);
+			}
+		}
+
+		[Test]
+		public void TestManagedOverride2 ()
+		{
+			var cls = new ManagedOverride2 ();
+			cls.Multiply (3);
+			Assert.AreEqual (5, cls.Number, "#1");
+			Assert.AreEqual (30, ((MultiplierClass)cls).Number, "#2");
+			cls.CallMultiply (2);
+			Assert.AreEqual (5, cls.Number, "#3");
+			Assert.AreEqual (300, ((MultiplierClass)cls).Number, "#4");
+		}
+
 
 	}
 }