Show More
@@ -969,23 +969,6 b' class TestInstanceList(TraitTestBase):' | |||||
969 | _good_values = [[Foo(), Foo(), None], None] |
|
969 | _good_values = [[Foo(), Foo(), None], None] | |
970 | _bad_values = [['1', 2,], '1', [Foo]] |
|
970 | _bad_values = [['1', 2,], '1', [Foo]] | |
971 |
|
971 | |||
972 | class ForwardDeclaredInstanceListTrait(HasTraits): |
|
|||
973 |
|
||||
974 | value = List(ForwardDeclaredInstance('Foo')) |
|
|||
975 |
|
||||
976 | class TestForwardDeclaredInstanceList(TraitTestBase): |
|
|||
977 |
|
||||
978 | obj = ForwardDeclaredInstanceListTrait() |
|
|||
979 |
|
||||
980 | def test_klass(self): |
|
|||
981 | """Test that the instance klass is properly assigned.""" |
|
|||
982 | self.assertIs(self.obj.traits()['value']._trait.klass, Foo) |
|
|||
983 |
|
||||
984 | _default_value = [] |
|
|||
985 | _good_values = [[Foo(), Foo(), None], None] |
|
|||
986 | _bad_values = [['1', 2,], '1', [Foo]] |
|
|||
987 |
|
||||
988 |
|
||||
989 | class LenListTrait(HasTraits): |
|
972 | class LenListTrait(HasTraits): | |
990 |
|
973 | |||
991 | value = List(Int, [0], minlen=1, maxlen=2) |
|
974 | value = List(Int, [0], minlen=1, maxlen=2) | |
@@ -1338,17 +1321,43 b' class TestEventful(TestCase):' | |||||
1338 | # Is the output correct? |
|
1321 | # Is the output correct? | |
1339 | self.assertEqual(a.x, {c: c for c in 'bz'}) |
|
1322 | self.assertEqual(a.x, {c: c for c in 'bz'}) | |
1340 |
|
1323 | |||
|
1324 | ### | |||
|
1325 | # Traits for Forward Declaration Tests | |||
|
1326 | ### | |||
|
1327 | class ForwardDeclaredInstanceTrait(HasTraits): | |||
|
1328 | ||||
|
1329 | value = ForwardDeclaredInstance(klass='ForwardDeclaredBar') | |||
|
1330 | ||||
|
1331 | class ForwardDeclaredTypeTrait(HasTraits): | |||
|
1332 | ||||
|
1333 | value = ForwardDeclaredType(klass='ForwardDeclaredBar') | |||
|
1334 | ||||
|
1335 | class ForwardDeclaredInstanceListTrait(HasTraits): | |||
|
1336 | ||||
|
1337 | value = List(ForwardDeclaredInstance('ForwardDeclaredBar')) | |||
1341 |
|
1338 | |||
|
1339 | class ForwardDeclaredTypeListTrait(HasTraits): | |||
|
1340 | ||||
|
1341 | value = List(ForwardDeclaredType('ForwardDeclaredBar')) | |||
|
1342 | ### | |||
|
1343 | # End Traits for Forward Declaration Tests | |||
|
1344 | ### | |||
|
1345 | ||||
|
1346 | ### | |||
|
1347 | # Classes for Forward Declaration Tests | |||
|
1348 | ### | |||
1342 | class ForwardDeclaredBar(object): |
|
1349 | class ForwardDeclaredBar(object): | |
1343 | pass |
|
1350 | pass | |
1344 |
|
1351 | |||
1345 | class ForwardDeclaredBarSub(ForwardDeclaredBar): |
|
1352 | class ForwardDeclaredBarSub(ForwardDeclaredBar): | |
1346 | pass |
|
1353 | pass | |
|
1354 | ### | |||
|
1355 | # End Classes for Forward Declaration Tests | |||
|
1356 | ### | |||
1347 |
|
1357 | |||
1348 | class ForwardDeclaredInstanceTrait(HasTraits): |
|
1358 | ### | |
1349 |
|
1359 | # Forward Declaration Tests | ||
1350 | value = ForwardDeclaredInstance(klass='ForwardDeclaredBar') |
|
1360 | ### | |
1351 |
|
||||
1352 | class TestForwardDeclaredInstanceTrait(TraitTestBase): |
|
1361 | class TestForwardDeclaredInstanceTrait(TraitTestBase): | |
1353 |
|
1362 | |||
1354 | obj = ForwardDeclaredInstanceTrait() |
|
1363 | obj = ForwardDeclaredInstanceTrait() | |
@@ -1356,14 +1365,58 b' class TestForwardDeclaredInstanceTrait(TraitTestBase):' | |||||
1356 | _good_values = [None, ForwardDeclaredBar(), ForwardDeclaredBarSub()] |
|
1365 | _good_values = [None, ForwardDeclaredBar(), ForwardDeclaredBarSub()] | |
1357 | _bad_values = ['foo', 3, ForwardDeclaredBar, ForwardDeclaredBarSub] |
|
1366 | _bad_values = ['foo', 3, ForwardDeclaredBar, ForwardDeclaredBarSub] | |
1358 |
|
1367 | |||
1359 |
|
||||
1360 | class ForwardDeclaredTypeTrait(HasTraits): |
|
|||
1361 |
|
||||
1362 | value = ForwardDeclaredType(klass='ForwardDeclaredBar') |
|
|||
1363 |
|
||||
1364 | class TestForwardDeclaredInstanceTrait(TraitTestBase): |
|
1368 | class TestForwardDeclaredInstanceTrait(TraitTestBase): | |
1365 |
|
1369 | |||
1366 | obj = ForwardDeclaredTypeTrait() |
|
1370 | obj = ForwardDeclaredTypeTrait() | |
1367 | _default_value = None |
|
1371 | _default_value = None | |
1368 | _good_values = [None, ForwardDeclaredBar, ForwardDeclaredBarSub] |
|
1372 | _good_values = [None, ForwardDeclaredBar, ForwardDeclaredBarSub] | |
1369 | _bad_values = ['foo', 3, ForwardDeclaredBar(), ForwardDeclaredBarSub()] |
|
1373 | _bad_values = ['foo', 3, ForwardDeclaredBar(), ForwardDeclaredBarSub()] | |
|
1374 | ||||
|
1375 | class TestForwardDeclaredInstanceList(TraitTestBase): | |||
|
1376 | ||||
|
1377 | obj = ForwardDeclaredInstanceListTrait() | |||
|
1378 | ||||
|
1379 | def test_klass(self): | |||
|
1380 | """Test that the instance klass is properly assigned.""" | |||
|
1381 | self.assertIs(self.obj.traits()['value']._trait.klass, ForwardDeclaredBar) | |||
|
1382 | ||||
|
1383 | _default_value = [] | |||
|
1384 | _good_values = [ | |||
|
1385 | [ForwardDeclaredBar(), ForwardDeclaredBarSub(), None], | |||
|
1386 | [None], | |||
|
1387 | [], | |||
|
1388 | None, | |||
|
1389 | ] | |||
|
1390 | _bad_values = [ | |||
|
1391 | ForwardDeclaredBar(), | |||
|
1392 | [ForwardDeclaredBar(), 3], | |||
|
1393 | '1', | |||
|
1394 | # Note that this is the type, not an instance. | |||
|
1395 | [ForwardDeclaredBar] | |||
|
1396 | ] | |||
|
1397 | ||||
|
1398 | class TestForwardDeclaredTypeList(TraitTestBase): | |||
|
1399 | ||||
|
1400 | obj = ForwardDeclaredTypeListTrait() | |||
|
1401 | ||||
|
1402 | def test_klass(self): | |||
|
1403 | """Test that the instance klass is properly assigned.""" | |||
|
1404 | self.assertIs(self.obj.traits()['value']._trait.klass, ForwardDeclaredBar) | |||
|
1405 | ||||
|
1406 | _default_value = [] | |||
|
1407 | _good_values = [ | |||
|
1408 | [ForwardDeclaredBar, ForwardDeclaredBarSub, None], | |||
|
1409 | [], | |||
|
1410 | [None], | |||
|
1411 | None, | |||
|
1412 | ] | |||
|
1413 | _bad_values = [ | |||
|
1414 | ForwardDeclaredBar, | |||
|
1415 | [ForwardDeclaredBar, 3], | |||
|
1416 | '1', | |||
|
1417 | # Note that this is an instance, not the type. | |||
|
1418 | [ForwardDeclaredBar()] | |||
|
1419 | ] | |||
|
1420 | ### | |||
|
1421 | # End Forward Declaration Tests | |||
|
1422 | ### |
General Comments 0
You need to be logged in to leave comments.
Login now