From 3ae8ca093561c0abc36022290f52e41983600e5f Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 20 Apr 2010 15:13:23 -0400 Subject: Use a more obvious dummy string when testing type-checking Various tests that ensured type-checking was rejecting strings were using string literals that resembled valid values. This was confusing, so instead we now use "foo" throughout to make it clear that we're dealing with string values. --- tests/test_gi.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/test_gi.py b/tests/test_gi.py index 41a12e2..31d6e5a 100644 --- a/tests/test_gi.py +++ b/tests/test_gi.py @@ -122,7 +122,7 @@ class TestInt8(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.int8_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.int8_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.int8_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.int8_in_max, "foo") def test_int8_out(self): self.assertEquals(self.MAX, GIMarshallingTests.int8_out_max()) @@ -150,7 +150,7 @@ class TestUInt8(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.uint8_in, number) self.assertRaises(ValueError, GIMarshallingTests.uint8_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.uint8_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.uint8_in, "foo") def test_uint8_out(self): self.assertEquals(self.MAX, GIMarshallingTests.uint8_out()) @@ -181,7 +181,7 @@ class TestInt16(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.int16_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.int16_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.int16_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.int16_in_max, "foo") def test_int16_out(self): self.assertEquals(self.MAX, GIMarshallingTests.int16_out_max()) @@ -209,7 +209,7 @@ class TestUInt16(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.uint16_in, number) self.assertRaises(ValueError, GIMarshallingTests.uint16_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.uint16_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.uint16_in, "foo") def test_uint16_out(self): self.assertEquals(self.MAX, GIMarshallingTests.uint16_out()) @@ -240,7 +240,7 @@ class TestInt32(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.int32_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.int32_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.int32_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.int32_in_max, "foo") def test_int32_out(self): self.assertEquals(self.MAX, GIMarshallingTests.int32_out_max()) @@ -268,7 +268,7 @@ class TestUInt32(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.uint32_in, number) self.assertRaises(ValueError, GIMarshallingTests.uint32_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.uint32_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.uint32_in, "foo") def test_uint32_out(self): self.assertEquals(self.MAX, GIMarshallingTests.uint32_out()) @@ -299,7 +299,7 @@ class TestInt64(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.int64_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.int64_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.int64_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.int64_in_max, "foo") def test_int64_out(self): self.assertEquals(self.MAX, GIMarshallingTests.int64_out_max()) @@ -327,7 +327,7 @@ class TestUInt64(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.uint64_in, number) self.assertRaises(ValueError, GIMarshallingTests.uint64_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.uint64_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.uint64_in, "foo") def test_uint64_out(self): self.assertEquals(self.MAX, GIMarshallingTests.uint64_out()) @@ -358,7 +358,7 @@ class TestShort(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.short_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.short_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.short_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.short_in_max, "foo") def test_short_out(self): self.assertEquals(self.MAX, GIMarshallingTests.short_out_max()) @@ -386,7 +386,7 @@ class TestUShort(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.ushort_in, number) self.assertRaises(ValueError, GIMarshallingTests.ushort_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.ushort_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.ushort_in, "foo") def test_ushort_out(self): self.assertEquals(self.MAX, GIMarshallingTests.ushort_out()) @@ -417,7 +417,7 @@ class TestInt(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.int_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.int_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.int_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.int_in_max, "foo") def test_int_out(self): self.assertEquals(self.MAX, GIMarshallingTests.int_out_max()) @@ -445,7 +445,7 @@ class TestUInt(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.uint_in, number) self.assertRaises(ValueError, GIMarshallingTests.uint_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.uint_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.uint_in, "foo") def test_uint_out(self): self.assertEquals(self.MAX, GIMarshallingTests.uint_out()) @@ -476,7 +476,7 @@ class TestLong(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.long_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.long_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.long_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.long_in_max, "foo") def test_long_out(self): self.assertEquals(self.MAX, GIMarshallingTests.long_out_max()) @@ -504,7 +504,7 @@ class TestULong(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.ulong_in, number) self.assertRaises(ValueError, GIMarshallingTests.ulong_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.ulong_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.ulong_in, "foo") def test_ulong_out(self): self.assertEquals(self.MAX, GIMarshallingTests.ulong_out()) @@ -535,7 +535,7 @@ class TestSSize(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.ssize_in_max, max) self.assertRaises(ValueError, GIMarshallingTests.ssize_in_min, min) - self.assertRaises(TypeError, GIMarshallingTests.ssize_in_max, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.ssize_in_max, "foo") def test_ssize_out(self): self.assertEquals(self.MAX, GIMarshallingTests.ssize_out_max()) @@ -563,7 +563,7 @@ class TestSize(unittest.TestCase): self.assertRaises(ValueError, GIMarshallingTests.size_in, number) self.assertRaises(ValueError, GIMarshallingTests.size_in, Number(-1)) - self.assertRaises(TypeError, GIMarshallingTests.size_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.size_in, "foo") def test_size_out(self): self.assertEquals(self.MAX, GIMarshallingTests.size_out()) @@ -583,7 +583,7 @@ class TestFloat(unittest.TestCase): def test_float_in(self): GIMarshallingTests.float_in(Number(self.MAX)) - self.assertRaises(TypeError, GIMarshallingTests.float_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.float_in, "foo") def test_float_out(self): self.assertAlmostEquals(self.MAX, GIMarshallingTests.float_out()) @@ -603,7 +603,7 @@ class TestDouble(unittest.TestCase): def test_double_in(self): GIMarshallingTests.double_in(Number(self.MAX)) - self.assertRaises(TypeError, GIMarshallingTests.double_in, "self.MAX") + self.assertRaises(TypeError, GIMarshallingTests.double_in, "foo") def test_double_out(self): self.assertAlmostEquals(self.MAX, GIMarshallingTests.double_out()) @@ -876,7 +876,7 @@ class TestGHashTable(unittest.TestCase): self.assertRaises(TypeError, GIMarshallingTests.ghashtable_int_none_in, {-1: 1, '0': 0, 1: -1, 2: -2}) self.assertRaises(TypeError, GIMarshallingTests.ghashtable_int_none_in, {-1: 1, 0: '0', 1: -1, 2: -2}) - self.assertRaises(TypeError, GIMarshallingTests.ghashtable_int_none_in, '{-1: 1, 0: 0, 1: -1, 2: -2}') + self.assertRaises(TypeError, GIMarshallingTests.ghashtable_int_none_in, "foo") self.assertRaises(TypeError, GIMarshallingTests.ghashtable_int_none_in, None) def test_ghashtable_utf8_none_in(self): -- cgit