Skip to content

Commit 7bc7cd8

Browse files
cool-RRcool-RR
committed
-
1 parent fa2fa84 commit 7bc7cd8

File tree

4 files changed

+134
-152
lines changed

4 files changed

+134
-152
lines changed

‎misc/IDE files/Wing/python_toolbox.wpr‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ proj.directory-list = [{'dirloc': loc('../../..'),
1515
'watch_for_changes': True}]
1616
proj.file-type = 'shared'
1717
proj.home-dir = loc('../../..')
18-
proj.main-file = loc('../../../run_gui.py')
1918
proj.pypath = {None: ('custom',
2019
'${WING:PROJECT_HOME}'),
2120
loc('../../../run_tests.py'): ('custom',

‎test_python_toolbox/__init__.py‎

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
import nose
1010

11-
from .shared import verify_simpack_settings
12-
1311

1412
if nose.__versioninfo__ < (1, 0, 0):
1513
raise Exception('Nose version 1.0.0 or higher is required to run tests.')
@@ -44,36 +42,14 @@ def exists(module_name):
4442
else:
4543
return True
4644

47-
if not exists('garlicsim'):
48-
garlicsim_candidate_path = os.path.realpath(
49-
os.path.join(
50-
os.path.split(__file__)[0],
51-
'..',
52-
'..',
53-
'garlicsim'
54-
)
55-
)
56-
sys.path.append(garlicsim_candidate_path)
57-
if not exists('garlicsim_lib'):
58-
garlicsim_lib_candidate_path = os.path.realpath(
45+
if not exists('python_toolbox'):
46+
python_toolbox_candidate_path = os.path.realpath(
5947
os.path.join(
6048
os.path.split(__file__)[0],
6149
'..',
62-
'..',
63-
'garlicsim_lib'
64-
)
65-
)
66-
sys.path.append(garlicsim_lib_candidate_path)
67-
if not exists('garlicsim_wx'):
68-
garlicsim_wx_candidate_path = os.path.realpath(
69-
os.path.join(
70-
os.path.split(__file__)[0],
71-
'..',
72-
'..',
73-
'garlicsim_wx'
7450
)
7551
)
76-
sys.path.append(garlicsim_wx_candidate_path)
52+
sys.path.append(python_toolbox_candidate_path)
7753

7854

7955
__bootstrap()
@@ -84,13 +60,13 @@ def exists(module_name):
8460
'--detailed-errors',
8561
'--with-xunit',
8662
'--cover-erase',
87-
'--cover-package=garlicsim,garlicsim_lib,garlicsim_wx,'
88-
'test_garlicsim,test_garlicsim_lib,test_garlicsim_wx',
63+
'--cover-package=python_toolbox,test_python_toolbox',
8964
'--exe', # Needed because `setup.py` makes our test modules executable
9065
]
9166

9267

9368
def invoke_nose(arguments=_default_nose_arguments):
94-
'''Start Nose using this `test_garlicsim` test package.'''
95-
nose.run(defaultTest='test_garlicsim', argv=([sys.argv[0]] + arguments))
69+
'''Start Nose using this `test_python_toolbox` test package.'''
70+
nose.run(defaultTest='test_python_toolbox',
71+
argv=([sys.argv[0]] + arguments))
9672

‎test_python_toolbox/test_address_tools/test_describe.py‎

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from python_toolbox import import_tools
1111
from python_toolbox.temp_value_setters import TempValueSetter
1212

13-
import garlicsim
13+
import python_toolbox
1414
from python_toolbox.address_tools import (describe,
1515
resolve)
1616

@@ -25,8 +25,8 @@ def test_locally_defined_class():
2525
# Testing for locally defined class:
2626

2727

28-
if garlicsim.__version_info__ <= (0, 6, 3):
29-
raise nose.SkipTest("This test doesn't pass in `garlicsim` version "
28+
if python_toolbox.__version_info__ <= (0, 6, 3):
29+
raise nose.SkipTest("This test doesn't pass in `python_toolbox` version "
3030
"0.6.3 and below, because `describe` doesn't "
3131
"support nested classes yet.")
3232

@@ -69,78 +69,79 @@ def test_stdlib():
6969
email.encoders
7070

7171

72-
def test_garlicsim():
73-
'''Test `describe` for various `garlicsim` modules.'''
72+
# blocktodo: convert to python_toolbox
73+
#def test_garlicsim():
74+
#'''Test `describe` for various `garlicsim` modules.'''
7475

75-
import garlicsim
76-
result = describe(garlicsim.data_structures.state.State)
77-
assert result == 'garlicsim.data_structures.state.State'
78-
assert resolve(result) is garlicsim.data_structures.state.State
79-
80-
result = describe(garlicsim.data_structures.state.State, shorten=True)
81-
assert result == 'garlicsim.data_structures.State'
82-
assert resolve(result) is garlicsim.data_structures.state.State
83-
84-
result = describe(garlicsim.Project, shorten=True)
85-
assert result == 'garlicsim.Project'
86-
assert resolve(result) is garlicsim.Project
87-
88-
# When a root or namespace is given, it's top priority to use it, even if
89-
# it prevents shorterning and results in an overall longer address:
90-
result = describe(garlicsim.Project, shorten=True,
91-
root=garlicsim.asynchronous_crunching)
92-
assert result == 'asynchronous_crunching.Project'
93-
assert resolve(result, root=garlicsim.asynchronous_crunching) is \
94-
garlicsim.Project
95-
96-
result = describe(garlicsim.Project, shorten=True,
97-
namespace=garlicsim)
98-
assert result == 'Project'
99-
assert resolve(result, namespace=garlicsim) is garlicsim.Project
100-
101-
result = describe(garlicsim.Project, shorten=True,
102-
namespace=garlicsim.__dict__)
103-
assert result == 'Project'
104-
assert resolve(result, namespace=garlicsim.__dict__) is \
105-
garlicsim.Project
106-
107-
result = describe(garlicsim.Project, shorten=True,
108-
namespace='garlicsim')
109-
assert result == 'Project'
110-
assert resolve(result, namespace='garlicsim') is garlicsim.Project
111-
112-
result = describe(garlicsim.Project, shorten=True,
113-
namespace='garlicsim.__dict__')
114-
assert result == 'Project'
115-
assert resolve(result, namespace='garlicsim.__dict__') is \
116-
garlicsim.Project
117-
118-
result = describe(garlicsim.data_structures.state.State, root=garlicsim)
119-
assert result == 'garlicsim.data_structures.state.State'
120-
assert resolve(result, root=garlicsim) is \
121-
garlicsim.data_structures.state.State
122-
123-
124-
import garlicsim_lib.simpacks.life
125-
126-
result = describe(garlicsim_lib.simpacks.life.state.State.step)
127-
assert result == 'garlicsim_lib.simpacks.life.state.State.step'
128-
129-
result = describe(garlicsim_lib.simpacks.life.state.State.step,
130-
shorten=True)
131-
assert result == 'garlicsim_lib.simpacks.life.State.step'
132-
133-
result = describe(garlicsim_lib.simpacks.life.state.State.step,
134-
root=garlicsim_lib.simpacks.life)
135-
assert result == 'life.state.State.step'
136-
137-
result = describe(garlicsim_lib.simpacks.life.state.State.step,
138-
namespace=garlicsim_lib.simpacks)
139-
assert result == 'life.state.State.step'
140-
141-
result = describe(garlicsim_lib.simpacks.life.state.State.step,
142-
root=garlicsim_lib.simpacks.life, shorten=True)
143-
assert result == 'life.State.step'
76+
#import garlicsim
77+
#result = describe(garlicsim.data_structures.state.State)
78+
#assert result == 'garlicsim.data_structures.state.State'
79+
#assert resolve(result) is garlicsim.data_structures.state.State
80+
81+
#result = describe(garlicsim.data_structures.state.State, shorten=True)
82+
#assert result == 'garlicsim.data_structures.State'
83+
#assert resolve(result) is garlicsim.data_structures.state.State
84+
85+
#result = describe(garlicsim.Project, shorten=True)
86+
#assert result == 'garlicsim.Project'
87+
#assert resolve(result) is garlicsim.Project
88+
89+
## When a root or namespace is given, it's top priority to use it, even if
90+
## it prevents shorterning and results in an overall longer address:
91+
#result = describe(garlicsim.Project, shorten=True,
92+
#root=garlicsim.asynchronous_crunching)
93+
#assert result == 'asynchronous_crunching.Project'
94+
#assert resolve(result, root=garlicsim.asynchronous_crunching) is \
95+
#garlicsim.Project
96+
97+
#result = describe(garlicsim.Project, shorten=True,
98+
#namespace=garlicsim)
99+
#assert result == 'Project'
100+
#assert resolve(result, namespace=garlicsim) is garlicsim.Project
101+
102+
#result = describe(garlicsim.Project, shorten=True,
103+
#namespace=garlicsim.__dict__)
104+
#assert result == 'Project'
105+
#assert resolve(result, namespace=garlicsim.__dict__) is \
106+
#garlicsim.Project
107+
108+
#result = describe(garlicsim.Project, shorten=True,
109+
#namespace='garlicsim')
110+
#assert result == 'Project'
111+
#assert resolve(result, namespace='garlicsim') is garlicsim.Project
112+
113+
#result = describe(garlicsim.Project, shorten=True,
114+
#namespace='garlicsim.__dict__')
115+
#assert result == 'Project'
116+
#assert resolve(result, namespace='garlicsim.__dict__') is \
117+
#garlicsim.Project
118+
119+
#result = describe(garlicsim.data_structures.state.State, root=garlicsim)
120+
#assert result == 'garlicsim.data_structures.state.State'
121+
#assert resolve(result, root=garlicsim) is \
122+
#garlicsim.data_structures.state.State
123+
124+
125+
#import garlicsim_lib.simpacks.life
126+
127+
#result = describe(garlicsim_lib.simpacks.life.state.State.step)
128+
#assert result == 'garlicsim_lib.simpacks.life.state.State.step'
129+
130+
#result = describe(garlicsim_lib.simpacks.life.state.State.step,
131+
#shorten=True)
132+
#assert result == 'garlicsim_lib.simpacks.life.State.step'
133+
134+
#result = describe(garlicsim_lib.simpacks.life.state.State.step,
135+
#root=garlicsim_lib.simpacks.life)
136+
#assert result == 'life.state.State.step'
137+
138+
#result = describe(garlicsim_lib.simpacks.life.state.State.step,
139+
#namespace=garlicsim_lib.simpacks)
140+
#assert result == 'life.state.State.step'
141+
142+
#result = describe(garlicsim_lib.simpacks.life.state.State.step,
143+
#root=garlicsim_lib.simpacks.life, shorten=True)
144+
#assert result == 'life.State.step'
144145

145146

146147
def test_local_modules():

‎test_python_toolbox/test_address_tools/test_resolve.py‎

Lines changed: 52 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -79,63 +79,69 @@ def test_stdlib():
7979

8080
assert resolve('object') is object
8181

82-
83-
def test_garlicsim():
84-
'''Test `resolve` on `garlicsim` modules.'''
85-
86-
result = resolve('garlicsim.general_misc')
87-
import garlicsim
88-
assert garlicsim.general_misc is result
89-
90-
result = resolve('garlicsim.general_misc.persistent.'
91-
'cross_process_persistent.'
92-
'CrossProcessPersistent.personality')
93-
result2 = \
94-
resolve('general_misc.persistent.CrossProcessPersistent.personality',
95-
namespace=garlicsim)
96-
result3 = resolve('persistent.CrossProcessPersistent.personality',
97-
root=garlicsim.general_misc.persistent,
98-
namespace='email')
99-
assert result is result2 is result3 is garlicsim.general_misc.persistent.\
100-
cross_process_persistent.CrossProcessPersistent.personality
101-
102-
result = resolve('data_structures.end.End',
103-
root=garlicsim.data_structures)
104-
result2 = resolve('data_structures.End',
105-
root=garlicsim.data_structures)
106-
result3 = resolve('data_structures.End', namespace='garlicsim')
107-
assert result is result2 is garlicsim.data_structures.end.End
108-
109-
import email
110-
assert resolve('garlicsim', namespace={'e': email})
82+
# blocktodo: convert to python_toolbox
83+
#def test_garlicsim():
84+
#'''Test `resolve` on `garlicsim` modules.'''
85+
86+
#result = resolve('garlicsim.general_misc')
87+
#import garlicsim
88+
#assert garlicsim.general_misc is result
89+
90+
#result = resolve('garlicsim.general_misc.persistent.'
91+
#'cross_process_persistent.'
92+
#'CrossProcessPersistent.personality')
93+
#result2 = \
94+
#resolve('general_misc.persistent.CrossProcessPersistent.personality',
95+
#namespace=garlicsim)
96+
#result3 = resolve('persistent.CrossProcessPersistent.personality',
97+
#root=garlicsim.general_misc.persistent,
98+
#namespace='email')
99+
#assert result is result2 is result3 is garlicsim.general_misc.persistent.\
100+
#cross_process_persistent.CrossProcessPersistent.personality
101+
102+
#result = resolve('data_structures.end.End',
103+
#root=garlicsim.data_structures)
104+
#result2 = resolve('data_structures.End',
105+
#root=garlicsim.data_structures)
106+
#result3 = resolve('data_structures.End', namespace='garlicsim')
107+
#assert result is result2 is garlicsim.data_structures.end.End
108+
109+
#import email
110+
#assert resolve('garlicsim', namespace={'e': email})
111111

112112

113113
def test_address_in_expression():
114114

115115
result = resolve('[object, email.encoders, marshal]')
116-
import email, marshal, garlicsim
116+
import email, marshal, python_toolbox
117117
assert result == [object, email.encoders, marshal]
118118

119119
assert resolve('[email.encoders, 7, (1, 3), marshal]') == \
120120
[email.encoders, 7, (1, 3), marshal]
121121

122-
result = resolve('{email: marshal, object: 7, garlicsim: garlicsim}')
123-
import garlicsim
124-
assert result == {email: marshal, object: 7, garlicsim: garlicsim}
125-
126-
assert resolve('{email: marshal, object: 7, garlicsim: garlicsim}') == \
127-
{email: marshal, object: 7, garlicsim: garlicsim}
128-
129-
assert resolve('{Project: simulate}', namespace=garlicsim) == \
130-
{garlicsim.Project: garlicsim.simulate}
131-
132-
assert resolve('{asynchronous_crunching.Project: simulate}',
133-
root=garlicsim.asynchronous_crunching,
134-
namespace=garlicsim) == \
135-
{garlicsim.asynchronous_crunching.Project: garlicsim.simulate}
122+
result = \
123+
resolve('{email: marshal, object: 7, python_toolbox: python_toolbox}')
124+
import python_toolbox
125+
assert result == {email: marshal, object: 7,
126+
python_toolbox: python_toolbox}
127+
128+
assert resolve('{email: marshal, '
129+
'object: 7, '
130+
'python_toolbox: python_toolbox}') == \
131+
{email: marshal, object: 7, python_toolbox: python_toolbox}
132+
133+
assert resolve('{CachedProperty: cache}',
134+
namespace=python_toolbox.caching) == {
135+
python_toolbox.caching.CachedProperty: python_toolbox.caching.cache
136+
}
137+
138+
assert resolve('{caching.CachedProperty: cute_testing}',
139+
root=python_toolbox.caching,
140+
namespace=python_toolbox) == \
141+
{python_toolbox.caching.CachedProperty: python_toolbox.cute_testing}
136142

137-
assert resolve('garlicsim if 4 else e', namespace={'e': email}) is \
138-
garlicsim
143+
assert resolve('python_toolbox if 4 else e', namespace={'e': email}) is \
144+
python_toolbox
139145

140146

141147
def test_illegal_input():

0 commit comments

Comments
 (0)