jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'yazug-python_test_suite_pep8_whitespace_cleanup'

Browse source 
* yazug-python_test_suite_pep8_whitespace_cleanup:
  autopep8 cleanup of Examples/test-suite/python
This commit is contained in:
William S Fulton 2015-05-10 18:44:14 +01:00
commit 2348d8377f
202 changed files with 3477 additions and 3382 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Examples/test-suite/python/abstract_access_runme.py
View file

@ -3,4 +3,3 @@ import abstract_access
d = abstract_access.D() d = abstract_access.D()
if d.do_x() != 1: if d.do_x() != 1:
raise RuntimeError raise RuntimeError

5
Examples/test-suite/python/abstract_typedef2_runme.py
View file

@ -1,8 +1,3 @@
from abstract_typedef2 import * from abstract_typedef2 import *
a = A_UF() a = A_UF()

3
Examples/test-suite/python/abstract_typedef_runme.py
View file

@ -6,6 +6,3 @@ a = A()
if a.write(e) != 1: if a.write(e) != 1:
raise RuntimeError raise RuntimeError

15
Examples/test-suite/python/argcargvtest_runme.py
View file

@ -1,21 +1,21 @@
from argcargvtest import * from argcargvtest import *
largs=['hi','hola','hello'] largs = ['hi', 'hola', 'hello']
if mainc(largs) != 3: if mainc(largs) != 3:
raise RuntimeError("bad main typemap") raise RuntimeError("bad main typemap")
targs=('hi','hola') targs = ('hi', 'hola')
if mainv(targs,1) != 'hola': if mainv(targs, 1) != 'hola':
print(mainv(targs,1)) print(mainv(targs, 1))
raise RuntimeError("bad main typemap") raise RuntimeError("bad main typemap")
targs=('hi', 'hola') targs = ('hi', 'hola')
if mainv(targs,1) != 'hola': if mainv(targs, 1) != 'hola':
raise RuntimeError("bad main typemap") raise RuntimeError("bad main typemap")
try: try:
error = 0 error = 0
mainv('hello',1) mainv('hello', 1)
error = 1 error = 1
except TypeError: except TypeError:
pass pass
@ -23,5 +23,4 @@ if error:
raise RuntimeError("bad main typemap") raise RuntimeError("bad main typemap")
initializeApp(largs) initializeApp(largs)

15
Examples/test-suite/python/array_member_runme.py
View file

@ -3,19 +3,16 @@ from array_member import *
f = Foo() f = Foo()
f.data = cvar.global_data f.data = cvar.global_data
for i in range(0,8): for i in range(0, 8):
if get_value(f.data,i) != get_value(cvar.global_data,i): if get_value(f.data, i) != get_value(cvar.global_data, i):
raise RuntimeError, "Bad array assignment" raise RuntimeError, "Bad array assignment"
for i in range(0,8): for i in range(0, 8):
set_value(f.data,i,-i) set_value(f.data, i, -i)
cvar.global_data = f.data cvar.global_data = f.data
for i in range(0,8): for i in range(0, 8):
if get_value(f.data,i) != get_value(cvar.global_data,i): if get_value(f.data, i) != get_value(cvar.global_data, i):
raise RuntimeError, "Bad array assignment" raise RuntimeError, "Bad array assignment"

6
Examples/test-suite/python/arrays_global_runme.py
View file

@ -9,12 +9,12 @@ cvar.BeginString_FIX44b
BeginString_FIX44c BeginString_FIX44c
cvar.BeginString_FIX44d cvar.BeginString_FIX44d
cvar.BeginString_FIX44d cvar.BeginString_FIX44d
cvar.BeginString_FIX44b ="12"'\0'"45" cvar.BeginString_FIX44b = "12"'\0'"45"
cvar.BeginString_FIX44b cvar.BeginString_FIX44b
cvar.BeginString_FIX44d cvar.BeginString_FIX44d
cvar.BeginString_FIX44e cvar.BeginString_FIX44e
BeginString_FIX44f BeginString_FIX44f
test_a("hello","hi","chello","chi") test_a("hello", "hi", "chello", "chi")
test_b("1234567","hi") test_b("1234567", "hi")

531
Examples/test-suite/python/autodoc_runme.py
View file

@ -1,263 +1,258 @@
from autodoc import * from autodoc import *
import sys import sys
def check(got, expected, expected_builtin = None, skip = False):
def check(got, expected, expected_builtin=None, skip=False):
if not skip: if not skip:
expect = expected expect = expected
if is_python_builtin() and expected_builtin != None: if is_python_builtin() and expected_builtin != None:
expect = expected_builtin expect = expected_builtin
if expect != got: if expect != got:
raise RuntimeError("\n" + "Expected: [" + str(expect) + "]\n" + "Got : [" + str(got) + "]") raise RuntimeError(
"\n" + "Expected: [" + str(expect) + "]\n" + "Got : [" + str(got) + "]")
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
if not is_new_style_class(A): if not is_new_style_class(A):
# Missing static methods make this hard to test... skip if -classic is used! # Missing static methods make this hard to test... skip if -classic is
# used!
sys.exit(0) sys.exit(0)
skip = True # skip builtin check - the autodoc is missing, but it probably should not be # skip builtin check - the autodoc is missing, but it probably should not be
skip = True
check(A.__doc__, "Proxy of C++ A class", "::A") check(A.__doc__, "Proxy of C++ A class", "::A")
check(A.funk.__doc__, "just a string") check(A.funk.__doc__, "just a string")
check(A.func0.__doc__, check(A.func0.__doc__,
"func0(self, arg2, hello) -> int", "func0(self, arg2, hello) -> int",
"func0(arg2, hello) -> int") "func0(arg2, hello) -> int")
check(A.func1.__doc__, check(A.func1.__doc__,
"func1(A self, short arg2, Tuple hello) -> int", "func1(A self, short arg2, Tuple hello) -> int",
"func1(short arg2, Tuple hello) -> int") "func1(short arg2, Tuple hello) -> int")
check(A.func2.__doc__, check(A.func2.__doc__,
"\n" "\n"
" func2(self, arg2, hello) -> int\n" " func2(self, arg2, hello) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" arg2: short\n" " arg2: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
"\n" "\n"
" " " ",
, "\n"
"\n" "func2(arg2, hello) -> int\n"
"func2(arg2, hello) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " arg2: short\n"
" arg2: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" "\n"
"\n" ""
"" )
)
check(A.func3.__doc__, check(A.func3.__doc__,
"\n" "\n"
" func3(A self, short arg2, Tuple hello) -> int\n" " func3(A self, short arg2, Tuple hello) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" arg2: short\n" " arg2: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
"\n" "\n"
" " " ",
, "\n"
"\n" "func3(short arg2, Tuple hello) -> int\n"
"func3(short arg2, Tuple hello) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " arg2: short\n"
" arg2: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" "\n"
"\n" ""
"" )
)
check(A.func0default.__doc__, check(A.func0default.__doc__,
"\n" "\n"
" func0default(self, e, arg3, hello, f=2) -> int\n" " func0default(self, e, arg3, hello, f=2) -> int\n"
" func0default(self, e, arg3, hello) -> int\n" " func0default(self, e, arg3, hello) -> int\n"
" " " ",
, "\n"
"\n" "func0default(e, arg3, hello, f=2) -> int\n"
"func0default(e, arg3, hello, f=2) -> int\n" "func0default(e, arg3, hello) -> int\n"
"func0default(e, arg3, hello) -> int\n" ""
"" )
)
check(A.func1default.__doc__, check(A.func1default.__doc__,
"\n" "\n"
" func1default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n" " func1default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n"
" func1default(A self, A e, short arg3, Tuple hello) -> int\n" " func1default(A self, A e, short arg3, Tuple hello) -> int\n"
" " " ",
, "\n"
"\n" "func1default(A e, short arg3, Tuple hello, double f=2) -> int\n"
"func1default(A e, short arg3, Tuple hello, double f=2) -> int\n" "func1default(A e, short arg3, Tuple hello) -> int\n"
"func1default(A e, short arg3, Tuple hello) -> int\n" ""
"" )
)
check(A.func2default.__doc__, check(A.func2default.__doc__,
"\n" "\n"
" func2default(self, e, arg3, hello, f=2) -> int\n" " func2default(self, e, arg3, hello, f=2) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg3: short\n" " arg3: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
" f: double\n" " f: double\n"
"\n" "\n"
" func2default(self, e, arg3, hello) -> int\n" " func2default(self, e, arg3, hello) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg3: short\n" " arg3: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
"\n" "\n"
" " " ",
, "\n"
"\n" "func2default(e, arg3, hello, f=2) -> int\n"
"func2default(e, arg3, hello, f=2) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg3: short\n"
" arg3: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" " f: double\n"
" f: double\n" "\n"
"\n" "func2default(e, arg3, hello) -> int\n"
"func2default(e, arg3, hello) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg3: short\n"
" arg3: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" "\n"
"\n" ""
"" )
)
check(A.func3default.__doc__, check(A.func3default.__doc__,
"\n" "\n"
" func3default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n" " func3default(A self, A e, short arg3, Tuple hello, double f=2) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg3: short\n" " arg3: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
" f: double\n" " f: double\n"
"\n" "\n"
" func3default(A self, A e, short arg3, Tuple hello) -> int\n" " func3default(A self, A e, short arg3, Tuple hello) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg3: short\n" " arg3: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
"\n" "\n"
" " " ",
, "\n"
"\n" "func3default(A e, short arg3, Tuple hello, double f=2) -> int\n"
"func3default(A e, short arg3, Tuple hello, double f=2) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg3: short\n"
" arg3: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" " f: double\n"
" f: double\n" "\n"
"\n" "func3default(A e, short arg3, Tuple hello) -> int\n"
"func3default(A e, short arg3, Tuple hello) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg3: short\n"
" arg3: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" "\n"
"\n" ""
"" )
)
check(A.func0static.__doc__, check(A.func0static.__doc__,
"\n" "\n"
" func0static(e, arg2, hello, f=2) -> int\n" " func0static(e, arg2, hello, f=2) -> int\n"
" func0static(e, arg2, hello) -> int\n" " func0static(e, arg2, hello) -> int\n"
" " " ",
, "\n"
"\n" "func0static(e, arg2, hello, f=2) -> int\n"
"func0static(e, arg2, hello, f=2) -> int\n" "func0static(e, arg2, hello) -> int\n"
"func0static(e, arg2, hello) -> int\n" ""
"" )
)
check(A.func1static.__doc__, check(A.func1static.__doc__,
"\n" "\n"
" func1static(A e, short arg2, Tuple hello, double f=2) -> int\n" " func1static(A e, short arg2, Tuple hello, double f=2) -> int\n"
" func1static(A e, short arg2, Tuple hello) -> int\n" " func1static(A e, short arg2, Tuple hello) -> int\n"
" " " ",
, "\n"
"\n" "func1static(A e, short arg2, Tuple hello, double f=2) -> int\n"
"func1static(A e, short arg2, Tuple hello, double f=2) -> int\n" "func1static(A e, short arg2, Tuple hello) -> int\n"
"func1static(A e, short arg2, Tuple hello) -> int\n" ""
"" )
)
check(A.func2static.__doc__, check(A.func2static.__doc__,
"\n" "\n"
" func2static(e, arg2, hello, f=2) -> int\n" " func2static(e, arg2, hello, f=2) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg2: short\n" " arg2: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
" f: double\n" " f: double\n"
"\n" "\n"
" func2static(e, arg2, hello) -> int\n" " func2static(e, arg2, hello) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg2: short\n" " arg2: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
"\n" "\n"
" " " ",
, "\n"
"\n" "func2static(e, arg2, hello, f=2) -> int\n"
"func2static(e, arg2, hello, f=2) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg2: short\n"
" arg2: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" " f: double\n"
" f: double\n" "\n"
"\n" "func2static(e, arg2, hello) -> int\n"
"func2static(e, arg2, hello) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg2: short\n"
" arg2: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" "\n"
"\n" ""
"" )
)
check(A.func3static.__doc__, check(A.func3static.__doc__,
"\n" "\n"
" func3static(A e, short arg2, Tuple hello, double f=2) -> int\n" " func3static(A e, short arg2, Tuple hello, double f=2) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg2: short\n" " arg2: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
" f: double\n" " f: double\n"
"\n" "\n"
" func3static(A e, short arg2, Tuple hello) -> int\n" " func3static(A e, short arg2, Tuple hello) -> int\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" e: A *\n" " e: A *\n"
" arg2: short\n" " arg2: short\n"
" hello: int tuple[2]\n" " hello: int tuple[2]\n"
"\n" "\n"
" " " ",
, "\n"
"\n" "func3static(A e, short arg2, Tuple hello, double f=2) -> int\n"
"func3static(A e, short arg2, Tuple hello, double f=2) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg2: short\n"
" arg2: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" " f: double\n"
" f: double\n" "\n"
"\n" "func3static(A e, short arg2, Tuple hello) -> int\n"
"func3static(A e, short arg2, Tuple hello) -> int\n" "\n"
"\n" "Parameters:\n"
"Parameters:\n" " e: A *\n"
" e: A *\n" " arg2: short\n"
" arg2: short\n" " hello: int tuple[2]\n"
" hello: int tuple[2]\n" "\n"
"\n" ""
"" )
)
if sys.version_info[0:2] > (2, 4): if sys.version_info[0:2] > (2, 4):
# Python 2.4 does not seem to work # Python 2.4 does not seem to work
@ -275,8 +270,7 @@ if sys.version_info[0:2] > (2, 4):
"\n" "\n"
"Parameters:\n" "Parameters:\n"
" self: A *\n" " self: A *\n"
"\n" "\n",
,
"A.variable_c" "A.variable_c"
) )
check(A.variable_d.__doc__, check(A.variable_d.__doc__,
@ -285,57 +279,54 @@ if sys.version_info[0:2] > (2, 4):
"\n" "\n"
"Parameters:\n" "Parameters:\n"
" self: A *\n" " self: A *\n"
"\n" "\n",
,
"A.variable_d" "A.variable_d"
) )
check(B.__doc__, check(B.__doc__,
"Proxy of C++ B class", "Proxy of C++ B class",
"::B" "::B"
) )
check(C.__init__.__doc__, "__init__(self, a, b, h) -> C", None, skip) check(C.__init__.__doc__, "__init__(self, a, b, h) -> C", None, skip)
check(D.__init__.__doc__, "__init__(D self, int a, int b, Hola h) -> D", None, skip) check(D.__init__.__doc__,
"__init__(D self, int a, int b, Hola h) -> D", None, skip)
check(E.__init__.__doc__, check(E.__init__.__doc__,
"\n" "\n"
" __init__(self, a, b, h) -> E\n" " __init__(self, a, b, h) -> E\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" a: special comment for parameter a\n" " a: special comment for parameter a\n"
" b: another special comment for parameter b\n" " b: another special comment for parameter b\n"
" h: enum Hola\n" " h: enum Hola\n"
"\n" "\n"
" " " ", None, skip
, None, skip )
)
check(F.__init__.__doc__, check(F.__init__.__doc__,
"\n" "\n"
" __init__(F self, int a, int b, Hola h) -> F\n" " __init__(F self, int a, int b, Hola h) -> F\n"
"\n" "\n"
" Parameters:\n" " Parameters:\n"
" a: special comment for parameter a\n" " a: special comment for parameter a\n"
" b: another special comment for parameter b\n" " b: another special comment for parameter b\n"
" h: enum Hola\n" " h: enum Hola\n"
"\n" "\n"
" " " ", None, skip
, None, skip )
)
check(B.funk.__doc__, check(B.funk.__doc__,
"funk(B self, int c, int d) -> int", "funk(B self, int c, int d) -> int",
"funk(int c, int d) -> int") "funk(int c, int d) -> int")
check(funk.__doc__, "funk(A e, short arg2, int c, int d) -> int") check(funk.__doc__, "funk(A e, short arg2, int c, int d) -> int")
check(funkdefaults.__doc__, check(funkdefaults.__doc__,
"\n" "\n"
" funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n" " funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n"
" funkdefaults(A e, short arg2, int c, int d) -> int\n" " funkdefaults(A e, short arg2, int c, int d) -> int\n"
" " " ",
, "\n"
"\n" "funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n"
"funkdefaults(A e, short arg2, int c, int d, double f=2) -> int\n" "funkdefaults(A e, short arg2, int c, int d) -> int\n"
"funkdefaults(A e, short arg2, int c, int d) -> int\n" ""
"" )
)
check(func_input.__doc__, "func_input(int * INPUT) -> int") check(func_input.__doc__, "func_input(int * INPUT) -> int")
check(func_output.__doc__, "func_output() -> int") check(func_output.__doc__, "func_output() -> int")

