added method tests for simple promotions int->float, int->double

sigbjorn · sigbjorn · commit af1b937c6b34 · 2016-07-03T14:49:57.000+02:00
diff --git a/src/testing/methodtest.cs b/src/testing/methodtest.cs
@@ -73,6 +73,24 @@ public Guid TestStructConversion(Guid v)
         {
             return v;
         }
+        /// <summary>
+        /// Method to support testing
+        ///  simple promotion of numeric types:
+        ///    
+        ///  integer types -> double
+        ///    
+        /// </summary>
+        /// <param name="a"></param>
+        /// <param name="b"></param>
+        /// <returns></returns>
+        public double TestSimpleIntToDoubleTypePromotion(double a, double b)
+        {
+            return a + b;
+        }
+        public float TestSimpleIntToFloatTypePromotion(float a, float b)
+        {
+            return a + b;
+        }
 
         public Exception TestSubclassConversion(Exception v)
         {
diff --git a/src/tests/test_method.py b/src/tests/test_method.py
@@ -208,6 +208,45 @@ def testMethodCallFlagsConversion(self):
         r = object.TestFlagsConversion(flags)
         self.assertTrue(r == flags)
 
+    def testSimpleTypePromotionIntToDouble(self):
+        object = MethodTest()
+        try:
+            sum_of_a_plus_b = object.TestSimpleIntToDoubleTypePromotion(2,2)
+            self.assertAlmostEqual(sum_of_a_plus_b,2+2)
+            sum_of_a_plus_b = object.TestSimpleIntToDoubleTypePromotion(2.0,2)
+            self.assertAlmostEqual(sum_of_a_plus_b,2+2)
+            sum_of_a_plus_b = object.TestSimpleIntToDoubleTypePromotion(2,2.0)
+            self.assertAlmostEqual(sum_of_a_plus_b,2+2)
+            sum_of_a_plus_b = object.TestSimpleIntToDoubleTypePromotion(2.0,2.0)
+            self.assertAlmostEqual(sum_of_a_plus_b,2.0+2.0)
+        except:
+            self.assertTrue(False,"Type promotion from int to double failed")
+
+        try:
+            should_fail = object.TestSimpleIntToDoubleTypePromotion(2,'2.0')
+            self.assertTrue(False,"the promotion of string to double should fail")
+        except:
+            pass
+
+    def testSimpleTypePromotionIntToFloat(self):
+        object = MethodTest()
+        try:
+            sum_of_a_plus_b = object.TestSimpleIntToFloatTypePromotion(2,2)
+            self.assertAlmostEqual(sum_of_a_plus_b,2+2)
+            sum_of_a_plus_b = object.TestSimpleIntToFloatTypePromotion(2.0,2)
+            self.assertAlmostEqual(sum_of_a_plus_b,2+2)
+            sum_of_a_plus_b = object.TestSimpleIntToFloatTypePromotion(2,2.0)
+            self.assertAlmostEqual(sum_of_a_plus_b,2+2)
+            sum_of_a_plus_b = object.TestSimpleIntToFloatTypePromotion(2.0,2.0)
+            self.assertAlmostEqual(sum_of_a_plus_b,2.0+2.0)
+        except:
+            self.assertTrue(False,"Type promotion from int to float failed")
+        try:
+            should_fail = object.TestSimpleIntToDoubleTypePromotion(2,'2.0')
+            self.assertTrue(False,"the promotion of string to float should fail")
+        except:
+            pass
+
     def testMethodCallStructConversion(self):
         """Test struct conversion in method call."""
         from System import Guid
