fix vector3 tests and also actually fix vector3 init cuz I forgot to before

Author: Matiiss

src_c/math.c

@@ -2725,20 +2725,24 @@ static int
 _vector3_set(pgVector *self, PyObject *xOrSequence, PyObject *y, PyObject *z)
 {
     if (xOrSequence) {
-        if (RealNumber_Check(xOrSequence)) {
-            self->coords[0] = PyFloat_AsDouble(xOrSequence);
-            /* scalar constructor. */
-            if (y == NULL && z == NULL) {
-                self->coords[1] = self->coords[0];
-                self->coords[2] = self->coords[0];
+        if (pgVectorCompatible_Check(xOrSequence, self->dim)) {
+            if (!PySequence_AsVectorCoords(xOrSequence, self->coords, 3)) {
+                return -1;
+            }
+            else {
                 return 0;
             }
         }
-        else if (pgVectorCompatible_Check(xOrSequence, self->dim)) {
-            if (!PySequence_AsVectorCoords(xOrSequence, self->coords, 3)) {
+        else if (RealNumber_Check(xOrSequence)) {
+            self->coords[0] = PyFloat_AsDouble(xOrSequence);
+            if (self->coords[0] == -1.0 && PyErr_Occurred()) {
                 return -1;
             }
-            else {
+
+            /* scalar constructor. */
+            if (y == NULL && z == NULL) {
+                self->coords[1] = self->coords[0];
+                self->coords[2] = self->coords[0];
                 return 0;
             }
         }
@@ -2771,7 +2775,14 @@ _vector3_set(pgVector *self, PyObject *xOrSequence, PyObject *y, PyObject *z)
     else if (y && z) {
         if (RealNumber_Check(y) && RealNumber_Check(z)) {
             self->coords[1] = PyFloat_AsDouble(y);
+            if (self->coords[1] == -1.0 && PyErr_Occurred()) {
+                return -1;
+            }
+
             self->coords[2] = PyFloat_AsDouble(z);
+            if (self->coords[2] == -1.0 && PyErr_Occurred()) {
+                return -1;
+            }
         }
         else {
             goto error;

test/math_test.py

@@ -1486,14 +1486,15 @@ def __float__(self):
                 raise TypeError("Cannot convert to float")
 
             def __getitem__(self, index):
-                return [1, 0][index]
+                return [1, 0, 5][index]
 
             def __len__(self):
-                return 2
+                return 3
 
-        v = Vector2(NumericSequence())
+        v = Vector3(NumericSequence())
         self.assertEqual(v.x, 1.0)
         self.assertEqual(v.y, 0.0)
+        self.assertEqual(v.z, 5.0)
 
     def testConstructionNumericNonFloat(self):
         class NumericNonFloat:
@@ -1503,22 +1504,26 @@ def __float__(self):
                 raise TypeError("Cannot convert to float")
 
         with self.assertRaises(TypeError):
-            Vector2(NumericNonFloat())
+            Vector3(NumericNonFloat())
 
         with self.assertRaises(TypeError):
-            Vector2(NumericNonFloat(), NumericNonFloat())
+            Vector3(NumericNonFloat(), NumericNonFloat(), NumericNonFloat())
 
         with self.assertRaises(TypeError):
-            Vector2(1.0, NumericNonFloat())
+            Vector3(1.0, NumericNonFloat(), 5.0)
+
+        with self.assertRaises(TypeError):
+            Vector3(1.0, 0.0, NumericNonFloat())
 
     @unittest.skipIf(numpy is None, "numpy not available")
     def testConstructionNumpyArray(self):
         assert numpy is not None
 
-        arr = numpy.array([1.2, 3.4])
-        v = Vector2(arr)
+        arr = numpy.array([1.2, 3.4, 5.6], dtype=float)
+        v = Vector3(arr)
         self.assertEqual(v.x, 1.2)
         self.assertEqual(v.y, 3.4)
+        self.assertEqual(v.z, 5.6)
 
     def testAttributeAccess(self):
         tmp = self.v1.x