3
Examples/test-suite/python/char_binary_runme.py
View file

@ -28,9 +28,8 @@ if cvar.var_pchar != "hola":
raise RuntimeError, "bad pointer case" raise RuntimeError, "bad pointer case"
cvar.var_namet = pc cvar.var_namet = pc
#if cvar.var_namet != "hola\0": # if cvar.var_namet != "hola\0":
if cvar.var_namet != "hola": if cvar.var_namet != "hola":
raise RuntimeError, "bad pointer case" raise RuntimeError, "bad pointer case"
delete_pchar(pc) delete_pchar(pc)

1
Examples/test-suite/python/compactdefaultargs_runme.py
View file

@ -17,4 +17,3 @@ if defaults2.ret(10.0) != 10.0:
if defaults2.ret() != -1.0: if defaults2.ret() != -1.0:
raise RuntimeError raise RuntimeError

4
Examples/test-suite/python/complextest_runme.py
View file

@ -1,6 +1,6 @@
import complextest import complextest
a = complex(-1,2) a = complex(-1, 2)
if complextest.Conj(a) != a.conjugate(): if complextest.Conj(a) != a.conjugate():
raise RuntimeError, "bad complex mapping" raise RuntimeError, "bad complex mapping"
@ -9,7 +9,7 @@ if complextest.Conjf(a) != a.conjugate():
raise RuntimeError, "bad complex mapping" raise RuntimeError, "bad complex mapping"
v = (complex(1,2), complex(2,3), complex(4,3), 1) v = (complex(1, 2), complex(2, 3), complex(4, 3), 1)
try: try:
complextest.Copy_h(v) complextest.Copy_h(v)

19
Examples/test-suite/python/constant_directive_runme.py
View file

@ -1,15 +1,20 @@
import constant_directive import constant_directive
if not isinstance(constant_directive.TYPE1_CONSTANT1,constant_directive.Type1): if not isinstance(constant_directive.TYPE1_CONSTANT1, constant_directive.Type1):
raise RuntimeError("Failure: TYPE1_CONSTANT1 type: {}".format(type(constant_directive.TYPE1_CONSTANT1))) raise RuntimeError("Failure: TYPE1_CONSTANT1 type: {}".format(
if not isinstance(constant_directive.getType1Instance(),constant_directive.Type1): type(constant_directive.TYPE1_CONSTANT1)))
raise RuntimeError("Failure: getType1Instance() type: {}".format(type(constant_directive.getType1Instance()))) if not isinstance(constant_directive.getType1Instance(), constant_directive.Type1):
raise RuntimeError("Failure: getType1Instance() type: {}".format(
type(constant_directive.getType1Instance())))
if constant_directive.TYPE1_CONSTANT1.val != 1: if constant_directive.TYPE1_CONSTANT1.val != 1:
raise RuntimeError("constant_directive.TYPE1_CONSTANT1.val is %r (should be 1)" % constant_directive.TYPE1_CONSTANT1.val) raise RuntimeError("constant_directive.TYPE1_CONSTANT1.val is %r (should be 1)" %
constant_directive.TYPE1_CONSTANT1.val)
if constant_directive.TYPE1_CONSTANT2.val != 2: if constant_directive.TYPE1_CONSTANT2.val != 2:
raise RuntimeError("constant_directive.TYPE1_CONSTANT2.val is %r (should be 2)" % constant_directive.TYPE1_CONSTANT2.val) raise RuntimeError("constant_directive.TYPE1_CONSTANT2.val is %r (should be 2)" %
constant_directive.TYPE1_CONSTANT2.val)
if constant_directive.TYPE1_CONSTANT3.val != 3: if constant_directive.TYPE1_CONSTANT3.val != 3:
raise RuntimeError("constant_directive.TYPE1_CONSTANT3.val is %r (should be 3)" % constant_directive.TYPE1_CONSTANT3.val) raise RuntimeError("constant_directive.TYPE1_CONSTANT3.val is %r (should be 3)" %
constant_directive.TYPE1_CONSTANT3.val)

2
Examples/test-suite/python/constover_runme.py
View file

@ -34,5 +34,3 @@ if p != "test_pconstmethod":
error = 1 error = 1
sys.exit(error) sys.exit(error)

5
Examples/test-suite/python/constructor_copy_runme.py
View file

@ -1,7 +1,7 @@
from constructor_copy import * from constructor_copy import *
f1 = Foo1(3); f1 = Foo1(3)
f11 = Foo1(f1); f11 = Foo1(f1)
if f1.x != f11.x: if f1.x != f11.x:
@ -35,4 +35,3 @@ except:
if not good: if not good:
raise RuntimeError raise RuntimeError

53
Examples/test-suite/python/contract_runme.py
View file

