##// END OF EJS Templates
Merge pull request #1472 from minrk/ipexec_esc...
Merge pull request #1472 from minrk/ipexec_esc more general fix for #662 Previously, the extra readline output was only stripped from the front, but I have recently seen it (Python 3.2, OSX 10.7) elsewhere, so the replacement is now a general re.sub.

File last commit:

r5390:c82649ea
r6237:3912ea7c merge
Show More
test_traitlets.py
890 lines | 23.6 KiB | text/x-python | PythonLexer
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 # encoding: utf-8
"""
Tests for IPython.utils.traitlets.
Authors:
* Brian Granger
* Enthought, Inc. Some of the code in this file comes from enthought.traits
and is licensed under the BSD license. Also, many of the ideas also come
from enthought.traits even though our implementation is very different.
"""
#-----------------------------------------------------------------------------
Matthias BUSSONNIER
update copyright to 2011/20xx-2011...
r5390 # Copyright (C) 2008-2011 The IPython Development Team
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
Thomas Kluyver
Add ObjectName and DottedObjectName trait types for referring to Python identifiers.
r4047 import sys
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 from unittest import TestCase
from IPython.utils.traitlets import (
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 HasTraits, MetaHasTraits, TraitType, Any, CBytes,
MinRK
add Integer traitlet...
r5344 Int, Long, Integer, Float, Complex, Bytes, Unicode, TraitError,
Thomas Kluyver
Add ObjectName and DottedObjectName trait types for referring to Python identifiers.
r4047 Undefined, Type, This, Instance, TCPAddress, List, Tuple,
ObjectName, DottedObjectName
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 )
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 from IPython.utils import py3compat
MinRK
add Integer traitlet...
r5344 from IPython.testing.decorators import skipif
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
#-----------------------------------------------------------------------------
# Helper classes for testing
#-----------------------------------------------------------------------------
Dav Clark
Final changes traitlet -> trait for review
r2385 class HasTraitsStub(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 def _notify_trait(self, name, old, new):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 self._notify_name = name
self._notify_old = old
self._notify_new = new
#-----------------------------------------------------------------------------
# Test classes
#-----------------------------------------------------------------------------
Dav Clark
Final changes traitlet -> trait for review
r2385 class TestTraitType(TestCase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 def test_get_undefined(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Dav Clark
Final changes traitlet -> trait for review
r2385 a = TraitType
Brian Granger
Important changes to simplify traitlets....
r2182 a = A()
self.assertEquals(a.a, Undefined)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_set(self):
Dav Clark
Final changes traitlet -> trait for review
r2385 class A(HasTraitsStub):
a = TraitType
Brian Granger
Important changes to simplify traitlets....
r2182
a = A()
a.a = 10
self.assertEquals(a.a, 10)
self.assertEquals(a._notify_name, 'a')
self.assertEquals(a._notify_old, Undefined)
self.assertEquals(a._notify_new, 10)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_validate(self):
Dav Clark
Final changes traitlet -> trait for review
r2385 class MyTT(TraitType):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 def validate(self, inst, value):
return -1
Dav Clark
Final changes traitlet -> trait for review
r2385 class A(HasTraitsStub):
Brian Granger
Important changes to simplify traitlets....
r2182 tt = MyTT
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Important changes to simplify traitlets....
r2182 a = A()
a.tt = 10
self.assertEquals(a.tt, -1)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 def test_default_validate(self):
Dav Clark
Final changes traitlet -> trait for review
r2385 class MyIntTT(TraitType):
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 def validate(self, obj, value):
if isinstance(value, int):
return value
self.error(obj, value)
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 tt = MyIntTT(10)
a = A()
self.assertEquals(a.tt, 10)
Dav Clark
Iniital stab at renames for traitlets
r2384 # Defaults are validated when the HasTraits is instantiated
class B(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 tt = MyIntTT('bad default')
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, B)
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 def test_is_valid_for(self):
Dav Clark
Final changes traitlet -> trait for review
r2385 class MyTT(TraitType):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 def is_valid_for(self, value):
return True
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 tt = MyTT
a = A()
a.tt = 10
self.assertEquals(a.tt, 10)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_value_for(self):
Dav Clark
Final changes traitlet -> trait for review
r2385 class MyTT(TraitType):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 def value_for(self, value):
return 20
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 tt = MyTT
a = A()
a.tt = 10
self.assertEquals(a.tt, 20)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_info(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Dav Clark
Final changes traitlet -> trait for review
r2385 tt = TraitType
Brian Granger
Important changes to simplify traitlets....
r2182 a = A()
self.assertEquals(A.tt.info(), 'any value')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_error(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Dav Clark
Final changes traitlet -> trait for review
r2385 tt = TraitType
Brian Granger
Important changes to simplify traitlets....
r2182 a = A()
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, A.tt.error, a, 10)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Robert Kern
ENH: Add dynamic initializers (_x_default methods) to traitlets.
r3207 def test_dynamic_initializer(self):
class A(HasTraits):
x = Int(10)
def _x_default(self):
return 11
class B(A):
x = Int(20)
class C(A):
def _x_default(self):
return 21
a = A()
self.assertEquals(a._trait_values, {})
Robert Kern
BUG: Do not store class-specific state on TraitTypes since they may be shared through subclassing.
r3336 self.assertEquals(a._trait_dyn_inits.keys(), ['x'])
Robert Kern
ENH: Add dynamic initializers (_x_default methods) to traitlets.
r3207 self.assertEquals(a.x, 11)
self.assertEquals(a._trait_values, {'x': 11})
b = B()
self.assertEquals(b._trait_values, {'x': 20})
Robert Kern
BUG: Do not store class-specific state on TraitTypes since they may be shared through subclassing.
r3336 self.assertEquals(a._trait_dyn_inits.keys(), ['x'])
Robert Kern
ENH: Add dynamic initializers (_x_default methods) to traitlets.
r3207 self.assertEquals(b.x, 20)
c = C()
self.assertEquals(c._trait_values, {})
Robert Kern
BUG: Do not store class-specific state on TraitTypes since they may be shared through subclassing.
r3336 self.assertEquals(a._trait_dyn_inits.keys(), ['x'])
Robert Kern
ENH: Add dynamic initializers (_x_default methods) to traitlets.
r3207 self.assertEquals(c.x, 21)
self.assertEquals(c._trait_values, {'x': 21})
Robert Kern
BUG: Do not store class-specific state on TraitTypes since they may be shared through subclassing.
r3336 # Ensure that the base class remains unmolested when the _default
# initializer gets overridden in a subclass.
a = A()
c = C()
self.assertEquals(a._trait_values, {})
self.assertEquals(a._trait_dyn_inits.keys(), ['x'])
self.assertEquals(a.x, 11)
self.assertEquals(a._trait_values, {'x': 11})
Robert Kern
ENH: Add dynamic initializers (_x_default methods) to traitlets.
r3207
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Iniital stab at renames for traitlets
r2384 class TestHasTraitsMeta(TestCase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_metaclass(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 self.assertEquals(type(HasTraits), MetaHasTraits)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a = Int
a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 self.assertEquals(type(a.__class__), MetaHasTraits)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 self.assertEquals(a.a,0)
a.a = 10
self.assertEquals(a.a,10)
Dav Clark
Iniital stab at renames for traitlets
r2384 class B(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 b = Int()
b = B()
self.assertEquals(b.b,0)
b.b = 10
self.assertEquals(b.b,10)
Dav Clark
Iniital stab at renames for traitlets
r2384 class C(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 c = Int(30)
c = C()
self.assertEquals(c.c,30)
c.c = 10
self.assertEquals(c.c,10)
Brian Granger
Fixing subtle bug in the traitlets with This....
r2183 def test_this_class(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Fixing subtle bug in the traitlets with This....
r2183 t = This()
tt = This()
class B(A):
tt = This()
ttt = This()
self.assertEquals(A.t.this_class, A)
self.assertEquals(B.t.this_class, A)
self.assertEquals(B.tt.this_class, B)
self.assertEquals(B.ttt.this_class, B)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Iniital stab at renames for traitlets
r2384 class TestHasTraitsNotify(TestCase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def setUp(self):
self._notify1 = []
self._notify2 = []
def notify1(self, name, old, new):
self._notify1.append((name, old, new))
def notify2(self, name, old, new):
self._notify2.append((name, old, new))
def test_notify_all(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a = Int
b = Float
a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(self.notify1)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a.a = 0
self.assertEquals(len(self._notify1),0)
a.b = 0.0
self.assertEquals(len(self._notify1),0)
a.a = 10
self.assert_(('a',0,10) in self._notify1)
a.b = 10.0
self.assert_(('b',0.0,10.0) in self._notify1)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError,setattr,a,'a','bad string')
self.assertRaises(TraitError,setattr,a,'b','bad string')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 self._notify1 = []
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(self.notify1,remove=True)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a.a = 20
a.b = 20.0
self.assertEquals(len(self._notify1),0)
def test_notify_one(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a = Int
b = Float
a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(self.notify1, 'a')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a.a = 0
self.assertEquals(len(self._notify1),0)
a.a = 10
self.assert_(('a',0,10) in self._notify1)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError,setattr,a,'a','bad string')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_subclass(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a = Int
class B(A):
b = Float
b = B()
self.assertEquals(b.a,0)
self.assertEquals(b.b,0.0)
b.a = 100
b.b = 100.0
self.assertEquals(b.a,100)
self.assertEquals(b.b,100.0)
def test_notify_subclass(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a = Int
class B(A):
b = Float
b = B()
Dav Clark
Iniital stab at renames for traitlets
r2384 b.on_trait_change(self.notify1, 'a')
b.on_trait_change(self.notify2, 'b')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 b.a = 0
b.b = 0.0
self.assertEquals(len(self._notify1),0)
self.assertEquals(len(self._notify2),0)
b.a = 10
b.b = 10.0
self.assert_(('a',0,10) in self._notify1)
self.assert_(('b',0.0,10.0) in self._notify2)
def test_static_notify(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a = Int
_notify1 = []
def _a_changed(self, name, old, new):
self._notify1.append((name, old, new))
a = A()
a.a = 0
Brian Granger
Important changes to simplify traitlets....
r2182 # This is broken!!!
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 self.assertEquals(len(a._notify1),0)
a.a = 10
self.assert_(('a',0,10) in a._notify1)
class B(A):
b = Float
_notify2 = []
def _b_changed(self, name, old, new):
self._notify2.append((name, old, new))
b = B()
b.a = 10
b.b = 10.0
self.assert_(('a',0,10) in b._notify1)
self.assert_(('b',0.0,10.0) in b._notify2)
def test_notify_args(self):
def callback0():
self.cb = ()
def callback1(name):
self.cb = (name,)
def callback2(name, new):
self.cb = (name, new)
def callback3(name, old, new):
self.cb = (name, old, new)
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a = Int
a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback0, 'a')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a.a = 10
self.assertEquals(self.cb,())
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback0, 'a', remove=True)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback1, 'a')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a.a = 100
self.assertEquals(self.cb,('a',))
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback1, 'a', remove=True)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback2, 'a')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a.a = 1000
self.assertEquals(self.cb,('a',1000))
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback2, 'a', remove=True)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback3, 'a')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 a.a = 10000
self.assertEquals(self.cb,('a',1000,10000))
Dav Clark
Iniital stab at renames for traitlets
r2384 a.on_trait_change(callback3, 'a', remove=True)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertEquals(len(a._trait_notifiers['a']),0)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Iniital stab at renames for traitlets
r2384 class TestHasTraits(TestCase):
Brian Granger
A few more small traitlets features.
r2179
Dav Clark
Iniital stab at renames for traitlets
r2384 def test_trait_names(self):
class A(HasTraits):
Brian Granger
Improvement to how config is handled in Components....
r2184 i = Int
f = Float
a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 self.assertEquals(a.trait_names(),['i','f'])
Brian Granger
Ongoing work on the config system....
r3789 self.assertEquals(A.class_trait_names(),['i','f'])
Brian Granger
Improvement to how config is handled in Components....
r2184
Dav Clark
Iniital stab at renames for traitlets
r2384 def test_trait_metadata(self):
class A(HasTraits):
Brian Granger
Improvement to how config is handled in Components....
r2184 i = Int(config_key='MY_VALUE')
Brian Granger
A few more small traitlets features.
r2179 a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 self.assertEquals(a.trait_metadata('i','config_key'), 'MY_VALUE')
Brian Granger
A few more small traitlets features.
r2179
Dav Clark
Iniital stab at renames for traitlets
r2384 def test_traits(self):
class A(HasTraits):
Brian Granger
Improvement to how config is handled in Components....
r2184 i = Int
f = Float
a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 self.assertEquals(a.traits(), dict(i=A.i, f=A.f))
Brian Granger
Ongoing work on the config system....
r3789 self.assertEquals(A.class_traits(), dict(i=A.i, f=A.f))
Brian Granger
Improvement to how config is handled in Components....
r2184
Dav Clark
Iniital stab at renames for traitlets
r2384 def test_traits_metadata(self):
class A(HasTraits):
Brian Granger
Improvement to how config is handled in Components....
r2184 i = Int(config_key='VALUE1', other_thing='VALUE2')
f = Float(config_key='VALUE3', other_thing='VALUE2')
Brian Granger
Massive refactoring of of the core....
r2245 j = Int(0)
Brian Granger
Improvement to how config is handled in Components....
r2184 a = A()
Dav Clark
Iniital stab at renames for traitlets
r2384 self.assertEquals(a.traits(), dict(i=A.i, f=A.f, j=A.j))
Dav Clark
Final changes traitlet -> trait for review
r2385 traits = a.traits(config_key='VALUE1', other_thing='VALUE2')
self.assertEquals(traits, dict(i=A.i))
Brian Granger
Massive refactoring of of the core....
r2245
Bernardo B. Marques
remove all trailling spaces
r4872 # This passes, but it shouldn't because I am replicating a bug in
Brian Granger
Massive refactoring of of the core....
r2245 # traits.
Dav Clark
Final changes traitlet -> trait for review
r2385 traits = a.traits(config_key=lambda v: True)
self.assertEquals(traits, dict(i=A.i, f=A.f, j=A.j))
Brian Granger
Massive refactoring of of the core....
r2245
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740 def test_init(self):
class A(HasTraits):
i = Int()
x = Float()
a = A(i=1, x=10.0)
self.assertEquals(a.i, 1)
self.assertEquals(a.x, 10.0)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
#-----------------------------------------------------------------------------
Dav Clark
Final changes traitlet -> trait for review
r2385 # Tests for specific trait types
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 #-----------------------------------------------------------------------------
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
class TestType(TestCase):
def test_default(self):
class B(object): pass
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 klass = Type
a = A()
self.assertEquals(a.klass, None)
Brian Granger
A number of changes to how traitlets and components work....
r2229
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 a.klass = B
self.assertEquals(a.klass, B)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, setattr, a, 'klass', 10)
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
def test_value(self):
class B(object): pass
class C(object): pass
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 klass = Type(B)
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 a = A()
self.assertEquals(a.klass, B)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, setattr, a, 'klass', C)
self.assertRaises(TraitError, setattr, a, 'klass', object)
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 a.klass = B
def test_allow_none(self):
class B(object): pass
class C(B): pass
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 klass = Type(B, allow_none=False)
a = A()
self.assertEquals(a.klass, B)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, setattr, a, 'klass', None)
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 a.klass = C
self.assertEquals(a.klass, C)
Brian Granger
Important changes to simplify traitlets....
r2182 def test_validate_klass(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
A number of changes to how traitlets and components work....
r2229 klass = Type('no strings allowed')
self.assertRaises(ImportError, A)
Brian Granger
Important changes to simplify traitlets....
r2182
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
A number of changes to how traitlets and components work....
r2229 klass = Type('rub.adub.Duck')
self.assertRaises(ImportError, A)
Brian Granger
Important changes to simplify traitlets....
r2182
def test_validate_default(self):
class B(object): pass
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 klass = Type('bad default', B)
Brian Granger
A number of changes to how traitlets and components work....
r2229 self.assertRaises(ImportError, A)
Brian Granger
Important changes to simplify traitlets....
r2182
Dav Clark
Iniital stab at renames for traitlets
r2384 class C(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 klass = Type(None, B, allow_none=False)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, C)
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
Brian Granger
A number of changes to how traitlets and components work....
r2229 def test_str_klass(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
A number of changes to how traitlets and components work....
r2229 klass = Type('IPython.utils.ipstruct.Struct')
from IPython.utils.ipstruct import Struct
a = A()
a.klass = Struct
self.assertEquals(a.klass, Struct)
Bernardo B. Marques
remove all trailling spaces
r4872
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, setattr, a, 'klass', 10)
Brian Granger
A number of changes to how traitlets and components work....
r2229
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 class TestInstance(TestCase):
def test_basic(self):
class Foo(object): pass
class Bar(Foo): pass
class Bah(object): pass
Bernardo B. Marques
remove all trailling spaces
r4872
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 inst = Instance(Foo)
a = A()
Brian Granger
Important changes to simplify traitlets....
r2182 self.assert_(a.inst is None)
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 a.inst = Foo()
self.assert_(isinstance(a.inst, Foo))
a.inst = Bar()
self.assert_(isinstance(a.inst, Foo))
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, setattr, a, 'inst', Foo)
self.assertRaises(TraitError, setattr, a, 'inst', Bar)
self.assertRaises(TraitError, setattr, a, 'inst', Bah())
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
def test_unique_default_value(self):
Brian Granger
A number of changes to how traitlets and components work....
r2229 class Foo(object): pass
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 inst = Instance(Foo,(),{})
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
a = A()
b = A()
self.assert_(a.inst is not b.inst)
def test_args_kw(self):
class Foo(object):
def __init__(self, c): self.c = c
Brian Granger
Important changes to simplify traitlets....
r2182 class Bar(object): pass
class Bah(object):
def __init__(self, c, d):
self.c = c; self.d = d
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 inst = Instance(Foo, (10,))
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 a = A()
self.assertEquals(a.inst.c, 10)
Dav Clark
Iniital stab at renames for traitlets
r2384 class B(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 inst = Instance(Bah, args=(10,), kw=dict(d=20))
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 b = B()
self.assertEquals(b.inst.c, 10)
self.assertEquals(b.inst.d, 20)
Dav Clark
Iniital stab at renames for traitlets
r2384 class C(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 inst = Instance(Foo)
c = C()
self.assert_(c.inst is None)
def test_bad_default(self):
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177 class Foo(object): pass
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 inst = Instance(Foo, allow_none=False)
Bernardo B. Marques
remove all trailling spaces
r4872
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, A)
Brian Granger
Important changes to simplify traitlets....
r2182
def test_instance(self):
class Foo(object): pass
def inner():
Dav Clark
Iniital stab at renames for traitlets
r2384 class A(HasTraits):
Brian Granger
Important changes to simplify traitlets....
r2182 inst = Instance(Foo())
Bernardo B. Marques
remove all trailling spaces
r4872
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, inner)
Brian Granger
Added support for Type and Instance traitlets with testing.
r2177
Brian Granger
Improvements to component.py....
r2180
class TestThis(TestCase):
def test_this_class(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class Foo(HasTraits):
Brian Granger
Improvements to component.py....
r2180 this = This
f = Foo()
self.assertEquals(f.this, None)
g = Foo()
f.this = g
self.assertEquals(f.this, g)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, setattr, f, 'this', 10)
Brian Granger
Improvements to component.py....
r2180
def test_this_inst(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class Foo(HasTraits):
Brian Granger
Improvements to component.py....
r2180 this = This()
Bernardo B. Marques
remove all trailling spaces
r4872
Brian Granger
Improvements to component.py....
r2180 f = Foo()
f.this = Foo()
self.assert_(isinstance(f.this, Foo))
Brian Granger
Fixing subtle bug in the traitlets with This....
r2183 def test_subclass(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class Foo(HasTraits):
Brian Granger
Fixing subtle bug in the traitlets with This....
r2183 t = This()
class Bar(Foo):
pass
f = Foo()
b = Bar()
f.t = b
b.t = f
self.assertEquals(f.t, b)
self.assertEquals(b.t, f)
def test_subclass_override(self):
Dav Clark
Iniital stab at renames for traitlets
r2384 class Foo(HasTraits):
Brian Granger
Fixing subtle bug in the traitlets with This....
r2183 t = This()
class Bar(Foo):
t = This()
f = Foo()
b = Bar()
f.t = b
self.assertEquals(f.t, b)
Dav Clark
Final changes traitlet -> trait for review
r2385 self.assertRaises(TraitError, setattr, b, 't', f)
Brian Granger
Improvements to component.py....
r2180
Dav Clark
Final changes traitlet -> trait for review
r2385 class TraitTestBase(TestCase):
"""A best testing class for basic trait types."""
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def assign(self, value):
self.obj.value = value
def coerce(self, value):
return value
def test_good_values(self):
if hasattr(self, '_good_values'):
for value in self._good_values:
self.assign(value)
self.assertEquals(self.obj.value, self.coerce(value))
def test_bad_values(self):
if hasattr(self, '_bad_values'):
for value in self._bad_values:
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 try:
self.assertRaises(TraitError, self.assign, value)
except AssertionError:
assert False, value
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
def test_default_value(self):
if hasattr(self, '_default_value'):
self.assertEquals(self._default_value, self.obj.value)
MinRK
add Integer traitlet...
r5344 def tearDown(self):
# restore default value after tests, if set
if hasattr(self, '_default_value'):
self.obj.value = self._default_value
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 class AnyTrait(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
value = Any
Dav Clark
Final changes traitlet -> trait for review
r2385 class AnyTraitTest(TraitTestBase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 obj = AnyTrait()
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
_default_value = None
_good_values = [10.0, 'ten', u'ten', [10], {'ten': 10},(10,), None, 1j]
_bad_values = []
Dav Clark
Final changes traitlet -> trait for review
r2385 class IntTrait(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
value = Int(99)
Dav Clark
Final changes traitlet -> trait for review
r2385 class TestInt(TraitTestBase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 obj = IntTrait()
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 _default_value = 99
_good_values = [10, -10]
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 _bad_values = ['ten', u'ten', [10], {'ten': 10},(10,), None, 1j,
10.1, -10.1, '10L', '-10L', '10.1', '-10.1', u'10L',
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 u'-10L', u'10.1', u'-10.1', '10', '-10', u'10', u'-10']
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 if not py3compat.PY3:
MinRK
add Integer traitlet...
r5344 _bad_values.extend([10L, -10L, 10*sys.maxint, -10*sys.maxint])
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 class LongTrait(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
value = Long(99L)
Dav Clark
Final changes traitlet -> trait for review
r2385 class TestLong(TraitTestBase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 obj = LongTrait()
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
_default_value = 99L
_good_values = [10, -10, 10L, -10L]
_bad_values = ['ten', u'ten', [10], [10l], {'ten': 10},(10,),(10L,),
None, 1j, 10.1, -10.1, '10', '-10', '10L', '-10L', '10.1',
'-10.1', u'10', u'-10', u'10L', u'-10L', u'10.1',
u'-10.1']
MinRK
add Integer traitlet...
r5344 if not py3compat.PY3:
# maxint undefined on py3, because int == long
_good_values.extend([10*sys.maxint, -10*sys.maxint])
@skipif(py3compat.PY3, "not relevant on py3")
def test_cast_small(self):
"""Long casts ints to long"""
self.obj.value = 10
self.assertEquals(type(self.obj.value), long)
class IntegerTrait(HasTraits):
value = Integer(1)
class TestInteger(TestLong):
obj = IntegerTrait()
_default_value = 1
def coerce(self, n):
return int(n)
@skipif(py3compat.PY3, "not relevant on py3")
def test_cast_small(self):
"""Integer casts small longs to int"""
if py3compat.PY3:
raise SkipTest("not relevant on py3")
self.obj.value = 100L
self.assertEquals(type(self.obj.value), int)
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 class FloatTrait(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
value = Float(99.0)
Dav Clark
Final changes traitlet -> trait for review
r2385 class TestFloat(TraitTestBase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 obj = FloatTrait()
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
_default_value = 99.0
_good_values = [10, -10, 10.1, -10.1]
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 _bad_values = ['ten', u'ten', [10], {'ten': 10},(10,), None,
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 1j, '10', '-10', '10L', '-10L', '10.1', '-10.1', u'10',
u'-10', u'10L', u'-10L', u'10.1', u'-10.1']
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 if not py3compat.PY3:
_bad_values.extend([10L, -10L])
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 class ComplexTrait(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
value = Complex(99.0-99.0j)
Dav Clark
Final changes traitlet -> trait for review
r2385 class TestComplex(TraitTestBase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 obj = ComplexTrait()
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
_default_value = 99.0-99.0j
Bernardo B. Marques
remove all trailling spaces
r4872 _good_values = [10, -10, 10.1, -10.1, 10j, 10+10j, 10-10j,
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 10.1j, 10.1+10.1j, 10.1-10.1j]
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 _bad_values = [u'10L', u'-10L', 'ten', [10], {'ten': 10},(10,), None]
if not py3compat.PY3:
_bad_values.extend([10L, -10L])
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 class BytesTrait(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Thomas Kluyver
Tweaks to improve automated conversion to Python 3 code.
r4110 value = Bytes(b'string')
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 class TestBytes(TraitTestBase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 obj = BytesTrait()
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Thomas Kluyver
Tweaks to improve automated conversion to Python 3 code.
r4110 _default_value = b'string'
_good_values = [b'10', b'-10', b'10L',
b'-10L', b'10.1', b'-10.1', b'string']
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 _bad_values = [10, -10, 10L, -10L, 10.1, -10.1, 1j, [10],
['ten'],{'ten': 10},(10,), None, u'string']
Dav Clark
Final changes traitlet -> trait for review
r2385 class UnicodeTrait(HasTraits):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
value = Unicode(u'unicode')
Dav Clark
Final changes traitlet -> trait for review
r2385 class TestUnicode(TraitTestBase):
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
Dav Clark
Final changes traitlet -> trait for review
r2385 obj = UnicodeTrait()
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175
_default_value = u'unicode'
Bernardo B. Marques
remove all trailling spaces
r4872 _good_values = ['10', '-10', '10L', '-10L', '10.1',
Thomas Kluyver
Add ObjectName and DottedObjectName trait types for referring to Python identifiers.
r4047 '-10.1', '', u'', 'string', u'string', u"€"]
Brian Granger
More work on traitlets.py. I have added tests for existing traitlets.
r2175 _bad_values = [10, -10, 10L, -10L, 10.1, -10.1, 1j,
[10], ['ten'], [u'ten'], {'ten': 10},(10,), None]
Brian Granger
Minor work on kernelmanager....
r2742
Thomas Kluyver
Add ObjectName and DottedObjectName trait types for referring to Python identifiers.
r4047 class ObjectNameTrait(HasTraits):
value = ObjectName("abc")
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Add ObjectName and DottedObjectName trait types for referring to Python identifiers.
r4047 class TestObjectName(TraitTestBase):
obj = ObjectNameTrait()
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Add ObjectName and DottedObjectName trait types for referring to Python identifiers.
r4047 _default_value = "abc"
_good_values = ["a", "gh", "g9", "g_", "_G", u"a345_"]
_bad_values = [1, "", u"€", "9g", "!", "#abc", "aj@", "a.b", "a()", "a[0]",
object(), object]
if sys.version_info[0] < 3:
_bad_values.append(u"þ")
else:
_good_values.append(u"þ") # þ=1 is valid in Python 3 (PEP 3131).
class DottedObjectNameTrait(HasTraits):
value = DottedObjectName("a.b")
class TestDottedObjectName(TraitTestBase):
obj = DottedObjectNameTrait()
Bernardo B. Marques
remove all trailling spaces
r4872
Thomas Kluyver
Add ObjectName and DottedObjectName trait types for referring to Python identifiers.
r4047 _default_value = "a.b"
_good_values = ["A", "y.t", "y765.__repr__", "os.path.join", u"os.path.join"]
_bad_values = [1, u"abc.€", "_.@", ".", ".abc", "abc.", ".abc."]
if sys.version_info[0] < 3:
_bad_values.append(u"t.þ")
else:
_good_values.append(u"t.þ")
Brian Granger
Minor work on kernelmanager....
r2742 class TCPAddressTrait(HasTraits):
value = TCPAddress()
class TestTCPAddress(TraitTestBase):
obj = TCPAddressTrait()
_default_value = ('127.0.0.1',0)
_good_values = [('localhost',0),('192.168.0.1',1000),('www.google.com',80)]
_bad_values = [(0,0),('localhost',10.0),('localhost',-1)]
MinRK
Allow type checking on elements of List,Tuple,Set...
r3870
class ListTrait(HasTraits):
value = List(Int)
class TestList(TraitTestBase):
obj = ListTrait()
_default_value = []
_good_values = [[], [1], range(10)]
_bad_values = [10, [1,'a'], 'a', (1,2)]
class LenListTrait(HasTraits):
value = List(Int, [0], minlen=1, maxlen=2)
class TestLenList(TraitTestBase):
obj = LenListTrait()
_default_value = [0]
_good_values = [[1], range(2)]
_bad_values = [10, [1,'a'], 'a', (1,2), [], range(3)]
class TupleTrait(HasTraits):
value = Tuple(Int)
class TestTupleTrait(TraitTestBase):
obj = TupleTrait()
_default_value = None
_good_values = [(1,), None,(0,)]
_bad_values = [10, (1,2), [1],('a'), ()]
def test_invalid_args(self):
self.assertRaises(TypeError, Tuple, 5)
self.assertRaises(TypeError, Tuple, default_value='hello')
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 t = Tuple(Int, CBytes, default_value=(1,5))
MinRK
Allow type checking on elements of List,Tuple,Set...
r3870
class LooseTupleTrait(HasTraits):
value = Tuple((1,2,3))
class TestLooseTupleTrait(TraitTestBase):
obj = LooseTupleTrait()
_default_value = (1,2,3)
_good_values = [(1,), None, (0,), tuple(range(5)), tuple('hello'), ('a',5), ()]
_bad_values = [10, 'hello', [1], []]
def test_invalid_args(self):
self.assertRaises(TypeError, Tuple, 5)
self.assertRaises(TypeError, Tuple, default_value='hello')
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 t = Tuple(Int, CBytes, default_value=(1,5))
MinRK
Allow type checking on elements of List,Tuple,Set...
r3870
class MultiTupleTrait(HasTraits):
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 value = Tuple(Int, Bytes, default_value=[99,b'bottles'])
MinRK
Allow type checking on elements of List,Tuple,Set...
r3870
class TestMultiTuple(TraitTestBase):
obj = MultiTupleTrait()
Thomas Kluyver
Various fixes to tests in IPython.utils.
r4891 _default_value = (99,b'bottles')
_good_values = [(1,b'a'), (2,b'b')]
_bad_values = ((),10, b'a', (1,b'a',3), (b'a',1), (1, u'a'))