Vendor System.Drawing.Point for testing on .NET Core

filmor · filmor · commit 67032ea055ed · 2021-02-14T15:12:52.000+01:00
diff --git a/src/testing/arraytest.cs b/src/testing/arraytest.cs
@@ -314,4 +314,16 @@ public static Spam[][] EchoRangeAA(Spam[][] items)
             return items;
         }
     }
+
+    public struct Point
+    {
+        public Point(float x, float y)
+        {
+            X = x;
+            Y = y;
+        }
+
+        public float X { get; set; }
+        public float Y { get; set; }
+    }
 }
diff --git a/tests/fixtures/.gitkeep b/tests/fixtures/.gitkeep
diff --git a/tests/test_array.py b/tests/test_array.py
@@ -1166,10 +1166,8 @@ def test_boxed_value_type_mutation_result():
     # to accidentally write code like the following which is not really
     # mutating value types in-place but changing boxed copies.
 
-    clr.AddReference('System.Drawing')
-
-    from System.Drawing import Point
     from System import Array
+    from Python.Test import Point
 
     items = Array.CreateInstance(Point, 5)
 
diff --git a/tests/test_class.py b/tests/test_class.py
@@ -126,9 +126,7 @@ def __init__(self, v):
 def test_struct_construction():
     """Test construction of structs."""
 
-    clr.AddReference('System.Drawing')
-
-    from System.Drawing import Point
+    from Python.Test import Point
 
     p = Point()
     assert p.X == 0

Original file line number	Diff line number	Diff line change
`@@ -314,4 +314,16 @@ public static Spam[][] EchoRangeAA(Spam[][] items)`
`314`	`314`	`return items;`
`315`	`315`	`}`
`316`	`316`	`}`
	`317`	`+`
	`318`	`+ public struct Point`
	`319`	`+ {`
	`320`	`+ public Point(float x, float y)`
	`321`	`+ {`
	`322`	`+ X = x;`
	`323`	`+ Y = y;`
	`324`	`+ }`
	`325`	`+`
	`326`	`+ public float X { get; set; }`
	`327`	`+ public float Y { get; set; }`
	`328`	`+ }`
`317`	`329`	`}`