Fixed some broken unit test logic with InheritanceTests.

Signed-off-by: Steve <amn3sia@gmail.com>
kthompson · Feb 18, 2012 · 48122e4 · 48122e4
1 parent c15da0f
commit 48122e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/InheritanceTests.cs b/tests/InheritanceTests.cs
@@ -62,8 +62,8 @@ public void TestMultipleVirtualBases ()
 			Assert.AreEqual (9, ((MultiplierClassWithVirtualBase)cls).Number, "#4");
 
 			cls.MultiplierClassWithVirtualBase.Multiply (6);
-			Assert.AreEqual (30, cls.Number, "#5");
-			Assert.AreEqual (30, ((MultiplierClassWithVirtualBase)cls).Number, "#6");
+			Assert.AreEqual (54, cls.Number, "#5");
+            Assert.AreEqual (54, ((MultiplierClassWithVirtualBase)cls).Number, "#6");
 		}
 
 		[Test]

diff --git a/tests/Native/InheritanceTests.h b/tests/Native/InheritanceTests.h
@@ -47,7 +47,7 @@ class EXPORT ClassWithNonVirtualBases : public AdderClass, public MultiplierClas
 class EXPORT ClassWithVirtualBases : public AdderClassWithVirtualBase, public MultiplierClassWithVirtualBase {
 public:
 	// num is shared between AdderClass and MultiplierClass; Add and Multiply should both operate on n
-	ClassWithVirtualBases (int n) : NumberClass (n-2), AdderClassWithVirtualBase (n-1), MultiplierClassWithVirtualBase (n) {}
+	ClassWithVirtualBases (int n) : NumberClass (n), AdderClassWithVirtualBase (n-1), MultiplierClassWithVirtualBase (n-2) {}
 };