switched to new references in some tests

lostmsu · lostmsu · commit e295679facc2 · 2021-10-18T22:49:22.000-07:00
diff --git a/src/embed_tests/TestConverter.cs b/src/embed_tests/TestConverter.cs
@@ -42,7 +42,7 @@ public void TestConvertSingleToManaged(
             var pyFloat = new PyFloat(testValue);
 
             object convertedValue;
-            var converted = Converter.ToManaged(pyFloat.Handle, typeof(float), out convertedValue, false);
+            var converted = Converter.ToManaged(pyFloat, typeof(float), out convertedValue, false);
 
             Assert.IsTrue(converted);
             Assert.IsTrue(((float) convertedValue).Equals(testValue));
@@ -56,7 +56,7 @@ public void TestConvertDoubleToManaged(
             var pyFloat = new PyFloat(testValue);
 
             object convertedValue;
-            var converted = Converter.ToManaged(pyFloat.Handle, typeof(double), out convertedValue, false);
+            var converted = Converter.ToManaged(pyFloat, typeof(double), out convertedValue, false);
 
             Assert.IsTrue(converted);
             Assert.IsTrue(((double) convertedValue).Equals(testValue));
@@ -77,7 +77,7 @@ public void CovertTypeError()
                     object value;
                     try
                     {
-                        bool res = Converter.ToManaged(s.Handle, type, out value, true);
+                        bool res = Converter.ToManaged(s, type, out value, true);
                         Assert.IsFalse(res);
                         var bo = Exceptions.ExceptionMatches(Exceptions.TypeError);
                         Assert.IsTrue(Exceptions.ExceptionMatches(Exceptions.TypeError)
@@ -96,13 +96,13 @@ public void ConvertOverflow()
         {
             using (var num = new PyInt(ulong.MaxValue))
             {
-                IntPtr largeNum = PyRuntime.PyNumber_Add(num.Handle, num.Handle);
+                using var largeNum = PyRuntime.PyNumber_Add(num, num);
                 try
                 {
                     object value;
                     foreach (var type in _numTypes)
                     {
-                        bool res = Converter.ToManaged(largeNum, type, out value, true);
+                        bool res = Converter.ToManaged(largeNum.BorrowOrThrow(), type, out value, true);
                         Assert.IsFalse(res);
                         Assert.IsTrue(Exceptions.ExceptionMatches(Exceptions.OverflowError));
                         Exceptions.Clear();
@@ -111,7 +111,6 @@ public void ConvertOverflow()
                 finally
                 {
                     Exceptions.Clear();
-                    PyRuntime.XDecref(largeNum);
                 }
             }
         }
@@ -147,7 +146,7 @@ public void RawListProxy()
         {
             var list = new List<string> {"hello", "world"};
             var listProxy = PyObject.FromManagedObject(list);
-            var clrObject = (CLRObject)ManagedType.GetManagedObject(listProxy.Handle);
+            var clrObject = (CLRObject)ManagedType.GetManagedObject(listProxy);
             Assert.AreSame(list, clrObject.inst);
         }
 
@@ -156,7 +155,7 @@ public void RawPyObjectProxy()
         {
             var pyObject = "hello world!".ToPython();
             var pyObjectProxy = PyObject.FromManagedObject(pyObject);
-            var clrObject = (CLRObject)ManagedType.GetManagedObject(pyObjectProxy.Handle);
+            var clrObject = (CLRObject)ManagedType.GetManagedObject(pyObjectProxy);
             Assert.AreSame(pyObject, clrObject.inst);
 
             var proxiedHandle = pyObjectProxy.GetAttr("Handle").As<IntPtr>();
diff --git a/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs
@@ -32,12 +32,11 @@ public void SetUp()
             string testPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "fixtures");
             TestContext.Out.WriteLine(testPath);
 
-            IntPtr str = Runtime.Runtime.PyString_FromString(testPath);
-            Assert.IsFalse(str == IntPtr.Zero);
+            using var str = Runtime.Runtime.PyString_FromString(testPath);
+            Assert.IsFalse(str.IsNull());
             BorrowedReference path = Runtime.Runtime.PySys_GetObject("path");
             Assert.IsFalse(path.IsNull);
-            Runtime.Runtime.PyList_Append(path, new BorrowedReference(str));
-            Runtime.Runtime.XDecref(str);
+            Runtime.Runtime.PyList_Append(path, str.Borrow());
         }
 
         [OneTimeTearDown]

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void TestConvertSingleToManaged(`
`42`	`42`	`var pyFloat = new PyFloat(testValue);`
`43`	`43`
`44`	`44`	`object convertedValue;`
`45`		`- var converted = Converter.ToManaged(pyFloat.Handle, typeof(float), out convertedValue, false);`
	`45`	`+ var converted = Converter.ToManaged(pyFloat, typeof(float), out convertedValue, false);`
`46`	`46`
`47`	`47`	`Assert.IsTrue(converted);`
`48`	`48`	`Assert.IsTrue(((float) convertedValue).Equals(testValue));`
`@@ -56,7 +56,7 @@ public void TestConvertDoubleToManaged(`
`56`	`56`	`var pyFloat = new PyFloat(testValue);`
`57`	`57`
`58`	`58`	`object convertedValue;`
`59`		`- var converted = Converter.ToManaged(pyFloat.Handle, typeof(double), out convertedValue, false);`
	`59`	`+ var converted = Converter.ToManaged(pyFloat, typeof(double), out convertedValue, false);`
`60`	`60`
`61`	`61`	`Assert.IsTrue(converted);`
`62`	`62`	`Assert.IsTrue(((double) convertedValue).Equals(testValue));`
`@@ -77,7 +77,7 @@ public void CovertTypeError()`
`77`	`77`	`object value;`
`78`	`78`	`try`
`79`	`79`	`{`
`80`		`- bool res = Converter.ToManaged(s.Handle, type, out value, true);`
	`80`	`+ bool res = Converter.ToManaged(s, type, out value, true);`
`81`	`81`	`Assert.IsFalse(res);`
`82`	`82`	`var bo = Exceptions.ExceptionMatches(Exceptions.TypeError);`
`83`	`83`	`Assert.IsTrue(Exceptions.ExceptionMatches(Exceptions.TypeError)`
`@@ -96,13 +96,13 @@ public void ConvertOverflow()`
`96`	`96`	`{`
`97`	`97`	`using (var num = new PyInt(ulong.MaxValue))`
`98`	`98`	`{`
`99`		`- IntPtr largeNum = PyRuntime.PyNumber_Add(num.Handle, num.Handle);`
	`99`	`+ using var largeNum = PyRuntime.PyNumber_Add(num, num);`
`100`	`100`	`try`
`101`	`101`	`{`
`102`	`102`	`object value;`
`103`	`103`	`foreach (var type in _numTypes)`
`104`	`104`	`{`
`105`		`- bool res = Converter.ToManaged(largeNum, type, out value, true);`
	`105`	`+ bool res = Converter.ToManaged(largeNum.BorrowOrThrow(), type, out value, true);`
`106`	`106`	`Assert.IsFalse(res);`
`107`	`107`	`Assert.IsTrue(Exceptions.ExceptionMatches(Exceptions.OverflowError));`
`108`	`108`	`Exceptions.Clear();`
`@@ -111,7 +111,6 @@ public void ConvertOverflow()`
`111`	`111`	`finally`
`112`	`112`	`{`
`113`	`113`	`Exceptions.Clear();`
`114`		`- PyRuntime.XDecref(largeNum);`
`115`	`114`	`}`
`116`	`115`	`}`
`117`	`116`	`}`
`@@ -147,7 +146,7 @@ public void RawListProxy()`
`147`	`146`	`{`
`148`	`147`	`var list = new List<string> {"hello", "world"};`
`149`	`148`	`var listProxy = PyObject.FromManagedObject(list);`
`150`		`- var clrObject = (CLRObject)ManagedType.GetManagedObject(listProxy.Handle);`
	`149`	`+ var clrObject = (CLRObject)ManagedType.GetManagedObject(listProxy);`
`151`	`150`	`Assert.AreSame(list, clrObject.inst);`
`152`	`151`	`}`
`153`	`152`
`@@ -156,7 +155,7 @@ public void RawPyObjectProxy()`
`156`	`155`	`{`
`157`	`156`	`var pyObject = "hello world!".ToPython();`
`158`	`157`	`var pyObjectProxy = PyObject.FromManagedObject(pyObject);`
`159`		`- var clrObject = (CLRObject)ManagedType.GetManagedObject(pyObjectProxy.Handle);`
	`158`	`+ var clrObject = (CLRObject)ManagedType.GetManagedObject(pyObjectProxy);`
`160`	`159`	`Assert.AreSame(pyObject, clrObject.inst);`
`161`	`160`
`162`	`161`	`var proxiedHandle = pyObjectProxy.GetAttr("Handle").As<IntPtr>();`