Skip to content

Commit 76da810

Browse files
committed
Fix failing testcases
More explicitly set types of ndarray input values
1 parent b5e6614 commit 76da810

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

tests/test_parameter.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_double_parameter(self):
7676
self.assertEqual(param1, param2)
7777
with self.assertWarns(UserWarning):
7878
param1 = DoubleArrayParameter(ndarray(shape=[1, 3], dtype=int32,
79-
buffer=array([-1, 2, 1000000])))
79+
buffer=array([int32(val) for val in [-1, 2, 1000000]])))
8080
self.assertEqual(param1, param2)
8181

8282
with self.assertWarns(UserWarning):
@@ -119,7 +119,7 @@ def test_float_parameter(self):
119119

120120
with self.assertWarns(UserWarning):
121121
param1 = FloatArrayParameter(ndarray(shape=[1, 3], dtype=int32,
122-
buffer=array([-1, 2, 1000000])))
122+
buffer=array([int32(val) for val in [-1, 2, 1000000]])))
123123
self.assertEqual(param1, param2)
124124

125125
with self.assertWarns(UserWarning):
@@ -148,7 +148,7 @@ def test_integer_parameter(self):
148148

149149
with self.assertWarns(UserWarning):
150150
param2 = IntegerArrayParameter(ndarray(shape=[2, 2], dtype=int32,
151-
buffer=array([-1, 1, 0x7fffffff, -0x80000000])))
151+
buffer=array([int32(val) for val in [-1, 1, 0x7fffffff, -0x80000000]])))
152152
self.assertEqual(param1, param2)
153153

154154
# a short array parameter is not the same as an int array parameter
@@ -165,7 +165,7 @@ def test_integer_parameter(self):
165165
IntegerArrayParameter([1, 256, 1.0])
166166
with self.assertRaises(TypeError):
167167
IntegerArrayParameter(ndarray(shape=[4], dtype=int64,
168-
buffer=array([-1, 1, 0x7fffffffffffffff, -0x8000000000000000])))
168+
buffer=array([int64(val) for val in [-1, 1, 0x7fffffffffffffff, -0x8000000000000000]])))
169169
with self.assertRaises(ValueError):
170170
IntegerArrayParameter(ndarray(shape=[0], dtype=int32, buffer=array([])))
171171
with self.assertRaises(TypeError):
@@ -186,7 +186,7 @@ def test_long_parameter(self):
186186

187187
with self.assertWarns(UserWarning):
188188
param2 = LongArrayParameter(ndarray(shape=[2, 2], dtype=int64,
189-
buffer=array([-1, 1, 0x7fffffffffffffff, -0x8000000000000000])))
189+
buffer=array([int64(val) for val in [-1, 1, 0x7fffffffffffffff, -0x8000000000000000]])))
190190
self.assertEqual(param1, param2)
191191

192192
# an int array parameter is not the same as a long array parameter
@@ -197,7 +197,7 @@ def test_long_parameter(self):
197197
# verify that a long array parameter based on a ndarray filled with int32s works
198198
with self.assertWarns(UserWarning):
199199
param1 = LongArrayParameter(ndarray(shape=[1, 4], dtype=int32,
200-
buffer=array([-1, 1, 0x7fffffff, -0x80000000])))
200+
buffer=array([int32(val) for val in [-1, 1, 0x7fffffff, -0x80000000]])))
201201
self.assertEqual(param1, param2)
202202

203203
with self.assertRaises(TypeError):
@@ -222,7 +222,8 @@ def test_short_parameter(self):
222222
with self.assertRaises(TypeError):
223223
ShortArrayParameter([1, 256, 1.0])
224224
with self.assertRaises(TypeError):
225-
ShortArrayParameter(ndarray(shape=[4], dtype=int32, buffer=array([-1, 1, 0x7fffffff, -0x80000000])))
225+
ShortArrayParameter(ndarray(shape=[4], dtype=int32,
226+
buffer=array([int32(val) for val in [-1, 1, 0x7fffffff, -0x80000000]])))
226227
with self.assertRaises(ValueError):
227228
ShortArrayParameter(ndarray(shape=[0], dtype=int16, buffer=array([])))
228229
with self.assertRaises(TypeError):

0 commit comments

Comments
 (0)