@ -1,6 +1,6 @@
import contract import contract
contract.test_preassert(1,2) contract.test_preassert(1, 2)
try: try:
contract.test_preassert(-1) contract.test_preassert(-1)
print "Failed! Preassertions are broken" print "Failed! Preassertions are broken"
@ -14,25 +14,25 @@ try:
except: except:
pass pass
contract.test_prepost(2,3) contract.test_prepost(2, 3)
contract.test_prepost(5,-4) contract.test_prepost(5, -4)
try: try:
contract.test_prepost(-3,4) contract.test_prepost(-3, 4)
print "Failed! Preassertions are broken" print "Failed! Preassertions are broken"
except: except:
pass pass
try: try:
contract.test_prepost(4,-10) contract.test_prepost(4, -10)
print "Failed! Postassertions are broken" print "Failed! Postassertions are broken"
except: except:
pass pass
f = contract.Foo() f = contract.Foo()
f.test_preassert(4,5) f.test_preassert(4, 5)
try: try:
f.test_preassert(-2,3) f.test_preassert(-2, 3)
print "Failed! Method preassertion." print "Failed! Method preassertion."
except: except:
pass pass
@ -44,36 +44,36 @@ try:
except: except:
pass pass
f.test_prepost(3,4) f.test_prepost(3, 4)
f.test_prepost(4,-3) f.test_prepost(4, -3)
try: try:
f.test_prepost(-4,2) f.test_prepost(-4, 2)
print "Failed! Method preassertion." print "Failed! Method preassertion."
except: except:
pass pass
try: try:
f.test_prepost(4,-10) f.test_prepost(4, -10)
print "Failed! Method postassertion." print "Failed! Method postassertion."
except: except:
pass pass
contract.Foo_stest_prepost(4,0) contract.Foo_stest_prepost(4, 0)
try: try:
contract.Foo_stest_prepost(-4,2) contract.Foo_stest_prepost(-4, 2)
print "Failed! Static method preassertion" print "Failed! Static method preassertion"
except: except:
pass pass
try: try:
contract.Foo_stest_prepost(4,-10) contract.Foo_stest_prepost(4, -10)
print "Failed! Static method posteassertion" print "Failed! Static method posteassertion"
except: except:
pass pass
b = contract.Bar() b = contract.Bar()
try: try:
b.test_prepost(2,-4) b.test_prepost(2, -4)
print "Failed! Inherited preassertion." print "Failed! Inherited preassertion."
except: except:
pass pass
@ -81,63 +81,62 @@ except:
d = contract.D() d = contract.D()
try: try:
d.foo(-1,1,1,1,1) d.foo(-1, 1, 1, 1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.foo(1,-1,1,1,1) d.foo(1, -1, 1, 1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.foo(1,1,-1,1,1) d.foo(1, 1, -1, 1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.foo(1,1,1,-1,1) d.foo(1, 1, 1, -1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.foo(1,1,1,1,-1) d.foo(1, 1, 1, 1, -1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.bar(-1,1,1,1,1) d.bar(-1, 1, 1, 1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.bar(1,-1,1,1,1) d.bar(1, -1, 1, 1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.bar(1,1,-1,1,1) d.bar(1, 1, -1, 1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.bar(1,1,1,-1,1) d.bar(1, 1, 1, -1, 1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
try: try:
d.bar(1,1,1,1,-1) d.bar(1, 1, 1, 1, -1)
print "Failed! Inherited preassertion (D)." print "Failed! Inherited preassertion (D)."
except: except:
pass pass
#Namespace # Namespace
my = contract.myClass(1) my = contract.myClass(1)
try: try:
my = contract.myClass(0) my = contract.myClass(0)
print "Failed! constructor preassertion" print "Failed! constructor preassertion"
except: except:
pass pass

11
Examples/test-suite/python/cpp11_alternate_function_syntax_runme.py
View file

@ -2,12 +2,13 @@ import cpp11_alternate_function_syntax
a = cpp11_alternate_function_syntax.SomeStruct() a = cpp11_alternate_function_syntax.SomeStruct()
res = a.addNormal(4,5) res = a.addNormal(4, 5)
if res != 9: if res != 9:
raise RuntimeError, ("SomeStruct::addNormal(4,5) returns ", res, " should be 9.") raise RuntimeError, ("SomeStruct::addNormal(4,5) returns ",
res, " should be 9.")
res = a.addAlternate(4,5) res = a.addAlternate(4, 5)
if res != 9: if res != 9:
raise RuntimeError, ("SomeStruct::addAlternate(4,5) returns ", res, " should be 9.") raise RuntimeError, ("SomeStruct::addAlternate(4,5) returns ",
res, " should be 9.")

1
Examples/test-suite/python/cpp11_decltype_runme.py
View file

@ -16,4 +16,3 @@ if b != 10:
b = a.foo(6) b = a.foo(6)
if b != 0: if b != 0:
raise RuntimeError, "foo(6) should return 0." raise RuntimeError, "foo(6) should return 0."

15
Examples/test-suite/python/cpp11_function_objects_runme.py
View file

@ -1,7 +1,9 @@
import cpp11_function_objects import cpp11_function_objects
import sys import sys
class Test1(cpp11_function_objects.Test): class Test1(cpp11_function_objects.Test):
def __init__(self): def __init__(self):
cpp11_function_objects.Test.__init__(self) cpp11_function_objects.Test.__init__(self)
@ -10,14 +12,17 @@ class Test1(cpp11_function_objects.Test):
t = cpp11_function_objects.Test() t = cpp11_function_objects.Test()
if t.value != 0: if t.value != 0:
raise RuntimeError("Runtime cpp11_function_objects failed. t.value should be 0, but is " + str(t.value)) raise RuntimeError(
"Runtime cpp11_function_objects failed. t.value should be 0, but is " + str(t.value))
t(1,2) # adds numbers and sets value t(1, 2) # adds numbers and sets value
if t.value != 3: if t.value != 3:
raise RuntimeError("Runtime cpp11_function_objects failed. t.value not changed - should be 3, but is " + str(t.value)) raise RuntimeError(
"Runtime cpp11_function_objects failed. t.value not changed - should be 3, but is " + str(t.value))
t2 = Test1() t2 = Test1()
a = cpp11_function_objects.testit1(t2, 4,3) a = cpp11_function_objects.testit1(t2, 4, 3)
if a != 12: if a != 12:
raise RuntimeError("Runtime cpp11_function_objects failed. t.value not changed - should be 12, but is " + str(a)) raise RuntimeError(
"Runtime cpp11_function_objects failed. t.value not changed - should be 12, but is " + str(a))

3
Examples/test-suite/python/cpp11_initializer_list_extend_runme.py
View file

@ -1,4 +1,3 @@
import cpp11_initializer_list_extend import cpp11_initializer_list_extend
c = cpp11_initializer_list_extend.Container( [10, 20, 30, 40] ) c = cpp11_initializer_list_extend.Container([10, 20, 30, 40])

1
Examples/test-suite/python/cpp11_initializer_list_runme.py
View file

@ -2,4 +2,3 @@ import cpp11_initializer_list
a = cpp11_initializer_list.A() a = cpp11_initializer_list.A()
a = cpp11_initializer_list.A(11.1) a = cpp11_initializer_list.A(11.1)

10
Examples/test-suite/python/cpp11_null_pointer_constant_runme.py
View file

@ -3,13 +3,15 @@ import cpp11_null_pointer_constant
a = cpp11_null_pointer_constant.A() a = cpp11_null_pointer_constant.A()
if a._myA != None: if a._myA != None:
raise RuntimeError, ("cpp11_null_pointer_constant: _myA should be None, but is ", a._myA) raise RuntimeError, (
"cpp11_null_pointer_constant: _myA should be None, but is ", a._myA)
b = cpp11_null_pointer_constant.A() b = cpp11_null_pointer_constant.A()
if a._myA != b._myA: if a._myA != b._myA:
raise RuntimeError, ("cpp11_null_pointer_constant: a._myA should be the same as b._myA, but ", a._myA, "!=", b._myA) raise RuntimeError, (
"cpp11_null_pointer_constant: a._myA should be the same as b._myA, but ", a._myA, "!=", b._myA)
a._myA = cpp11_null_pointer_constant.A() a._myA = cpp11_null_pointer_constant.A()
if a._myA == None: if a._myA == None:
raise RuntimeError, ("cpp11_null_pointer_constant: _myA should be object, but is None") raise RuntimeError, (
"cpp11_null_pointer_constant: _myA should be object, but is None")

2
Examples/test-suite/python/cpp11_raw_string_literals_runme.py
View file

@ -46,5 +46,3 @@ if cvar.ff != "I'm a \"raw wide\" \\ string.":
if cvar.gg != "I'm a \"raw UTF-8\" \\ string.": if cvar.gg != "I'm a \"raw UTF-8\" \\ string.":
raise RuntimeError, cvar.gg raise RuntimeError, cvar.gg

6
Examples/test-suite/python/cpp11_result_of_runme.py
View file

@ -2,8 +2,10 @@ import cpp11_result_of
result = cpp11_result_of.test_result(cpp11_result_of.SQUARE, 3.0) result = cpp11_result_of.test_result(cpp11_result_of.SQUARE, 3.0)
if result != 9.0: if result != 9.0:
raise RuntimeError, "test_result(square, 3.0) is not 9.0. Got: " + str(result) raise RuntimeError, "test_result(square, 3.0) is not 9.0. Got: " + str(
result)
result = cpp11_result_of.test_result_alternative1(cpp11_result_of.SQUARE, 3.0) result = cpp11_result_of.test_result_alternative1(cpp11_result_of.SQUARE, 3.0)
if result != 9.0: if result != 9.0:
raise RuntimeError, "test_result_alternative1(square, 3.0) is not 9.0. Got: " + str(result) raise RuntimeError, "test_result_alternative1(square, 3.0) is not 9.0. Got: " + str(
result)

13
Examples/test-suite/python/cpp11_rvalue_reference_runme.py
View file

@ -4,21 +4,24 @@ a = cpp11_rvalue_reference.A()
a.setAcopy(5) a.setAcopy(5)
if a.getAcopy() != 5: if a.getAcopy() != 5:
raise RunTimeError, ("int A::getAcopy() value is ", a.getAcopy(), " should be 5") raise RunTimeError, ("int A::getAcopy() value is ",
a.getAcopy(), " should be 5")
ptr = a.getAptr() ptr = a.getAptr()
a.setAptr(ptr) a.setAptr(ptr)
if a.getAcopy() != 5: if a.getAcopy() != 5:
raise RunTimeError, ("after A::setAptr(): int A::getAcopy() value is ", a.getAcopy(), " should be 5") raise RunTimeError, ("after A::setAptr(): int A::getAcopy() value is ", a.getAcopy(
), " should be 5")
a.setAref(ptr) a.setAref(ptr)
if a.getAcopy() != 5: if a.getAcopy() != 5:
raise RunTimeError, ("after A::setAref(): int A::getAcopy() value is ", a.getAcopy(), " should be 5") raise RunTimeError, ("after A::setAref(): int A::getAcopy() value is ", a.getAcopy(
), " should be 5")
rvalueref = a.getAmove() rvalueref = a.getAmove()
a.setAmove(rvalueref) a.setAmove(rvalueref)
if a.getAcopy() != 5: if a.getAcopy() != 5:
raise RunTimeError, ("after A::setAmove(): int A::getAcopy() value is ", a.getAcopy(), " should be 5") raise RunTimeError, ("after A::setAmove(): int A::getAcopy() value is ", a.getAcopy(
), " should be 5")

5
Examples/test-suite/python/cpp11_strongly_typed_enumerations_runme.py
View file

@ -1,8 +1,10 @@
from cpp11_strongly_typed_enumerations import * from cpp11_strongly_typed_enumerations import *
def enumCheck(actual, expected): def enumCheck(actual, expected):
if actual != expected: if actual != expected:
raise RuntimeError("Enum value mismatch. Expected " + str(expected) + " Actual: " + str(actual)) raise RuntimeError(
"Enum value mismatch. Expected " + str(expected) + " Actual: " + str(actual))
return expected + 1 return expected + 1
val = 0 val = 0
@ -161,4 +163,3 @@ enumCheck(class1.class1Test2(Class1.Enum12_Val5c), 1121)
enumCheck(globalTest1(Enum1_Val5a), 13) enumCheck(globalTest1(Enum1_Val5a), 13)
enumCheck(globalTest2(Class1.Enum12_Val5c), 1121) enumCheck(globalTest2(Class1.Enum12_Val5c), 1121)
#enumCheck(globalTest3(Class1.Struct1.Enum12_Val5f), 3121) #enumCheck(globalTest3(Class1.Struct1.Enum12_Val5f), 3121)

1
Examples/test-suite/python/cpp11_thread_local_runme.py
View file

@ -35,4 +35,3 @@ if cvar.ectval != -66:
cvar.ecpptval = -66 cvar.ecpptval = -66
if cvar.ecpptval != -66: if cvar.ecpptval != -66:
raise RuntimeError raise RuntimeError

2
Examples/test-suite/python/cpp11_uniform_initialization_runme.py
View file

@ -15,7 +15,7 @@ if m.charptr != "hello sir":
raise RuntimeError, m.charptr raise RuntimeError, m.charptr
if m.more1(m.vi) != 15: if m.more1(m.vi) != 15:
raise RuntimeError, m.vi raise RuntimeError, m.vi
if m.more1( [-1,1,2] ) != 2: if m.more1([-1, 1, 2]) != 2:
raise RuntimeError, m.vi raise RuntimeError, m.vi
if m.more1() != 10: if m.more1() != 10:
raise RuntimeError raise RuntimeError

10
Examples/test-suite/python/cpp_namespace_runme.py
View file

@ -30,16 +30,14 @@ t5 = cpp_namespace.Test5()
if cpp_namespace.foo3(42) != 42: if cpp_namespace.foo3(42) != 42:
raise RuntimeError("Bad return value!") raise RuntimeError("Bad return value!")
if cpp_namespace.do_method3(t2,40) != "Test2::method": if cpp_namespace.do_method3(t2, 40) != "Test2::method":
raise RuntimeError("Bad return value!") raise RuntimeError("Bad return value!")
if cpp_namespace.do_method3(t3,40) != "Test3::method": if cpp_namespace.do_method3(t3, 40) != "Test3::method":
raise RuntimeError("Bad return value!") raise RuntimeError("Bad return value!")
if cpp_namespace.do_method3(t4,40) != "Test4::method": if cpp_namespace.do_method3(t4, 40) != "Test4::method":
raise RuntimeError("Bad return value!") raise RuntimeError("Bad return value!")
if cpp_namespace.do_method3(t5,40) != "Test5::method": if cpp_namespace.do_method3(t5, 40) != "Test5::method":
raise RuntimeError("Bad return value!") raise RuntimeError("Bad return value!")

5
Examples/test-suite/python/cpp_static_runme.py
View file

@ -1,16 +1,17 @@
#!/usr/bin/evn python #!/usr/bin/evn python
from cpp_static import * from cpp_static import *
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
if is_new_style_class(StaticFunctionTest): if is_new_style_class(StaticFunctionTest):
StaticFunctionTest.static_func() StaticFunctionTest.static_func()
StaticFunctionTest.static_func_2(1) StaticFunctionTest.static_func_2(1)
StaticFunctionTest.static_func_3(1,2) StaticFunctionTest.static_func_3(1, 2)
else: else:
StaticFunctionTest().static_func() StaticFunctionTest().static_func()
StaticFunctionTest().static_func_2(1) StaticFunctionTest().static_func_2(1)
StaticFunctionTest().static_func_3(1,2) StaticFunctionTest().static_func_3(1, 2)
StaticMemberTest.static_int = 10 StaticMemberTest.static_int = 10
assert StaticMemberTest.static_int == 10 assert StaticMemberTest.static_int == 10

2
Examples/test-suite/python/default_arg_values_runme.py
View file

@ -8,7 +8,7 @@ if d.draw1() != 0:
if d.draw1(12) != 12: if d.draw1(12) != 12:
raise RuntimeError raise RuntimeError
p = createPtr(123); p = createPtr(123)
if d.draw2() != 0: if d.draw2() != 0:
raise RuntimeError raise RuntimeError

47
Examples/test-suite/python/default_args_runme.py
View file

@ -1,8 +1,11 @@
# Note that this test is also used by python_default_args_runme.py hence the use of __main__ and the run function # Note that this test is also used by python_default_args_runme.py hence
# the use of __main__ and the run function
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
def run(module_name): def run(module_name):
default_args = __import__(module_name) default_args = __import__(module_name)
ec = default_args.EnumClass() ec = default_args.EnumClass()
@ -25,7 +28,6 @@ def run(module_name):
if default_args.cfunc3(1) != 4: if default_args.cfunc3(1) != 4:
raise RuntimeError raise RuntimeError
f = default_args.Foo() f = default_args.Foo()
f.newname() f.newname()
@ -54,42 +56,48 @@ def run(module_name):
error = 1 error = 1
except: except:
error = 0 error = 0
if error: raise RuntimeError("Foo::Foo ignore is not working") if error:
raise RuntimeError("Foo::Foo ignore is not working")
try: try:
f = default_args.Foo(1,2) f = default_args.Foo(1, 2)
error = 1 error = 1
except: except:
error = 0 error = 0
if error: raise RuntimeError("Foo::Foo ignore is not working") if error:
raise RuntimeError("Foo::Foo ignore is not working")
try: try:
f = default_args.Foo(1,2,3) f = default_args.Foo(1, 2, 3)
error = 1 error = 1
except: except:
error = 0 error = 0
if error: raise RuntimeError("Foo::Foo ignore is not working") if error:
raise RuntimeError("Foo::Foo ignore is not working")
try: try:
m = f.meth(1) m = f.meth(1)
error = 1 error = 1
except: except:
error = 0 error = 0
if error: raise RuntimeError("Foo::meth ignore is not working") if error:
raise RuntimeError("Foo::meth ignore is not working")
try: try:
m = f.meth(1,2) m = f.meth(1, 2)
error = 1 error = 1
except: except:
error = 0 error = 0
if error: raise RuntimeError("Foo::meth ignore is not working") if error:
raise RuntimeError("Foo::meth ignore is not working")
try: try:
m = f.meth(1,2,3) m = f.meth(1, 2, 3)
error = 1 error = 1
except: except:
error = 0 error = 0
if error: raise RuntimeError("Foo::meth ignore is not working") if error:
raise RuntimeError("Foo::meth ignore is not working")
if is_new_style_class(default_args.Klass): if is_new_style_class(default_args.Klass):
Klass_inc = default_args.Klass.inc Klass_inc = default_args.Klass.inc
@ -105,10 +113,14 @@ def run(module_name):
if Klass_inc().val != 0: if Klass_inc().val != 0:
raise RuntimeError("Klass::inc failed") raise RuntimeError("Klass::inc failed")
default_args.trickyvalue1(10); default_args.trickyvalue1(10, 10) default_args.trickyvalue1(10)
default_args.trickyvalue2(10); default_args.trickyvalue2(10, 10) default_args.trickyvalue1(10, 10)
default_args.trickyvalue3(10); default_args.trickyvalue3(10, 10) default_args.trickyvalue2(10)
default_args.seek(); default_args.seek(10) default_args.trickyvalue2(10, 10)
default_args.trickyvalue3(10)
default_args.trickyvalue3(10, 10)
default_args.seek()
default_args.seek(10)
if default_args.slightly_off_square(10) != 102: if default_args.slightly_off_square(10) != 102:
raise RuntimeError raise RuntimeError
@ -117,6 +129,5 @@ def run(module_name):
raise RuntimeError raise RuntimeError
if __name__=="__main__": if __name__ == "__main__":
run('default_args') run('default_args')

7
Examples/test-suite/python/default_constructor_runme.py
View file

@ -23,7 +23,7 @@ except:
del_b = dc.delete_B del_b = dc.delete_B
try: try:
bb = dc.new_BB(); bb = dc.new_BB()
print "Whoa. new_BB created." print "Whoa. new_BB created."
except: except:
pass pass
@ -42,7 +42,7 @@ cc = dc.new_CC()
dc.delete_CC(cc) dc.delete_CC(cc)
try: try:
d = dc.new_D(); d = dc.new_D()
print "Whoa. new_D created" print "Whoa. new_D created"
except: except:
pass pass
@ -113,5 +113,4 @@ dc.delete_GG(gg)
import default_constructor import default_constructor
hh = default_constructor.HH(1,1) hh = default_constructor.HH(1, 1)

26
Examples/test-suite/python/director_abstract_runme.py
View file

@ -1,11 +1,15 @@
import director_abstract import director_abstract
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
class MyFoo(director_abstract.Foo): class MyFoo(director_abstract.Foo):
def __init__(self): def __init__(self):
director_abstract.Foo.__init__(self) director_abstract.Foo.__init__(self)
def ping(self): def ping(self):
return "MyFoo::ping()" return "MyFoo::ping()"
@ -20,27 +24,32 @@ if a.pong() != "Foo::pong();MyFoo::ping()":
class MyExample1(director_abstract.Example1): class MyExample1(director_abstract.Example1):
def Color(self, r, g, b): def Color(self, r, g, b):
return r return r
class MyExample2(director_abstract.Example2): class MyExample2(director_abstract.Example2):
def Color(self, r, g, b): def Color(self, r, g, b):
return g return g
class MyExample3(director_abstract.Example3_i): class MyExample3(director_abstract.Example3_i):
def Color(self, r, g, b): def Color(self, r, g, b):
return b return b
me1 = MyExample1() me1 = MyExample1()
if director_abstract.Example1_get_color(me1, 1,2,3) != 1: if director_abstract.Example1_get_color(me1, 1, 2, 3) != 1:
raise RuntimeError raise RuntimeError
if is_new_style_class(MyExample2): if is_new_style_class(MyExample2):
MyExample2_static = MyExample2 MyExample2_static = MyExample2
else: else:
MyExample2_static = MyExample2(0, 0) MyExample2_static = MyExample2(0, 0)
me2 = MyExample2(1,2) me2 = MyExample2(1, 2)
if MyExample2_static.get_color(me2, 1,2,3) != 2: if MyExample2_static.get_color(me2, 1, 2, 3) != 2:
raise RuntimeError raise RuntimeError
if is_new_style_class(MyExample3): if is_new_style_class(MyExample3):
@ -48,7 +57,7 @@ if is_new_style_class(MyExample3):
else: else:
MyExample3_static = MyExample3() MyExample3_static = MyExample3()
me3 = MyExample3() me3 = MyExample3()
if MyExample3_static.get_color(me3, 1,2,3) != 3: if MyExample3_static.get_color(me3, 1, 2, 3) != 3:
raise RuntimeError raise RuntimeError
error = 1 error = 1
@ -56,21 +65,24 @@ try:
me1 = director_abstract.Example1() me1 = director_abstract.Example1()
except: except:
error = 0 error = 0
if (error): raise RuntimeError if (error):
raise RuntimeError
error = 1 error = 1
try: try:
me2 = director_abstract.Example2() me2 = director_abstract.Example2()
except: except:
error = 0 error = 0
if (error): raise RuntimeError if (error):
raise RuntimeError
error = 1 error = 1
try: try:
me3 = director_abstract.Example3_i() me3 = director_abstract.Example3_i()
except: except:
error = 0 error = 0
if (error): raise RuntimeError if (error):
raise RuntimeError
try: try:

15
Examples/test-suite/python/director_basic_runme.py
View file

@ -1,6 +1,8 @@
import director_basic import director_basic
class PyFoo(director_basic.Foo): class PyFoo(director_basic.Foo):
def ping(self): def ping(self):
return "PyFoo::ping()" return "PyFoo::ping()"
@ -27,8 +29,8 @@ if a.rg(2) != 2:
raise RuntimeError raise RuntimeError
class PyClass(director_basic.MyClass): class PyClass(director_basic.MyClass):
def method(self, vptr): def method(self, vptr):
self.cmethod = 7 self.cmethod = 7
pass pass
@ -60,39 +62,32 @@ if bd.x != 16:
raise RuntimeError raise RuntimeError
class PyMulti(director_basic.Foo, director_basic.MyClass): class PyMulti(director_basic.Foo, director_basic.MyClass):
def __init__(self): def __init__(self):
director_basic.Foo.__init__(self) director_basic.Foo.__init__(self)
director_basic.MyClass.__init__(self) director_basic.MyClass.__init__(self)
pass pass
def vmethod(self, b): def vmethod(self, b):
b.x = b.x + 31 b.x = b.x + 31
return b return b
def ping(self): def ping(self):
return "PyFoo::ping()" return "PyFoo::ping()"
a = 0 a = 0
for i in range(0,100): for i in range(0, 100):
pymult = PyMulti() pymult = PyMulti()
pymult.pong() pymult.pong()
del pymult del pymult
pymult = PyMulti() pymult = PyMulti()
p1 = director_basic.Foo_get_self(pymult) p1 = director_basic.Foo_get_self(pymult)
p2 = director_basic.MyClass_get_self(pymult) p2 = director_basic.MyClass_get_self(pymult)
p1.ping() p1.ping()
p2.vmethod(bc) p2.vmethod(bc)

89
Examples/test-suite/python/director_classic_runme.py
View file

@ -1,53 +1,76 @@
from director_classic import * from director_classic import *
class TargetLangPerson(Person): class TargetLangPerson(Person):
def __init__(self): def __init__(self):
Person.__init__(self) Person.__init__(self)
def id(self): def id(self):
identifier = "TargetLangPerson" identifier = "TargetLangPerson"
return identifier return identifier
class TargetLangChild(Child): class TargetLangChild(Child):
def __init__(self): def __init__(self):
Child.__init__(self) Child.__init__(self)
def id(self): def id(self):
identifier = "TargetLangChild" identifier = "TargetLangChild"
return identifier return identifier
class TargetLangGrandChild(GrandChild): class TargetLangGrandChild(GrandChild):
def __init__(self): def __init__(self):
GrandChild.__init__(self) GrandChild.__init__(self)
def id(self): def id(self):
identifier = "TargetLangGrandChild" identifier = "TargetLangGrandChild"
return identifier return identifier
# Semis - don't override id() in target language # Semis - don't override id() in target language
class TargetLangSemiPerson(Person): class TargetLangSemiPerson(Person):
def __init__(self): def __init__(self):
Person.__init__(self) Person.__init__(self)
# No id() override # No id() override
class TargetLangSemiChild(Child): class TargetLangSemiChild(Child):
def __init__(self): def __init__(self):
Child.__init__(self) Child.__init__(self)
# No id() override # No id() override
class TargetLangSemiGrandChild(GrandChild): class TargetLangSemiGrandChild(GrandChild):
def __init__(self): def __init__(self):
GrandChild.__init__(self) GrandChild.__init__(self)
# No id() override # No id() override
# Orphans - don't override id() in C++ # Orphans - don't override id() in C++
class TargetLangOrphanPerson(OrphanPerson): class TargetLangOrphanPerson(OrphanPerson):
def __init__(self): def __init__(self):
OrphanPerson.__init__(self) OrphanPerson.__init__(self)
def id(self): def id(self):
identifier = "TargetLangOrphanPerson" identifier = "TargetLangOrphanPerson"
return identifier return identifier
class TargetLangOrphanChild(OrphanChild): class TargetLangOrphanChild(OrphanChild):
def __init__(self): def __init__(self):
Child.__init__(self) Child.__init__(self)
def id(self): def id(self):
identifier = "TargetLangOrphanChild" identifier = "TargetLangOrphanChild"
return identifier return identifier
@ -61,7 +84,8 @@ def check(person, expected):
if (debug): if (debug):
print(ret) print(ret)
if (ret != expected): if (ret != expected):
raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected) raise RuntimeError(
"Failed. Received: " + str(ret) + " Expected: " + expected)
# Polymorphic call from C++ # Polymorphic call from C++
caller = Caller() caller = Caller()
@ -70,73 +94,74 @@ def check(person, expected):
if (debug): if (debug):
print(ret) print(ret)
if (ret != expected): if (ret != expected):
raise RuntimeError("Failed. Received: " + str(ret) + " Expected: " + expected) raise RuntimeError(
"Failed. Received: " + str(ret) + " Expected: " + expected)
# Polymorphic call of object created in target language and passed to C++ and back again # Polymorphic call of object created in target language and passed to C++
# and back again
baseclass = caller.baseClass() baseclass = caller.baseClass()
ret = baseclass.id() ret = baseclass.id()
if (debug): if (debug):
print(ret) print(ret)
if (ret != expected): if (ret != expected):
raise RuntimeError("Failed. Received: " + str(ret)+ " Expected: " + expected) raise RuntimeError(
"Failed. Received: " + str(ret) + " Expected: " + expected)
caller.resetCallback() caller.resetCallback()
if (debug): if (debug):
print("----------------------------------------") print("----------------------------------------")
person = Person()
person = Person(); check(person, "Person")
check(person, "Person");
del person del person
person = Child(); person = Child()
check(person, "Child"); check(person, "Child")
del person del person
person = GrandChild(); person = GrandChild()
check(person, "GrandChild"); check(person, "GrandChild")
del person del person
person = TargetLangPerson(); person = TargetLangPerson()
check(person, "TargetLangPerson"); check(person, "TargetLangPerson")
del person del person
person = TargetLangChild(); person = TargetLangChild()
check(person, "TargetLangChild"); check(person, "TargetLangChild")
del person del person
person = TargetLangGrandChild(); person = TargetLangGrandChild()
check(person, "TargetLangGrandChild"); check(person, "TargetLangGrandChild")
del person del person
# Semis - don't override id() in target language # Semis - don't override id() in target language
person = TargetLangSemiPerson(); person = TargetLangSemiPerson()
check(person, "Person"); check(person, "Person")
del person del person
person = TargetLangSemiChild(); person = TargetLangSemiChild()
check(person, "Child"); check(person, "Child")
del person del person
person = TargetLangSemiGrandChild(); person = TargetLangSemiGrandChild()
check(person, "GrandChild"); check(person, "GrandChild")
del person del person
# Orphans - don't override id() in C++ # Orphans - don't override id() in C++
person = OrphanPerson(); person = OrphanPerson()
check(person, "Person"); check(person, "Person")
del person del person
person = OrphanChild(); person = OrphanChild()
check(person, "Child"); check(person, "Child")
del person del person
person = TargetLangOrphanPerson(); person = TargetLangOrphanPerson()
check(person, "TargetLangOrphanPerson"); check(person, "TargetLangOrphanPerson")
del person del person
person = TargetLangOrphanChild(); person = TargetLangOrphanChild()
check(person, "TargetLangOrphanChild"); check(person, "TargetLangOrphanChild")
del person del person

6
Examples/test-suite/python/director_detect_runme.py
View file

@ -1,7 +1,9 @@
import director_detect import director_detect
class MyBar(director_detect.Bar): class MyBar(director_detect.Bar):
def __init__(self, val = 2):
def __init__(self, val=2):
director_detect.Bar.__init__(self) director_detect.Bar.__init__(self)
self.val = val self.val = val
@ -33,4 +35,4 @@ c = b.clone()
vc = c.get_value() vc = c.get_value()
if (v != 3) or (b.val != 5) or (vc != 6): if (v != 3) or (b.val != 5) or (vc != 6):
raise RuntimeError,"Bad virtual detection" raise RuntimeError, "Bad virtual detection"

2
Examples/test-suite/python/director_enum_runme.py
View file

@ -1,6 +1,8 @@
import director_enum import director_enum
class MyFoo(director_enum.Foo): class MyFoo(director_enum.Foo):
def say_hi(self, val): def say_hi(self, val):
return val return val

8
Examples/test-suite/python/director_exception_runme.py
View file

@ -1,19 +1,27 @@
from director_exception import * from director_exception import *
class MyException(Exception): class MyException(Exception):
def __init__(self, a, b): def __init__(self, a, b):
self.msg = a + b self.msg = a + b
class MyFoo(Foo): class MyFoo(Foo):
def ping(self): def ping(self):
raise NotImplementedError, "MyFoo::ping() EXCEPTION" raise NotImplementedError, "MyFoo::ping() EXCEPTION"
class MyFoo2(Foo): class MyFoo2(Foo):
def ping(self): def ping(self):
return True return True
pass # error: should return a string pass # error: should return a string
class MyFoo3(Foo): class MyFoo3(Foo):
def ping(self): def ping(self):
raise MyException("foo", "bar") raise MyException("foo", "bar")

6
Examples/test-suite/python/director_extend_runme.py
View file

@ -1,11 +1,13 @@
# Test case from bug #1506850 # Test case from bug #1506850
#"When threading is enabled, the interpreter will infinitely wait on a mutex the second #"When threading is enabled, the interpreter will infinitely wait on a mutex the second
#time this type of extended method is called. Attached is an example # time this type of extended method is called. Attached is an example
#program that waits on the mutex to be unlocked." # program that waits on the mutex to be unlocked."
from director_extend import * from director_extend import *
class MyObject(SpObject): class MyObject(SpObject):
def __init__(self): def __init__(self):
SpObject.__init__(self) SpObject.__init__(self)
return return

9
Examples/test-suite/python/director_finalizer_runme.py
View file

@ -1,10 +1,14 @@
from director_finalizer import * from director_finalizer import *
class MyFoo(Foo): class MyFoo(Foo):
def __del__(self): def __del__(self):
self.orStatus(2) self.orStatus(2)
try: Foo.__del__(self) try:
except: pass Foo.__del__(self)
except:
pass
resetStatus() resetStatus()
@ -45,4 +49,3 @@ if getStatus() != 3:
raise RuntimeError raise RuntimeError
resetStatus() resetStatus()

4
Examples/test-suite/python/director_frob_runme.py
View file

@ -1,7 +1,7 @@
from director_frob import * from director_frob import *
foo = Bravo(); foo = Bravo()
s = foo.abs_method(); s = foo.abs_method()
if s != "Bravo::abs_method()": if s != "Bravo::abs_method()":
raise RuntimeError, s raise RuntimeError, s

1
Examples/test-suite/python/director_keywords_runme.py
View file

@ -2,4 +2,3 @@ from director_keywords import *
f = Foo() f = Foo()
f.check_self(20) f.check_self(20)

9
Examples/test-suite/python/director_nested_runme.py
View file

@ -2,6 +2,7 @@ from director_nested import *
class A(FooBar_int): class A(FooBar_int):
def do_step(self): def do_step(self):
return "A::do_step;" return "A::do_step;"
@ -13,10 +14,11 @@ class A(FooBar_int):
a = A() a = A()
if a.step() != "Bar::step;Foo::advance;Bar::do_advance;A::do_step;": if a.step() != "Bar::step;Foo::advance;Bar::do_advance;A::do_step;":
raise RuntimeError,"Bad A virtual resolution" raise RuntimeError, "Bad A virtual resolution"
class B(FooBar_int): class B(FooBar_int):
def do_advance(self): def do_advance(self):
return "B::do_advance;" + self.do_step() return "B::do_advance;" + self.do_step()
@ -32,11 +34,11 @@ class B(FooBar_int):
b = B() b = B()
if b.step() != "Bar::step;Foo::advance;B::do_advance;B::do_step;": if b.step() != "Bar::step;Foo::advance;B::do_advance;B::do_step;":
raise RuntimeError,"Bad B virtual resolution" raise RuntimeError, "Bad B virtual resolution"
class C(FooBar_int): class C(FooBar_int):
def do_advance(self): def do_advance(self):
return "C::do_advance;" + FooBar_int.do_advance(self) return "C::do_advance;" + FooBar_int.do_advance(self)
@ -49,7 +51,6 @@ class C(FooBar_int):
def get_name(self): def get_name(self):
return FooBar_int.get_name(self) + " hello" return FooBar_int.get_name(self) + " hello"
pass pass
cc = C() cc = C()

48
Examples/test-suite/python/director_profile_runme.py
View file

@ -1,9 +1,10 @@
import director_profile import director_profile
class MyB(director_profile.B):
def vfi(self, a):
return a+3
class MyB(director_profile.B):
def vfi(self, a):
return a + 3
a = director_profile.A() a = director_profile.A()
@ -15,27 +16,26 @@ fi = b.fi
i = 50000 i = 50000
a = 1 a = 1
while i: while i:
a = fi(a) #1 a = fi(a) # 1
a = fi(a) #2 a = fi(a) # 2
a = fi(a) #3 a = fi(a) # 3
a = fi(a) #4 a = fi(a) # 4
a = fi(a) #5 a = fi(a) # 5
a = fi(a) #6 a = fi(a) # 6
a = fi(a) #7 a = fi(a) # 7
a = fi(a) #8 a = fi(a) # 8
a = fi(a) #9 a = fi(a) # 9
a = fi(a) #10 a = fi(a) # 10
a = fi(a) #1 a = fi(a) # 1
a = fi(a) #2 a = fi(a) # 2
a = fi(a) #3 a = fi(a) # 3
a = fi(a) #4 a = fi(a) # 4
a = fi(a) #5 a = fi(a) # 5
a = fi(a) #6 a = fi(a) # 6
a = fi(a) #7 a = fi(a) # 7
a = fi(a) #8 a = fi(a) # 8
a = fi(a) #9 a = fi(a) # 9
a = fi(a) #20 a = fi(a) # 20
i -= 1 i -= 1
print a print a

1
Examples/test-suite/python/director_property_runme.py
View file

@ -1,5 +1,6 @@
import director_property import director_property
class PyFoo(director_property.Foo): class PyFoo(director_property.Foo):
a = property(director_property.Foo.getA, director_property.Foo.setA) a = property(director_property.Foo.getA, director_property.Foo.setA)

43
Examples/test-suite/python/director_protected_runme.py
View file

@ -1,18 +1,23 @@
from director_protected import * from director_protected import *
class FooBar(Bar): class FooBar(Bar):
def ping(self): def ping(self):
return "FooBar::ping();" return "FooBar::ping();"
class FooBar2(Bar): class FooBar2(Bar):
def ping(self): def ping(self):
return "FooBar2::ping();" return "FooBar2::ping();"
def pang(self): def pang(self):
return "FooBar2::pang();" return "FooBar2::pang();"
class FooBar3(Bar): class FooBar3(Bar):
def cheer(self): def cheer(self):
return "FooBar3::cheer();" return "FooBar3::cheer();"
@ -54,7 +59,7 @@ try:
raise RuntimeError raise RuntimeError
pass pass
except: except:
raise RuntimeError," bad Foo::pong" raise RuntimeError, " bad Foo::pong"
try: try:
s = fb.pong() s = fb.pong()
@ -62,54 +67,54 @@ try:
raise RuntimeError raise RuntimeError
pass pass
except: except:
raise RuntimeError," bad FooBar::pong" raise RuntimeError, " bad FooBar::pong"
protected=1 protected = 1
try: try:
b.ping() b.ping()
protected=0 protected = 0
except: except:
pass pass
if not protected: if not protected:
raise RuntimeError,"Foo::ping is protected" raise RuntimeError, "Foo::ping is protected"
protected=1 protected = 1
try: try:
f.ping() f.ping()
protected=0 protected = 0
except: except:
pass pass
if not protected: if not protected:
raise RuntimeError,"Foo::ping is protected" raise RuntimeError, "Foo::ping is protected"
protected=1 protected = 1
try: try:
f.pang() f.pang()
protected=0 protected = 0
except: except:
pass pass
if not protected: if not protected:
raise RuntimeError,"FooBar::pang is protected" raise RuntimeError, "FooBar::pang is protected"
protected=1 protected = 1
try: try:
b.cheer() b.cheer()
protected=0 protected = 0
except: except:
pass pass
if not protected: if not protected:
raise RuntimeError,"Bar::cheer is protected" raise RuntimeError, "Bar::cheer is protected"
protected=1 protected = 1
try: try:
f.cheer() f.cheer()
protected=0 protected = 0
except: except:
pass pass
if not protected: if not protected:
raise RuntimeError,"Foo::cheer is protected" raise RuntimeError, "Foo::cheer is protected"
if fb3.cheer() != "FooBar3::cheer();": if fb3.cheer() != "FooBar3::cheer();":
raise RuntimeError, "bad fb3::cheer" raise RuntimeError, "bad fb3::cheer"
@ -125,5 +130,3 @@ if fb3.callping() != "Bar::ping();":
if fb3.callcheer() != "FooBar3::cheer();": if fb3.callcheer() != "FooBar3::cheer();":
raise RuntimeError, "bad fb3.callcheer" raise RuntimeError, "bad fb3.callcheer"

20
Examples/test-suite/python/director_stl_runme.py
View file

@ -1,19 +1,21 @@
import director_stl import director_stl
class MyFoo(director_stl.Foo): class MyFoo(director_stl.Foo):
def ping(self, s): def ping(self, s):
return "MyFoo::ping():" + s return "MyFoo::ping():" + s
def pident(self, arg): def pident(self, arg):
return arg return arg
def vident(self,v): def vident(self, v):
return v return v
def vidents(self,v): def vidents(self, v):
return v return v
def vsecond(self,v1,v2): def vsecond(self, v1, v2):
return v2 return v2
@ -22,18 +24,18 @@ a = MyFoo()
a.tping("hello") a.tping("hello")
a.tpong("hello") a.tpong("hello")
p = (1,2) p = (1, 2)
a.pident(p) a.pident(p)
v = (3,4) v = (3, 4)
a.vident(v) a.vident(v)
a.tpident(p) a.tpident(p)
a.tvident(v) a.tvident(v)
v1 = (3,4) v1 = (3, 4)
v2 = (5,6) v2 = (5, 6)
a.tvsecond(v1,v2) a.tvsecond(v1, v2)
vs=("hi", "hello") vs = ("hi", "hello")
vs vs
a.tvidents(vs) a.tvidents(vs)

8
Examples/test-suite/python/director_string_runme.py
View file

@ -1,8 +1,10 @@
from director_string import * from director_string import *
class B(A): class B(A):
def __init__(self,string):
A.__init__(self,string) def __init__(self, string):
A.__init__(self, string)
def get_first(self): def get_first(self):
return A.get_first(self) + " world!" return A.get_first(self) + " world!"
@ -12,7 +14,6 @@ class B(A):
self.smem = "hello" self.smem = "hello"
b = B("hello") b = B("hello")
b.get(0) b.get(0)
@ -26,4 +27,3 @@ b.call_process_func()
if b.smem != "hello": if b.smem != "hello":
print smem print smem
raise RuntimeError raise RuntimeError

4
Examples/test-suite/python/director_thread_runme.py
View file

@ -1,6 +1,8 @@
from director_thread import Foo from director_thread import Foo
class Derived(Foo) :
class Derived(Foo):
def __init__(self): def __init__(self):
Foo.__init__(self) Foo.__init__(self)

3
Examples/test-suite/python/director_unroll_runme.py
View file

@ -1,6 +1,8 @@
import director_unroll import director_unroll
class MyFoo(director_unroll.Foo): class MyFoo(director_unroll.Foo):
def ping(self): def ping(self):
return "MyFoo::ping()" return "MyFoo::ping()"
@ -16,4 +18,3 @@ c = b.get()
if not (a.this == c.this): if not (a.this == c.this):
print a, c print a, c
raise RuntimeError raise RuntimeError

8
Examples/test-suite/python/director_wstring_runme.py
View file

@ -1,8 +1,10 @@
from director_wstring import * from director_wstring import *
class B(A): class B(A):
def __init__(self,string):
A.__init__(self,string) def __init__(self, string):
A.__init__(self, string)
def get_first(self): def get_first(self):
return A.get_first(self) + u" world!" return A.get_first(self) + u" world!"
@ -11,7 +13,6 @@ class B(A):
self.smem = u"hello" self.smem = u"hello"
b = B(u"hello") b = B(u"hello")
b.get(0) b.get(0)
@ -25,4 +26,3 @@ b.call_process_func()
if b.smem != u"hello": if b.smem != u"hello":
print smem print smem
raise RuntimeError raise RuntimeError

1
Examples/test-suite/python/dynamic_cast_runme.py
View file

@ -9,4 +9,3 @@ y = b.blah()
a = dynamic_cast.do_test(y) a = dynamic_cast.do_test(y)
if a != "Bar::test": if a != "Bar::test":
print "Failed!!" print "Failed!!"

12
Examples/test-suite/python/enum_forward_runme.py
View file

@ -1,10 +1,10 @@
import enum_forward import enum_forward
f1 = enum_forward.get_enum1(); f1 = enum_forward.get_enum1()
f1 = enum_forward.test_function1(f1); f1 = enum_forward.test_function1(f1)
f2 = enum_forward.get_enum2(); f2 = enum_forward.get_enum2()
f2 = enum_forward.test_function2(f2); f2 = enum_forward.test_function2(f2)
f3 = enum_forward.get_enum3(); f3 = enum_forward.get_enum3()
f3 = enum_forward.test_function3(f3); f3 = enum_forward.test_function3(f3)

1
Examples/test-suite/python/enum_template_runme.py
View file

@ -4,4 +4,3 @@ if enum_template.MakeETest() != 1:
if enum_template.TakeETest(0) != None: if enum_template.TakeETest(0) != None:
raise RuntimeError raise RuntimeError

1
Examples/test-suite/python/enums_runme.py
View file

@ -16,4 +16,3 @@ if _enums.cvar.Mine != 11:
if _enums.cvar.Thigh != 12: if _enums.cvar.Thigh != 12:
raise RuntimeError raise RuntimeError

11
Examples/test-suite/python/exception_order_runme.py
View file

@ -9,37 +9,36 @@ a = A()
try: try:
a.foo() a.foo()
except E1,e: except E1, e:
pass pass
except: except:
raise RuntimeError, "bad exception order" raise RuntimeError, "bad exception order"
try: try:
a.bar() a.bar()
except E2,e: except E2, e:
pass pass
except: except:
raise RuntimeError, "bad exception order" raise RuntimeError, "bad exception order"
try: try:
a.foobar() a.foobar()
except RuntimeError,e: except RuntimeError, e:
if e.args[0] != "postcatch unknown": if e.args[0] != "postcatch unknown":
print "bad exception order", print "bad exception order",
raise RuntimeError, e.args raise RuntimeError, e.args
try: try:
a.barfoo(1) a.barfoo(1)
except E1,e: except E1, e:
pass pass
except: except:
raise RuntimeError, "bad exception order" raise RuntimeError, "bad exception order"
try: try:
a.barfoo(2) a.barfoo(2)
except E2,e: except E2, e:
pass pass
except: except:
raise RuntimeError, "bad exception order" raise RuntimeError, "bad exception order"

20
Examples/test-suite/python/extend_placement_runme.py
View file

@ -2,12 +2,12 @@ import extend_placement
foo = extend_placement.Foo() foo = extend_placement.Foo()
foo = extend_placement.Foo(1) foo = extend_placement.Foo(1)
foo = extend_placement.Foo(1,1) foo = extend_placement.Foo(1, 1)
foo.spam() foo.spam()
foo.spam("hello") foo.spam("hello")
foo.spam(1) foo.spam(1)
foo.spam(1,1) foo.spam(1, 1)
foo.spam(1,1,1) foo.spam(1, 1, 1)
foo.spam(extend_placement.Foo()) foo.spam(extend_placement.Foo())
foo.spam(extend_placement.Foo(), 1.0) foo.spam(extend_placement.Foo(), 1.0)
@ -17,20 +17,20 @@ bar = extend_placement.Bar(1)
bar.spam() bar.spam()
bar.spam("hello") bar.spam("hello")
bar.spam(1) bar.spam(1)
bar.spam(1,1) bar.spam(1, 1)
bar.spam(1,1,1) bar.spam(1, 1, 1)
bar.spam(extend_placement.Bar()) bar.spam(extend_placement.Bar())
bar.spam(extend_placement.Bar(), 1.0) bar.spam(extend_placement.Bar(), 1.0)
foo = extend_placement.FooTi() foo = extend_placement.FooTi()
foo = extend_placement.FooTi(1) foo = extend_placement.FooTi(1)
foo = extend_placement.FooTi(1,1) foo = extend_placement.FooTi(1, 1)
foo.spam() foo.spam()
foo.spam("hello") foo.spam("hello")
foo.spam(1) foo.spam(1)
foo.spam(1,1) foo.spam(1, 1)
foo.spam(1,1,1) foo.spam(1, 1, 1)
foo.spam(extend_placement.Foo()) foo.spam(extend_placement.Foo())
foo.spam(extend_placement.Foo(), 1.0) foo.spam(extend_placement.Foo(), 1.0)
@ -40,7 +40,7 @@ bar = extend_placement.BarTi(1)
bar.spam() bar.spam()
bar.spam("hello") bar.spam("hello")
bar.spam(1) bar.spam(1)
bar.spam(1,1) bar.spam(1, 1)
bar.spam(1,1,1) bar.spam(1, 1, 1)
bar.spam(extend_placement.Bar()) bar.spam(extend_placement.Bar())
bar.spam(extend_placement.Bar(), 1.0) bar.spam(extend_placement.Bar(), 1.0)

1
Examples/test-suite/python/extern_c_runme.py
View file

@ -1,4 +1,3 @@
import extern_c import extern_c
extern_c.RealFunction(2) extern_c.RealFunction(2)

27
Examples/test-suite/python/friends_runme.py
View file

@ -2,27 +2,36 @@ import friends
a = friends.A(2) a = friends.A(2)
if friends.get_val1(a) != 2: raise RuntimeError if friends.get_val1(a) != 2:
if friends.get_val2(a) != 4: raise RuntimeError raise RuntimeError
if friends.get_val3(a) != 6: raise RuntimeError if friends.get_val2(a) != 4:
raise RuntimeError
if friends.get_val3(a) != 6:
raise RuntimeError
# nice overload working fine # nice overload working fine
if friends.get_val1(1,2,3) != 1: raise RuntimeError if friends.get_val1(1, 2, 3) != 1:
raise RuntimeError
b = friends.B(3) b = friends.B(3)
# David's case # David's case
if friends.mix(a,b) != 5: raise RuntimeError if friends.mix(a, b) != 5:
raise RuntimeError
di = friends.D_d(2) di = friends.D_d(2)
dd = friends.D_d(3.3) dd = friends.D_d(3.3)
# incredible template overloading working just fine # incredible template overloading working just fine
if friends.get_val1(di) != 2: raise RuntimeError if friends.get_val1(di) != 2:
if friends.get_val1(dd) != 3.3: raise RuntimeError raise RuntimeError
if friends.get_val1(dd) != 3.3:
raise RuntimeError
friends.set(di, 4) friends.set(di, 4)
friends.set(dd, 1.3) friends.set(dd, 1.3)
if friends.get_val1(di) != 4: raise RuntimeError if friends.get_val1(di) != 4:
if friends.get_val1(dd) != 1.3: raise RuntimeError raise RuntimeError
if friends.get_val1(dd) != 1.3:
raise RuntimeError

1
Examples/test-suite/python/funcptr_cpp_runme.py
View file

@ -6,4 +6,3 @@ if call2(ADD_BY_POINTER, 12, 13) != 25:
raise RuntimeError raise RuntimeError
if call3(ADD_BY_REFERENCE, 14, 15) != 29: if call3(ADD_BY_REFERENCE, 14, 15) != 29:
raise RuntimeError raise RuntimeError

3
Examples/test-suite/python/fvirtual_runme.py
View file

@ -2,8 +2,7 @@ from fvirtual import *
sw = NodeSwitch() sw = NodeSwitch()
n = Node() n = Node()
i = sw.addChild(n); i = sw.addChild(n)
if i != 2: if i != 2:
raise RuntimeError, "addChild" raise RuntimeError, "addChild"

2
Examples/test-suite/python/global_functions_runme.py
View file

@ -1,5 +1,6 @@
from global_functions import * from global_functions import *
def check(a, b): def check(a, b):
if a != b: if a != b:
raise RuntimeError("Failed: " + str(a) + " != " + str(b)) raise RuntimeError("Failed: " + str(a) + " != " + str(b))
@ -49,4 +50,3 @@ except TypeError, e:
if fail: if fail:
raise RuntimeError("argument count check failed") raise RuntimeError("argument count check failed")

7
Examples/test-suite/python/global_namespace_runme.py
View file

@ -1,5 +1,6 @@
from global_namespace import * from global_namespace import *
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
@ -44,8 +45,10 @@ if is_new_style_class(XYZMethods):
XYZMethods_static = XYZMethods XYZMethods_static = XYZMethods
else: else:
XYZMethods_static = XYZMethods() XYZMethods_static = XYZMethods()
XYZMethods_static.methodA(XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7()) XYZMethods_static.methodA(
XYZMethods_static.methodB(XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7()) XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7())
XYZMethods_static.methodB(
XYZ1(), XYZ2(), XYZ3(), XYZ4(), XYZ5(), XYZ6(), XYZ7())
if is_new_style_class(TheEnumMethods): if is_new_style_class(TheEnumMethods):
TheEnumMethods_static = TheEnumMethods TheEnumMethods_static = TheEnumMethods

1
Examples/test-suite/python/global_ns_arg_runme.py
View file

@ -2,4 +2,3 @@ from global_ns_arg import *
a = foo(1) a = foo(1)
b = bar_fn() b = bar_fn()

1
Examples/test-suite/python/global_vars_runme.py
View file

@ -32,4 +32,3 @@ except AttributeError, e:
fail = False fail = False
if fail: if fail:
raise RuntimeError("AttributeError should have been thrown") raise RuntimeError("AttributeError should have been thrown")

30
Examples/test-suite/python/implicittest_runme.py
View file

@ -1,9 +1,11 @@
from implicittest import * from implicittest import *
def check(a, b): def check(a, b):
if a != b: if a != b:
raise RuntimeError(str(a) + " does not equal " + str(b)) raise RuntimeError(str(a) + " does not equal " + str(b))
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
@ -20,7 +22,8 @@ try:
except ValueError: except ValueError:
# ValueError: invalid null reference in method 'new_A', argument 1 of type 'B const &' # ValueError: invalid null reference in method 'new_A', argument 1 of type 'B const &'
# Arguably A(char *) should be chosen, but there is a bug to do with None passed to methods overloaded by value, # Arguably A(char *) should be chosen, but there is a bug to do with None passed to methods overloaded by value,
# references and pointers to different types, where pointers ought to be given a slightly higher precedence. # references and pointers to different types, where pointers ought to be
# given a slightly higher precedence.
pass pass
check(1, get(1)) check(1, get(1))
@ -59,10 +62,14 @@ except TypeError:
#### Global variable assignment #### #### Global variable assignment ####
cvar.foo = Foo(1); check(cvar.foo.ii, 1) cvar.foo = Foo(1)
cvar.foo = 1; check(cvar.foo.ii, 1) check(cvar.foo.ii, 1)
cvar.foo = 1.0; check(cvar.foo.ii, 2) cvar.foo = 1
cvar.foo = Foo("hello"); check(cvar.foo.ii, 3) check(cvar.foo.ii, 1)
cvar.foo = 1.0
check(cvar.foo.ii, 2)
cvar.foo = Foo("hello")
check(cvar.foo.ii, 3)
# explicit constructor: # explicit constructor:
try: try:
@ -74,10 +81,14 @@ except TypeError:
#### Member variable assignment #### #### Member variable assignment ####
# Note: also needs naturalvar # Note: also needs naturalvar
b = Bar(); check(b.f.ii, 0) b = Bar()
b.f = Foo("hello"); check(b.f.ii, 3) check(b.f.ii, 0)
b.f = 1; check(b.f.ii, 1) b.f = Foo("hello")
b.f = 1.0; check(b.f.ii, 2) check(b.f.ii, 3)
b.f = 1
check(b.f.ii, 1)
b.f = 1.0
check(b.f.ii, 2)
# explicit constructor: # explicit constructor:
try: try:
@ -129,4 +140,3 @@ ccc = CCC(B())
check(ccc.checkvalue, 10) check(ccc.checkvalue, 10)
check(ccc.xx(123), 11) check(ccc.xx(123), 11)
check(ccc.yy(123, 123), 111) check(ccc.yy(123, 123), 111)

4
Examples/test-suite/python/import_nomodule_runme.py
View file

@ -6,8 +6,8 @@ if is_python_builtin():
exit(0) exit(0)
f = create_Foo() f = create_Foo()
test1(f,42) test1(f, 42)
delete_Foo(f) delete_Foo(f)
b = Bar() b = Bar()
test1(b,37) test1(b, 37)

5
Examples/test-suite/python/import_stl_runme.py
View file

@ -1,7 +1,6 @@
import import_stl_b import import_stl_b
import import_stl_a import import_stl_a
v_new = import_stl_b.process_vector([1,2,3]) v_new = import_stl_b.process_vector([1, 2, 3])
if v_new != (1,2,3,4): if v_new != (1, 2, 3, 4):
raise RuntimeError, v_new raise RuntimeError, v_new

1
Examples/test-suite/python/inctest_runme.py
View file

@ -29,4 +29,3 @@ if inctest.importtest1(5) != 15:
if inctest.importtest2("black") != "white": if inctest.importtest2("black") != "white":
print "import test 2 failed" print "import test 2 failed"
raise RuntimeError raise RuntimeError

17
Examples/test-suite/python/inout_runme.py
View file

@ -4,19 +4,18 @@ a = inout.AddOne1(1)
if a != 2: if a != 2:
raise RuntimeError raise RuntimeError
a = inout.AddOne3(1,1,1) a = inout.AddOne3(1, 1, 1)
if a != [2,2,2]: if a != [2, 2, 2]:
raise RuntimeError raise RuntimeError
a = inout.AddOne1p((1,1)) a = inout.AddOne1p((1, 1))
if a != (2,2): if a != (2, 2):
raise RuntimeError raise RuntimeError
a = inout.AddOne2p((1,1),1) a = inout.AddOne2p((1, 1), 1)
if a != [(2,2),2]: if a != [(2, 2), 2]:
raise RuntimeError raise RuntimeError
a = inout.AddOne3p(1,(1,1),1) a = inout.AddOne3p(1, (1, 1), 1)
if a != [2,(2,2),2]: if a != [2, (2, 2), 2]:
raise RuntimeError raise RuntimeError

4
Examples/test-suite/python/input_runme.py
View file

@ -4,10 +4,10 @@ f = Foo()
if f.foo(2) != 4: if f.foo(2) != 4:
raise RuntimeError raise RuntimeError
if f.foo(None)!= None: if f.foo(None) != None:
raise RuntimeError raise RuntimeError
if f.foo()!= None: if f.foo() != None:
raise RuntimeError raise RuntimeError
if sfoo("Hello") != "Hello world": if sfoo("Hello") != "Hello world":

22
Examples/test-suite/python/kwargs_feature_runme.py
View file

@ -1,17 +1,18 @@
from kwargs_feature import * from kwargs_feature import *
class MyFoo(Foo):
def __init__(self, a , b = 0):
Foo.__init__(self, a, b)
class MyFoo(Foo):
def __init__(self, a, b=0):
Foo.__init__(self, a, b)
# Simple class # Simple class
f1 = MyFoo(2) f1 = MyFoo(2)
f = Foo(b=2,a=1) f = Foo(b=2, a=1)
if f.foo(b=1,a=2) != 3: if f.foo(b=1, a=2) != 3:
raise RuntimeError raise RuntimeError
if Foo_statfoo(b=2) != 3: if Foo_statfoo(b=2) != 3:
@ -25,9 +26,9 @@ if Foo_sfoo(b=2) != 3:
# Templated class # Templated class
b = BarInt(b=2,a=1) b = BarInt(b=2, a=1)
if b.bar(b=1,a=2) != 3: if b.bar(b=1, a=2) != 3:
raise RuntimeError raise RuntimeError
if BarInt_statbar(b=2) != 3: if BarInt_statbar(b=2) != 3:
@ -44,14 +45,14 @@ if BarInt_sbar(b=2) != 3:
if templatedfunction(b=2) != 3: if templatedfunction(b=2) != 3:
raise RuntimeError raise RuntimeError
if foo_fn(a=1,b=2) != 3: if foo_fn(a=1, b=2) != 3:
raise RuntimeError raise RuntimeError
if foo_fn(b=2) != 3: if foo_fn(b=2) != 3:
raise RuntimeError raise RuntimeError
#Functions with keywords # Functions with keywords
if foo_kw(_from=2) != 4: if foo_kw(_from=2) != 4:
raise RuntimeError raise RuntimeError
@ -65,7 +66,7 @@ if foo_mm(min=2) != 4:
if foo_mm(max=3) != 4: if foo_mm(max=3) != 4:
raise RuntimeError raise RuntimeError
#Default args with references # Default args with references
if rfoo(n=123) != 120: if rfoo(n=123) != 120:
raise RuntimeError raise RuntimeError
@ -78,4 +79,3 @@ if rfoo(n=11, x=22) != -11:
if rfoo(x=11, n=22) != 11: if rfoo(x=11, n=22) != 11:
raise RuntimeError raise RuntimeError

2
Examples/test-suite/python/langobj_runme.py
View file

@ -2,7 +2,7 @@ import sys
from langobj import * from langobj import *
x ="hello" x = "hello"
rx = sys.getrefcount(x) rx = sys.getrefcount(x)
v = identity(x) v = identity(x)
rv = sys.getrefcount(v) rv = sys.getrefcount(v)

7
Examples/test-suite/python/li_attribute_runme.py
View file

@ -2,7 +2,7 @@
import li_attribute import li_attribute
aa = li_attribute.A(1,2,3) aa = li_attribute.A(1, 2, 3)
if aa.a != 1: if aa.a != 1:
raise RuntimeError raise RuntimeError
@ -24,14 +24,14 @@ if aa.d != aa.b:
if aa.c != 3: if aa.c != 3:
raise RuntimeError raise RuntimeError
#aa.c = 5 #aa.c = 5
#if aa.c != 3: # if aa.c != 3:
# raise RuntimeError # raise RuntimeError
pi = li_attribute.Param_i(7) pi = li_attribute.Param_i(7)
if pi.value != 7: if pi.value != 7:
raise RuntimeError raise RuntimeError
pi.value=3 pi.value = 3
if pi.value != 3: if pi.value != 3:
raise RuntimeError raise RuntimeError
@ -71,4 +71,3 @@ if myStringyClass.ReadWriteString != "changed string":
raise RuntimeError raise RuntimeError
if myStringyClass.ReadOnlyString != "changed string": if myStringyClass.ReadOnlyString != "changed string":
raise RuntimeError raise RuntimeError

57
Examples/test-suite/python/li_attribute_template_runme.py
View file

@ -2,66 +2,67 @@
import li_attribute_template import li_attribute_template
chell = li_attribute_template.Cintint(1,2,3) chell = li_attribute_template.Cintint(1, 2, 3)
def rassert( what, master ):
def rassert(what, master):
if what != master: if what != master:
print what print what
raise RuntimeError raise RuntimeError
## Testing primitive by value attribute # Testing primitive by value attribute
rassert( chell.a, 1 ) rassert(chell.a, 1)
chell.a = 3 chell.a = 3
rassert( chell.a, 3 ) rassert(chell.a, 3)
## Testing primitive by ref attribute # Testing primitive by ref attribute
rassert( chell.b, 2 ) rassert(chell.b, 2)
chell.b = 5 chell.b = 5
rassert( chell.b,5 ) rassert(chell.b, 5)
## Testing string # Testing string
chell.str = "abc" chell.str = "abc"
rassert( chell.str, "abc" ) rassert(chell.str, "abc")
# Testing class by value # Testing class by value
rassert( chell.d.value, 1 ) rassert(chell.d.value, 1)
chell.d = li_attribute_template.Foo(2) chell.d = li_attribute_template.Foo(2)
rassert( chell.d.value, 2 ) rassert(chell.d.value, 2)
# Testing class by reference # Testing class by reference
rassert( chell.e.value, 2 ) rassert(chell.e.value, 2)
chell.e= li_attribute_template.Foo(3) chell.e = li_attribute_template.Foo(3)
rassert( chell.e.value, 3 ) rassert(chell.e.value, 3)
chell.e.value = 4 chell.e.value = 4
rassert( chell.e.value, 4 ) rassert(chell.e.value, 4)
# Testing moderately complex template by value # Testing moderately complex template by value
rassert( chell.f.first, 1 ) rassert(chell.f.first, 1)
rassert( chell.f.second, 2 ) rassert(chell.f.second, 2)
pair = li_attribute_template.pair_intint(3,4) pair = li_attribute_template.pair_intint(3, 4)
chell.f = pair chell.f = pair
rassert( chell.f.first, 3 ) rassert(chell.f.first, 3)
rassert( chell.f.second, 4 ) rassert(chell.f.second, 4)
# Testing moderately complex template by ref # Testing moderately complex template by ref
rassert( chell.g.first, 2 ) rassert(chell.g.first, 2)
rassert( chell.g.second, 3 ) rassert(chell.g.second, 3)
pair = li_attribute_template.pair_intint(4,5) pair = li_attribute_template.pair_intint(4, 5)
chell.g = pair chell.g = pair
rassert( chell.g.first, 4 ) rassert(chell.g.first, 4)
rassert( chell.g.second, 5 ) rassert(chell.g.second, 5)
chell.g.first = 6 chell.g.first = 6
chell.g.second = 7 chell.g.second = 7
rassert( chell.g.first, 6 ) rassert(chell.g.first, 6)
rassert( chell.g.second, 7 ) rassert(chell.g.second, 7)

3
Examples/test-suite/python/li_boost_shared_ptr_bits_runme.py
View file

@ -1,8 +1,10 @@
from li_boost_shared_ptr_bits import * from li_boost_shared_ptr_bits import *
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
def check(nd): def check(nd):
nd.i = 200 nd.i = 200
i = nd.i i = nd.i
@ -37,4 +39,3 @@ if is_new_style_class(HiddenDestructor):
p = HiddenDestructor.create() p = HiddenDestructor.create()
else: else:
p = HiddenDestructor_create() p = HiddenDestructor_create()

68
Examples/test-suite/python/li_boost_shared_ptr_runme.py
View file

@ -4,7 +4,10 @@ import gc
debug = False debug = False
# simple shared_ptr usage - created in C++ # simple shared_ptr usage - created in C++
class li_boost_shared_ptr_runme: class li_boost_shared_ptr_runme:
def main(self): def main(self):
if (debug): if (debug):
print "Started" print "Started"
@ -12,19 +15,21 @@ class li_boost_shared_ptr_runme:
li_boost_shared_ptr.cvar.debug_shared = debug li_boost_shared_ptr.cvar.debug_shared = debug
# Change loop count to run for a long time to monitor memory # Change loop count to run for a long time to monitor memory
loopCount = 1 #5000 loopCount = 1 # 5000
for i in range (0,loopCount): for i in range(0, loopCount):
self.runtest() self.runtest()
# Expect 1 instance - the one global variable (GlobalValue) # Expect 1 instance - the one global variable (GlobalValue)
if (li_boost_shared_ptr.Klass_getTotal_count() != 1): if (li_boost_shared_ptr.Klass_getTotal_count() != 1):
raise RuntimeError("Klass.total_count=%s" % li_boost_shared_ptr.Klass.getTotal_count()) raise RuntimeError("Klass.total_count=%s" %
li_boost_shared_ptr.Klass.getTotal_count())
wrapper_count = li_boost_shared_ptr.shared_ptr_wrapper_count() wrapper_count = li_boost_shared_ptr.shared_ptr_wrapper_count()
if (wrapper_count != li_boost_shared_ptr.NOT_COUNTING): if (wrapper_count != li_boost_shared_ptr.NOT_COUNTING):
# Expect 1 instance - the one global variable (GlobalSmartValue) # Expect 1 instance - the one global variable (GlobalSmartValue)
if (wrapper_count != 1): if (wrapper_count != 1):
raise RuntimeError("shared_ptr wrapper count=%s" % wrapper_count) raise RuntimeError(
"shared_ptr wrapper count=%s" % wrapper_count)
if (debug): if (debug):
print "Finished" print "Finished"
@ -173,7 +178,7 @@ class li_boost_shared_ptr_runme:
self.verifyValue("smartpointerpointerownertest", val) self.verifyValue("smartpointerpointerownertest", val)
self.verifyCount(1, k) self.verifyCount(1, k)
# //////////////////////////////// Derived class //////////////////////////////////////// # //////////////////////////////// Derived class //////////////////////
# derived pass by shared_ptr # derived pass by shared_ptr
k = li_boost_shared_ptr.KlassDerived("me oh my") k = li_boost_shared_ptr.KlassDerived("me oh my")
kret = li_boost_shared_ptr.derivedsmartptrtest(k) kret = li_boost_shared_ptr.derivedsmartptrtest(k)
@ -222,7 +227,7 @@ class li_boost_shared_ptr_runme:
self.verifyCount(1, k) self.verifyCount(1, k)
self.verifyCount(1, kret) self.verifyCount(1, kret)
# //////////////////////////////// Derived and base class mixed //////////////////////////////////////// # //////////////////////////////// Derived and base class mixed ///////
# pass by shared_ptr (mixed) # pass by shared_ptr (mixed)
k = li_boost_shared_ptr.KlassDerived("me oh my") k = li_boost_shared_ptr.KlassDerived("me oh my")
kret = li_boost_shared_ptr.smartpointertest(k) kret = li_boost_shared_ptr.smartpointertest(k)
@ -279,30 +284,40 @@ class li_boost_shared_ptr_runme:
self.verifyCount(1, k) self.verifyCount(1, k)
self.verifyCount(1, kret) self.verifyCount(1, kret)
# //////////////////////////////// Overloading tests //////////////////////////////////////// # //////////////////////////////// Overloading tests //////////////////
# Base class # Base class
k = li_boost_shared_ptr.Klass("me oh my") k = li_boost_shared_ptr.Klass("me oh my")
self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval") self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval")
self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref") self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref")
self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr") self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr")
self.verifyValue(li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref") self.verifyValue(
li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref")
self.verifyValue(li_boost_shared_ptr.overload_smartbyval(k), "smartbyval") self.verifyValue(
self.verifyValue(li_boost_shared_ptr.overload_smartbyref(k), "smartbyref") li_boost_shared_ptr.overload_smartbyval(k), "smartbyval")
self.verifyValue(li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr") self.verifyValue(
self.verifyValue(li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref") li_boost_shared_ptr.overload_smartbyref(k), "smartbyref")
self.verifyValue(
li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr")
self.verifyValue(
li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref")
# Derived class # Derived class
k = li_boost_shared_ptr.KlassDerived("me oh my") k = li_boost_shared_ptr.KlassDerived("me oh my")
self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval") self.verifyValue(li_boost_shared_ptr.overload_rawbyval(k), "rawbyval")
self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref") self.verifyValue(li_boost_shared_ptr.overload_rawbyref(k), "rawbyref")
self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr") self.verifyValue(li_boost_shared_ptr.overload_rawbyptr(k), "rawbyptr")
self.verifyValue(li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref") self.verifyValue(
li_boost_shared_ptr.overload_rawbyptrref(k), "rawbyptrref")
self.verifyValue(li_boost_shared_ptr.overload_smartbyval(k), "smartbyval") self.verifyValue(
self.verifyValue(li_boost_shared_ptr.overload_smartbyref(k), "smartbyref") li_boost_shared_ptr.overload_smartbyval(k), "smartbyval")
self.verifyValue(li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr") self.verifyValue(
self.verifyValue(li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref") li_boost_shared_ptr.overload_smartbyref(k), "smartbyref")
self.verifyValue(
li_boost_shared_ptr.overload_smartbyptr(k), "smartbyptr")
self.verifyValue(
li_boost_shared_ptr.overload_smartbyptrref(k), "smartbyptrref")
# 3rd derived class # 3rd derived class
k = li_boost_shared_ptr.Klass3rdDerived("me oh my") k = li_boost_shared_ptr.Klass3rdDerived("me oh my")
@ -313,7 +328,7 @@ class li_boost_shared_ptr_runme:
self.verifyValue("me oh my-3rdDerived", val) self.verifyValue("me oh my-3rdDerived", val)
self.verifyCount(1, k) self.verifyCount(1, k)
# //////////////////////////////// Member variables //////////////////////////////////////// # //////////////////////////////// Member variables ///////////////////
# smart pointer by value # smart pointer by value
m = li_boost_shared_ptr.MemberVariables() m = li_boost_shared_ptr.MemberVariables()
k = li_boost_shared_ptr.Klass("smart member value") k = li_boost_shared_ptr.Klass("smart member value")
@ -451,7 +466,7 @@ class li_boost_shared_ptr_runme:
except ValueError: except ValueError:
pass pass
# ////////////////////////////////// Global variables //////////////////////////////////////// # ////////////////////////////////// Global variables /////////////////
# smart pointer # smart pointer
kglobal = li_boost_shared_ptr.cvar.GlobalSmartValue kglobal = li_boost_shared_ptr.cvar.GlobalSmartValue
if (kglobal != None): if (kglobal != None):
@ -466,7 +481,8 @@ class li_boost_shared_ptr_runme:
self.verifyValue("smart global value", val) self.verifyValue("smart global value", val)
self.verifyCount(3, kglobal) self.verifyCount(3, kglobal)
self.verifyCount(3, k) self.verifyCount(3, k)
self.verifyValue("smart global value", li_boost_shared_ptr.cvar.GlobalSmartValue.getValue()) self.verifyValue(
"smart global value", li_boost_shared_ptr.cvar.GlobalSmartValue.getValue())
li_boost_shared_ptr.cvar.GlobalSmartValue = None li_boost_shared_ptr.cvar.GlobalSmartValue = None
# plain value # plain value
@ -479,7 +495,8 @@ class li_boost_shared_ptr_runme:
self.verifyValue("global value", val) self.verifyValue("global value", val)
self.verifyCount(1, kglobal) self.verifyCount(1, kglobal)
self.verifyCount(1, k) self.verifyCount(1, k)
self.verifyValue("global value", li_boost_shared_ptr.cvar.GlobalValue.getValue()) self.verifyValue(
"global value", li_boost_shared_ptr.cvar.GlobalValue.getValue())
try: try:
li_boost_shared_ptr.cvar.GlobalValue = None li_boost_shared_ptr.cvar.GlobalValue = None
@ -522,7 +539,7 @@ class li_boost_shared_ptr_runme:
except ValueError: except ValueError:
pass pass
# ////////////////////////////////// Templates //////////////////////////////////////// # ////////////////////////////////// Templates ////////////////////////
pid = li_boost_shared_ptr.PairIntDouble(10, 20.2) pid = li_boost_shared_ptr.PairIntDouble(10, 20.2)
if (pid.baseVal1 != 20 or pid.baseVal2 != 40.4): if (pid.baseVal1 != 20 or pid.baseVal2 != 40.4):
raise RuntimeError("Base values wrong") raise RuntimeError("Base values wrong")
@ -531,14 +548,15 @@ class li_boost_shared_ptr_runme:
def verifyValue(self, expected, got): def verifyValue(self, expected, got):
if (expected != got): if (expected != got):
raise RuntimeError("verify value failed. Expected: ", expected, " Got: ", got) raise RuntimeError(
"verify value failed. Expected: ", expected, " Got: ", got)
def verifyCount(self, expected, k): def verifyCount(self, expected, k):
got = li_boost_shared_ptr.use_count(k) got = li_boost_shared_ptr.use_count(k)
if (expected != got): if (expected != got):
raise RuntimeError("verify use_count failed. Expected: ", expected, " Got: ", got) raise RuntimeError(
"verify use_count failed. Expected: ", expected, " Got: ", got)
runme = li_boost_shared_ptr_runme() runme = li_boost_shared_ptr_runme()
runme.main() runme.main()

6
Examples/test-suite/python/li_boost_shared_ptr_template_runme.py
View file

@ -9,7 +9,7 @@ if d.bar() != 2:
if bar_getter(b) != 1: if bar_getter(b) != 1:
raise RuntimeError raise RuntimeError
# Fix reverted in rev 12953 # Fix reverted in rev 12953
#if bar_getter(d) != 2: # if bar_getter(d) != 2:
# raise RuntimeError # raise RuntimeError
b = BaseDefaultInt() b = BaseDefaultInt()
@ -24,7 +24,7 @@ if d2.bar2() != 4:
if bar2_getter(b) != 3: if bar2_getter(b) != 3:
raise RuntimeError raise RuntimeError
# Fix reverted in rev 12953 # Fix reverted in rev 12953
#if bar2_getter(d) != 4: # if bar2_getter(d) != 4:
# raise RuntimeError # raise RuntimeError
#if bar2_getter(d2) != 4: # if bar2_getter(d2) != 4:
# raise RuntimeError # raise RuntimeError

1
Examples/test-suite/python/li_cdata_runme.py
View file

@ -7,4 +7,3 @@ memmove(m, s)
ss = cdata(m, 7) ss = cdata(m, 7)
if ss != "ABC abc": if ss != "ABC abc":
raise "failed" raise "failed"

2
Examples/test-suite/python/li_cpointer_runme.py
View file

@ -2,7 +2,7 @@ from li_cpointer import *
p = new_intp() p = new_intp()
intp_assign(p,3) intp_assign(p, 3)
if intp_value(p) != 3: if intp_value(p) != 3:
raise RuntimeError raise RuntimeError

3
Examples/test-suite/python/li_cstring_runme.py
View file

@ -24,9 +24,8 @@ if test5(4) != 'xxxx':
if test6(10) != 'xxxxx': if test6(10) != 'xxxxx':
raise RuntimeError raise RuntimeError
if test7() !="Hello world!": if test7() != "Hello world!":
raise RuntimeError raise RuntimeError
if test8() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_": if test8() != " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
raise RuntimeError raise RuntimeError

1
Examples/test-suite/python/li_cwstring_runme.py
View file

@ -26,4 +26,3 @@ if test7() != u"Hello world!":
if test8() != u" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_": if test8() != u" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_":
raise RuntimeError raise RuntimeError

7
Examples/test-suite/python/li_implicit_runme.py
View file

@ -9,9 +9,8 @@ ad, get(ad)
ab, get(ab) ab, get(ab)
if get(ai) != get(1): if get(ai) != get(1):
raise RuntimeError,"bad implicit type" raise RuntimeError, "bad implicit type"
if get(ad) != get(2.0): if get(ad) != get(2.0):
raise RuntimeError,"bad implicit type" raise RuntimeError, "bad implicit type"
if get(ab) != get(b): if get(ab) != get(b):
raise RuntimeError,"bad implicit type" raise RuntimeError, "bad implicit type"

16
Examples/test-suite/python/li_std_carray_runme.py
View file

@ -2,7 +2,7 @@ from li_std_carray import *
v3 = Vector3() v3 = Vector3()
for i in range(0,len(v3)): for i in range(0, len(v3)):
v3[i] = i v3[i] = i
i = 0 i = 0
@ -14,9 +14,9 @@ for d in v3:
m3 = Matrix3() m3 = Matrix3()
for i in range(0,len(m3)): for i in range(0, len(m3)):
v3 = m3[i] v3 = m3[i]
for j in range(0,len(v3)): for j in range(0, len(v3)):
v3[j] = i + j v3[j] = i + j
i = 0 i = 0
@ -30,12 +30,10 @@ for v3 in m3:
i = i + 1 i = i + 1
pass pass
for i in range(0,len(m3)): for i in range(0, len(m3)):
for j in range(0,len(m3)): for j in range(0, len(m3)):
if m3[i][j] != i + j: if m3[i][j] != i + j:
raise RuntimeError raise RuntimeError
da = Vector3((1,2,3)) da = Vector3((1, 2, 3))
ma = Matrix3(((1,2,3),(4,5,6),(7,8,9))) ma = Matrix3(((1, 2, 3), (4, 5, 6), (7, 8, 9)))

49
Examples/test-suite/python/li_std_containers_int_runme.py
View file

@ -1,11 +1,14 @@
# Check std::vector and std::list behaves the same as Python iterable types (list) # Check std::vector and std::list behaves the same as Python iterable
# types (list)
from li_std_containers_int import * from li_std_containers_int import *
import sys import sys
def failed(a, b, msg): def failed(a, b, msg):
raise RuntimeError, msg + " " + str(list(a)) + " " + str(list(b)) raise RuntimeError, msg + " " + str(list(a)) + " " + str(list(b))
def compare_sequences(a, b): def compare_sequences(a, b):
if len(a) != len(b): if len(a) != len(b):
failed(a, b, "different sizes") failed(a, b, "different sizes")
@ -13,11 +16,15 @@ def compare_sequences(a, b):
if a[i] != b[i]: if a[i] != b[i]:
failed(a, b, "elements are different") failed(a, b, "elements are different")
def compare_containers(pythonlist, swigvector, swiglist): def compare_containers(pythonlist, swigvector, swiglist):
compare_sequences(pythonlist, swigvector) compare_sequences(pythonlist, swigvector)
compare_sequences(pythonlist, swiglist) compare_sequences(pythonlist, swiglist)
# Check std::vector and std::list assignment behaves same as Python list assignment including exceptions # Check std::vector and std::list assignment behaves same as Python list
# assignment including exceptions
def container_insert_step(i, j, step, newval): def container_insert_step(i, j, step, newval):
ps = range(6) ps = range(6)
iv = vector_int(ps) iv = vector_int(ps)
@ -77,16 +84,20 @@ def container_insert_step(i, j, step, newval):
except IndexError, e: except IndexError, e:
il_error = e il_error = e
# Python 2.6 contains bug fixes in extended slicing syntax: http://docs.python.org/2/whatsnew/2.6.html # Python 2.6 contains bug fixes in extended slicing syntax:
skip_check = ps_error != None and(iv_error == il_error == None) and step > 0 and (sys.version_info[0:2] < (2, 6)) # http://docs.python.org/2/whatsnew/2.6.html
skip_check = ps_error != None and(
iv_error == il_error == None) and step > 0 and (sys.version_info[0:2] < (2, 6))
if not(skip_check): if not(skip_check):
if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))): if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
raise RuntimeError, "ValueError exception not consistently thrown: " + str(ps_error) + " " + str(iv_error) + " " + str(il_error) raise RuntimeError, "ValueError exception not consistently thrown: " + \
str(ps_error) + " " + str(iv_error) + " " + str(il_error)
compare_containers(ps, iv, il) compare_containers(ps, iv, il)
# Check std::vector and std::list delete behaves same as Python list delete including exceptions # Check std::vector and std::list delete behaves same as Python list
# delete including exceptions
def container_delete_step(i, j, step): def container_delete_step(i, j, step):
ps = range(6) ps = range(6)
iv = vector_int(ps) iv = vector_int(ps)
@ -147,12 +158,13 @@ def container_delete_step(i, j, step):
il_error = e il_error = e
if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))): if not((type(ps_error) == type(iv_error)) and (type(ps_error) == type(il_error))):
raise RuntimeError, "ValueError exception not consistently thrown: " + str(ps_error) + " " + str(iv_error) + " " + str(il_error) raise RuntimeError, "ValueError exception not consistently thrown: " + \
str(ps_error) + " " + str(iv_error) + " " + str(il_error)
compare_containers(ps, iv, il) compare_containers(ps, iv, il)
ps = [0,1,2,3,4,5] ps = [0, 1, 2, 3, 4, 5]
iv = vector_int(ps) iv = vector_int(ps)
il = list_int(ps) il = list_int(ps)
@ -172,7 +184,8 @@ compare_containers(ps[-2:7], iv[-2:7], il[-2:7])
compare_containers(ps[-5:7], iv[-5:7], il[-5:7]) compare_containers(ps[-5:7], iv[-5:7], il[-5:7])
compare_containers(ps[-6:7], iv[-6:7], il[-6:7]) compare_containers(ps[-6:7], iv[-6:7], il[-6:7])
# before beginning of range (negative indexing, negative index is > container size) # before beginning of range (negative indexing, negative index is >
# container size)
compare_containers(ps[-7:7], iv[-7:7], il[-7:7]) compare_containers(ps[-7:7], iv[-7:7], il[-7:7])
compare_containers(ps[-100:7], iv[-100:7], il[-100:7]) compare_containers(ps[-100:7], iv[-100:7], il[-100:7])
@ -225,7 +238,8 @@ for start in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 10
# single element set/replace # single element set/replace
container_insert_step(start, None, None, 111) container_insert_step(start, None, None, 111)
for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]: for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
container_insert_step(start, end, None, [111, 222, 333, 444, 555, 666, 777]) container_insert_step(
start, end, None, [111, 222, 333, 444, 555, 666, 777])
container_insert_step(start, end, None, [111, 222, 333, 444, 555, 666]) container_insert_step(start, end, None, [111, 222, 333, 444, 555, 666])
container_insert_step(start, end, None, [111, 222, 333, 444, 555]) container_insert_step(start, end, None, [111, 222, 333, 444, 555])
container_insert_step(start, end, None, [111, 222, 333, 444]) container_insert_step(start, end, None, [111, 222, 333, 444])
@ -240,20 +254,24 @@ for start in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 10
container_delete_step(start, None, None) container_delete_step(start, None, None)
for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]: for end in [-102, -100, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 100, 102]:
container_delete_step(start, end, None) container_delete_step(start, end, None)
for step in range(-7,7): for step in range(-7, 7):
container_delete_step(start, end, step) container_delete_step(start, end, step)
ps = range(6) ps = range(6)
iv = vector_int(ps) iv = vector_int(ps)
il = list_int(ps) il = list_int(ps)
del ps[:]; del iv[:]; del il[:] del ps[:]
del iv[:]
del il[:]
compare_containers(ps, iv, il) compare_containers(ps, iv, il)
for end in range(7): for end in range(7):
for step in range(-7,7): for step in range(-7, 7):
for start in range(7): for start in range(7):
container_insert_step(start, end, step, [111, 222, 333, 444, 555, 666, 777]) container_insert_step(
container_insert_step(start, end, step, [111, 222, 333, 444, 555, 666]) start, end, step, [111, 222, 333, 444, 555, 666, 777])
container_insert_step(
start, end, step, [111, 222, 333, 444, 555, 666])
container_insert_step(start, end, step, [111, 222, 333, 444, 555]) container_insert_step(start, end, step, [111, 222, 333, 444, 555])
container_insert_step(start, end, step, [111, 222, 333, 444]) container_insert_step(start, end, step, [111, 222, 333, 444])
container_insert_step(start, end, step, [111, 222, 333]) container_insert_step(start, end, step, [111, 222, 333])
@ -266,4 +284,3 @@ try:
raise RuntimeError("Zero step not caught") raise RuntimeError("Zero step not caught")
except ValueError: except ValueError:
pass pass

36
Examples/test-suite/python/li_std_except_as_class_runme.py
View file

@ -3,17 +3,29 @@ from li_std_except_as_class import *
# This test is expected to fail with -builtin option. # This test is expected to fail with -builtin option.
# Throwing builtin classes as exceptions not supported # Throwing builtin classes as exceptions not supported
if is_python_builtin(): if is_python_builtin():
try: test_domain_error() try:
except RuntimeError: pass test_domain_error()
try: test_domain_error() except RuntimeError:
except RuntimeError: pass pass
try: test_domain_error() try:
except RuntimeError: pass test_domain_error()
except RuntimeError:
pass
try:
test_domain_error()
except RuntimeError:
pass
else: else:
# std::domain_error hierarchy # std::domain_error hierarchy
try: test_domain_error() try:
except domain_error: pass test_domain_error()
try: test_domain_error() except domain_error:
except logic_error: pass pass
try: test_domain_error() try:
except exception: pass test_domain_error()
except logic_error:
pass
try:
test_domain_error()
except exception:
pass

4
Examples/test-suite/python/li_std_map_member_runme.py
View file

@ -3,9 +3,9 @@ import li_std_map_member
a = li_std_map_member.mapita() a = li_std_map_member.mapita()
a[1] = li_std_map_member.TestA() a[1] = li_std_map_member.TestA()
if (a[1].i != 1) : if (a[1].i != 1):
raise RuntimeError("a[1] != 1") raise RuntimeError("a[1] != 1")
a[1].i = 2 a[1].i = 2
if (a[1].i != 2) : if (a[1].i != 2):
raise RuntimeError("a[1] != 2") raise RuntimeError("a[1] != 2")

14
Examples/test-suite/python/li_std_map_runme.py
View file

@ -4,8 +4,8 @@ a1 = li_std_map.A(3)
a2 = li_std_map.A(7) a2 = li_std_map.A(7)
p0 = li_std_map.pairii(1,2) p0 = li_std_map.pairii(1, 2)
p1 = li_std_map.pairA(1,a1.this) p1 = li_std_map.pairA(1, a1.this)
m = {} m = {}
m[1] = a1 m[1] = a1
m[2] = a2 m[2] = a2
@ -14,13 +14,12 @@ pp1 = li_std_map.p_identa(p1)
mm = li_std_map.m_identa(m) mm = li_std_map.m_identa(m)
m = li_std_map.mapA() m = li_std_map.mapA()
m[1] = a1 m[1] = a1
m[2] = a2 m[2] = a2
pm ={} pm = {}
for k in m: for k in m:
pm[k] = m[k] pm[k] = m[k]
@ -30,11 +29,8 @@ for k in m:
raise RuntimeError raise RuntimeError
m = {} m = {}
m[1] = (1,2) m[1] = (1, 2)
m["foo"] = "hello" m["foo"] = "hello"
pm = li_std_map.pymap() pm = li_std_map.pymap()
@ -47,7 +43,6 @@ for k in pm:
raise RuntimeError raise RuntimeError
mii = li_std_map.IntIntMap() mii = li_std_map.IntIntMap()
mii[1] = 1 mii[1] = 1
@ -55,4 +50,3 @@ mii[1] = 2
if mii[1] != 2: if mii[1] != 2:
raise RuntimeError raise RuntimeError

37
Examples/test-suite/python/li_std_pair_extra_runme.py
View file

@ -1,33 +1,33 @@
import li_std_pair_extra import li_std_pair_extra
p = (1,2) p = (1, 2)
p1 = li_std_pair_extra.p_inout(p) p1 = li_std_pair_extra.p_inout(p)
p2 = li_std_pair_extra.p_inoutd(p1) p2 = li_std_pair_extra.p_inoutd(p1)
d1 = li_std_pair_extra.d_inout(2) d1 = li_std_pair_extra.d_inout(2)
i,d2 = li_std_pair_extra.d_inout2(2) i, d2 = li_std_pair_extra.d_inout2(2)
i,p = li_std_pair_extra.p_inout2(p) i, p = li_std_pair_extra.p_inout2(p)
p3,p4 = li_std_pair_extra.p_inout3(p1,p1) p3, p4 = li_std_pair_extra.p_inout3(p1, p1)
psi = li_std_pair_extra.SIPair("hello",1) psi = li_std_pair_extra.SIPair("hello", 1)
pci = li_std_pair_extra.CIPair(1,1) pci = li_std_pair_extra.CIPair(1, 1)
#psi.first = "hi" #psi.first = "hi"
psi = li_std_pair_extra.SIPair("hi",1) psi = li_std_pair_extra.SIPair("hi", 1)
if psi != ("hi",1): if psi != ("hi", 1):
raise RuntimeError raise RuntimeError
psii = li_std_pair_extra.SIIPair(psi,1) psii = li_std_pair_extra.SIIPair(psi, 1)
a = li_std_pair_extra.A() a = li_std_pair_extra.A()
b = li_std_pair_extra.B() b = li_std_pair_extra.B()
pab = li_std_pair_extra.ABPair(a,b); pab = li_std_pair_extra.ABPair(a, b)
pab.first = a pab.first = a
pab.first.val = 2 pab.first.val = 2
@ -36,24 +36,23 @@ if pab.first.val != 2:
raise RuntimeError raise RuntimeError
pci = li_std_pair_extra.CIntPair(1,0) pci = li_std_pair_extra.CIntPair(1, 0)
a = li_std_pair_extra.A(5) a = li_std_pair_extra.A(5)
p1 = li_std_pair_extra.pairP1(1,a.this) p1 = li_std_pair_extra.pairP1(1, a.this)
p2 = li_std_pair_extra.pairP2(a,1) p2 = li_std_pair_extra.pairP2(a, 1)
p3 = li_std_pair_extra.pairP3(a,a) p3 = li_std_pair_extra.pairP3(a, a)
if a.val != li_std_pair_extra.p_identa(p1.this)[1].val: if a.val != li_std_pair_extra.p_identa(p1.this)[1].val:
raise RuntimeError raise RuntimeError
p = li_std_pair_extra.IntPair(1,10) p = li_std_pair_extra.IntPair(1, 10)
p.first = 1 p.first = 1
p = li_std_pair_extra.paircA1(1,a) p = li_std_pair_extra.paircA1(1, a)
p.first p.first
p.second p.second
p = li_std_pair_extra.paircA2(1,a) p = li_std_pair_extra.paircA2(1, a)
pp = li_std_pair_extra.pairiiA(1,p) pp = li_std_pair_extra.pairiiA(1, p)

1
Examples/test-suite/python/li_std_pair_using_runme.py
View file

@ -7,4 +7,3 @@ two = StringIntPair(two_tuple)
if bounce(one) != one_tuple: if bounce(one) != one_tuple:
raise RuntimeError raise RuntimeError

8
Examples/test-suite/python/li_std_set_runme.py
View file

@ -40,7 +40,6 @@ if sum != "cba":
raise RuntimeError raise RuntimeError
si = set_int() si = set_int()
si.append(1) si.append(1)
@ -56,8 +55,6 @@ if i.next() != 3:
raise RuntimeError raise RuntimeError
i = s.begin() i = s.begin()
i.next() i.next()
s.erase(i) s.erase(i)
@ -81,9 +78,8 @@ if m.value() != "c":
raise RuntimeError raise RuntimeError
s = pyset() s = pyset()
s.insert((1,2)) s.insert((1, 2))
s.insert(1) s.insert(1)
s.insert("hello") s.insert("hello")
@ -92,5 +88,5 @@ sum = ()
for i in s: for i in s:
sum = sum + (i,) sum = sum + (i,)
if (len(sum) != 3 or (not 1 in sum) or (not 'hello' in sum) or (not (1, 2) in sum)) : if (len(sum) != 3 or (not 1 in sum) or (not 'hello' in sum) or (not (1, 2) in sum)):
raise RuntimeError raise RuntimeError

1
Examples/test-suite/python/li_std_stream_runme.py
View file

@ -1,7 +1,6 @@
from li_std_stream import * from li_std_stream import *
a = A() a = A()
o = ostringstream() o = ostringstream()

5
Examples/test-suite/python/li_std_string_extra_runme.py
View file

@ -1,7 +1,6 @@
import li_std_string_extra import li_std_string_extra
x="hello" x = "hello"
if li_std_string_extra.test_ccvalue(x) != x: if li_std_string_extra.test_ccvalue(x) != x:
@ -20,7 +19,7 @@ if li_std_string_extra.test_const_reference(x) != x:
s = li_std_string_extra.string("he") s = li_std_string_extra.string("he")
#s += "ll" #s += "ll"
#s.append('o') # s.append('o')
s = s + "llo" s = s + "llo"
if s != x: if s != x:

2
Examples/test-suite/python/li_std_vector_enum_runme.py
View file

@ -1,5 +1,6 @@
import li_std_vector_enum import li_std_vector_enum
def check(a, b): def check(a, b):
if (a != b): if (a != b):
raise RuntimeError("Not equal: ", a, b) raise RuntimeError("Not equal: ", a, b)
@ -21,4 +22,3 @@ expected = 10
for val in ev.nums: for val in ev.nums:
check(val, expected) check(val, expected)
expected += 10 expected += 10

75
Examples/test-suite/python/li_std_vector_extra_runme.py
View file

@ -1,110 +1,108 @@
from li_std_vector_extra import * from li_std_vector_extra import *
iv = IntVector(4) iv = IntVector(4)
for i in range(0,4): for i in range(0, 4):
iv[i] = i iv[i] = i
x = average(iv) x = average(iv)
y = average([1,2,3,4]) y = average([1, 2, 3, 4])
a = half([10,10.5,11,11.5]) a = half([10, 10.5, 11, 11.5])
dv = DoubleVector(10) dv = DoubleVector(10)
for i in range(0,10): for i in range(0, 10):
dv[i] = i/2.0 dv[i] = i / 2.0
halve_in_place(dv) halve_in_place(dv)
bv = BoolVector(4) bv = BoolVector(4)
bv[0]= bool(1) bv[0] = bool(1)
bv[1]= bool(0) bv[1] = bool(0)
bv[2]= bool(4) bv[2] = bool(4)
bv[3]= bool(0) bv[3] = bool(0)
if bv[0] != bv[2]: if bv[0] != bv[2]:
raise RuntimeError,"bad std::vector<bool> mapping" raise RuntimeError, "bad std::vector<bool> mapping"
b = B(5) b = B(5)
va = VecA([b,None,b,b]) va = VecA([b, None, b, b])
if va[0].f(1) != 6: if va[0].f(1) != 6:
raise RuntimeError,"bad std::vector<A*> mapping" raise RuntimeError, "bad std::vector<A*> mapping"
if vecAptr(va) != 6: if vecAptr(va) != 6:
raise RuntimeError,"bad std::vector<A*> mapping" raise RuntimeError, "bad std::vector<A*> mapping"
b.val = 7 b.val = 7
if va[3].f(1) != 8: if va[3].f(1) != 8:
raise RuntimeError,"bad std::vector<A*> mapping" raise RuntimeError, "bad std::vector<A*> mapping"
ip = PtrInt() ip = PtrInt()
ap = new_ArrInt(10) ap = new_ArrInt(10)
ArrInt_setitem(ip,0,123) ArrInt_setitem(ip, 0, 123)
ArrInt_setitem(ap,2,123) ArrInt_setitem(ap, 2, 123)
vi = IntPtrVector((ip,ap,None)) vi = IntPtrVector((ip, ap, None))
if ArrInt_getitem(vi[0],0) != ArrInt_getitem(vi[1],2): if ArrInt_getitem(vi[0], 0) != ArrInt_getitem(vi[1], 2):
raise RuntimeError,"bad std::vector<int*> mapping" raise RuntimeError, "bad std::vector<int*> mapping"
delete_ArrInt(ap) delete_ArrInt(ap)
a = halfs([10,8,4,3]) a = halfs([10, 8, 4, 3])
v = IntVector() v = IntVector()
v[0:2] = [1,2] v[0:2] = [1, 2]
if v[0] != 1 or v[1] != 2: if v[0] != 1 or v[1] != 2:
raise RuntimeError,"bad setslice" raise RuntimeError, "bad setslice"
if v[0:-1][0] != 1: if v[0:-1][0] != 1:
raise RuntimeError,"bad getslice" raise RuntimeError, "bad getslice"
if v[0:-2].size() != 0: if v[0:-2].size() != 0:
raise RuntimeError,"bad getslice" raise RuntimeError, "bad getslice"
v[0:1] = [2] v[0:1] = [2]
if v[0] != 2: if v[0] != 2:
raise RuntimeError,"bad setslice" raise RuntimeError, "bad setslice"
v[1:] = [3] v[1:] = [3]
if v[1] != 3: if v[1] != 3:
raise RuntimeError,"bad setslice" raise RuntimeError, "bad setslice"
v[2:] = [3] v[2:] = [3]
if v[2] != 3: if v[2] != 3:
raise RuntimeError,"bad setslice" raise RuntimeError, "bad setslice"
if v[0:][0] != v[0]: if v[0:][0] != v[0]:
raise RuntimeError,"bad getslice" raise RuntimeError, "bad getslice"
del v[:] del v[:]
if v.size() != 0: if v.size() != 0:
raise RuntimeError,"bad getslice" raise RuntimeError, "bad getslice"
del v[:] del v[:]
if v.size() != 0: if v.size() != 0:
raise RuntimeError,"bad getslice" raise RuntimeError, "bad getslice"
v = vecStr(["hello ", "world"]) v = vecStr(["hello ", "world"])
if v[0] != 'hello world': if v[0] != 'hello world':
raise RuntimeError,"bad std::string+std::vector" raise RuntimeError, "bad std::string+std::vector"
pv = pyvector([1, "hello", (1, 2)])
pv = pyvector([1, "hello", (1,2)])
if pv[1] != "hello": if pv[1] != "hello":
raise RuntimeError raise RuntimeError
iv = IntVector(5) iv = IntVector(5)
for i in range(0,5): for i in range(0, 5):
iv[i] = i iv[i] = i
iv[1:3] = [] iv[1:3] = []
@ -139,7 +137,8 @@ ip = makeIntPtr(11)
dp = makeDoublePtr(33.3) dp = makeDoublePtr(33.3)
error = 0 error = 0
try: try:
vi = IntPtrVector((ip, dp)) # check vector<int *> does not accept double * element # check vector<int *> does not accept double * element
vi = IntPtrVector((ip, dp))
error = 1 error = 1
except: except:
pass pass
@ -159,7 +158,8 @@ csp = makeConstShortPtr(111)
error = 0 error = 0
try: try:
vcs = ConstShortPtrVector((csp, dp)) # check vector<const unsigned short *> does not accept double * element # check vector<const unsigned short *> does not accept double * element
vcs = ConstShortPtrVector((csp, dp))
error = 1 error = 1
except: except:
pass pass
@ -173,4 +173,3 @@ if extractConstShort(vcs[0]) != 111:
if extractConstShort(vcs[1]) != 222: if extractConstShort(vcs[1]) != 222:
raise RuntimeError raise RuntimeError

1
Examples/test-suite/python/li_std_vector_ptr_runme.py
View file

@ -5,4 +5,3 @@ ip2 = makeIntPtr(22)
vi = IntPtrVector((ip1, ip2)) vi = IntPtrVector((ip1, ip2))
displayVector(vi) displayVector(vi)

1
Examples/test-suite/python/li_std_wstream_runme.py
View file

@ -1,7 +1,6 @@
from li_std_wstream import * from li_std_wstream import *
a = A() a = A()
o = wostringstream() o = wostringstream()

6
Examples/test-suite/python/li_std_wstring_runme.py
View file

@ -1,12 +1,12 @@
import li_std_wstring import li_std_wstring
x=u"h" x = u"h"
if li_std_wstring.test_wcvalue(x) != x: if li_std_wstring.test_wcvalue(x) != x:
print li_std_wstring.test_wcvalue(x) print li_std_wstring.test_wcvalue(x)
raise RuntimeError("bad string mapping") raise RuntimeError("bad string mapping")
x=u"hello" x = u"hello"
if li_std_wstring.test_ccvalue(x) != x: if li_std_wstring.test_ccvalue(x) != x:
raise RuntimeError("bad string mapping") raise RuntimeError("bad string mapping")
@ -81,5 +81,3 @@ if b.name != "hello":
b.a = li_std_wstring.A("hello") b.a = li_std_wstring.A("hello")
if b.a != u"hello": if b.a != u"hello":
raise RuntimeError("bad string mapping") raise RuntimeError("bad string mapping")

24
Examples/test-suite/python/member_pointer_runme.py
View file

@ -2,9 +2,11 @@
from member_pointer import * from member_pointer import *
def check(what, expected, actual): def check(what, expected, actual):
if expected != actual: if expected != actual:
raise RuntimeError ("Failed: " , what , " Expected: " , expected , " Actual: " , actual) raise RuntimeError(
"Failed: ", what, " Expected: ", expected, " Actual: ", actual)
# Get the pointers # Get the pointers
@ -17,20 +19,20 @@ s = Square(10)
# Do some calculations # Do some calculations
check ("Square area ", 100.0, do_op(s,area_pt)) check("Square area ", 100.0, do_op(s, area_pt))
check ("Square perim", 40.0, do_op(s,perim_pt)) check("Square perim", 40.0, do_op(s, perim_pt))
memberPtr = cvar.areavar memberPtr = cvar.areavar
memberPtr = cvar.perimetervar memberPtr = cvar.perimetervar
# Try the variables # Try the variables
check ("Square area ", 100.0, do_op(s,cvar.areavar)) check("Square area ", 100.0, do_op(s, cvar.areavar))
check ("Square perim", 40.0, do_op(s,cvar.perimetervar)) check("Square perim", 40.0, do_op(s, cvar.perimetervar))
# Modify one of the variables # Modify one of the variables
cvar.areavar = perim_pt cvar.areavar = perim_pt
check ("Square perimeter", 40.0, do_op(s,cvar.areavar)) check("Square perimeter", 40.0, do_op(s, cvar.areavar))
# Try the constants # Try the constants
@ -38,9 +40,9 @@ memberPtr = AREAPT
memberPtr = PERIMPT memberPtr = PERIMPT
memberPtr = NULLPT memberPtr = NULLPT
check ("Square area ", 100.0, do_op(s,AREAPT)) check("Square area ", 100.0, do_op(s, AREAPT))
check ("Square perim", 40.0, do_op(s,PERIMPT)) check("Square perim", 40.0, do_op(s, PERIMPT))
check ("Add by value", 3, call1(ADD_BY_VALUE, 1, 2)) check("Add by value", 3, call1(ADD_BY_VALUE, 1, 2))
check ("Add by pointer", 7, call2(ADD_BY_POINTER, 3, 4)) check("Add by pointer", 7, call2(ADD_BY_POINTER, 3, 4))
check ("Add by reference", 11, call3(ADD_BY_REFERENCE, 5, 6)) check("Add by reference", 11, call3(ADD_BY_REFERENCE, 5, 6))

20
Examples/test-suite/python/minherit_runme.py
View file

@ -26,10 +26,12 @@ if minherit.yget(b) != 2:
raise RuntimeError, "Bad attribute value %d" % (minherit.yget(b)) raise RuntimeError, "Bad attribute value %d" % (minherit.yget(b))
if minherit.xget(c) != 1 or minherit.yget(c) != 2 or minherit.zget(c) != 3: if minherit.xget(c) != 1 or minherit.yget(c) != 2 or minherit.zget(c) != 3:
raise RuntimeError, "Bad attribute value %d %d %d" % (minherit.xget(c), minherit.yget(c), minherit.zget(c)) raise RuntimeError, "Bad attribute value %d %d %d" % (
minherit.xget(c), minherit.yget(c), minherit.zget(c))
if minherit.xget(d) != 1 or minherit.yget(d) != 2 or minherit.zget(d) != 3 or minherit.wget(d) != 4: if minherit.xget(d) != 1 or minherit.yget(d) != 2 or minherit.zget(d) != 3 or minherit.wget(d) != 4:
raise RuntimeError, "Bad attribute value %d %d %d %d" % (minherit.xget(d), minherit.yget(d), minherit.zget(d), minherit.wget(d)) raise RuntimeError, "Bad attribute value %d %d %d %d" % (
minherit.xget(d), minherit.yget(d), minherit.zget(d), minherit.wget(d))
# Cleanse all of the pointers and see what happens # Cleanse all of the pointers and see what happens
@ -57,15 +59,9 @@ if minherit.yget(bb) != 2:
raise RuntimeError, "Bad attribute value %d" % (minherit.yget(bb)) raise RuntimeError, "Bad attribute value %d" % (minherit.yget(bb))
if minherit.xget(cc) != 1 or minherit.yget(cc) != 2 or minherit.zget(cc) != 3: if minherit.xget(cc) != 1 or minherit.yget(cc) != 2 or minherit.zget(cc) != 3:
raise RuntimeError, "Bad attribute value %d %d %d" % (minherit.xget(cc), minherit.yget(cc), minherit.zget(cc)) raise RuntimeError, "Bad attribute value %d %d %d" % (
minherit.xget(cc), minherit.yget(cc), minherit.zget(cc))
if minherit.xget(dd) != 1 or minherit.yget(dd) != 2 or minherit.zget(dd) != 3 or minherit.wget(dd) != 4: if minherit.xget(dd) != 1 or minherit.yget(dd) != 2 or minherit.zget(dd) != 3 or minherit.wget(dd) != 4:
raise RuntimeError, "Bad attribute value %d %d %d %d" % (minherit.xget(dd), minherit.yget(dd), minherit.zget(dd), minherit.wget(dd)) raise RuntimeError, "Bad attribute value %d %d %d %d" % (
minherit.xget(dd), minherit.yget(dd), minherit.zget(dd), minherit.wget(dd))

5
Examples/test-suite/python/namespace_class_runme.py
View file

@ -1,5 +1,6 @@
from namespace_class import * from namespace_class import *
def is_new_style_class(cls): def is_new_style_class(cls):
return hasattr(cls, "__class__") return hasattr(cls, "__class__")
@ -22,9 +23,9 @@ if (error):
raise RuntimeError, "Private2 is private" raise RuntimeError, "Private2 is private"
if is_new_style_class(EulerT3D): if is_new_style_class(EulerT3D):
EulerT3D.toFrame(1,1,1) EulerT3D.toFrame(1, 1, 1)
else: else:
EulerT3D().toFrame(1,1,1) EulerT3D().toFrame(1, 1, 1)
b = BooT_i() b = BooT_i()
b = BooT_H() b = BooT_H()

Some files were not shown because too many files have changed in this diff Show more