Skip to content

Commit e412d15

Browse files
borielboriel
committed
Tests updated
1 parent ba432d5 commit e412d15

7 files changed

Lines changed: 74 additions & 72 deletions

File tree

‎tests/api/test_config.py‎

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -15,63 +15,65 @@ def setUp(self):
1515

1616
def test_init(self):
1717
config.init()
18-
self.assertEqual(config.OPTIONS.Debug.value, 0)
19-
self.assertEqual(config.OPTIONS.stdin.value, sys.stdin)
20-
self.assertEqual(config.OPTIONS.stdout.value, sys.stdout)
21-
self.assertEqual(config.OPTIONS.stderr.value, sys.stderr)
22-
self.assertEqual(config.OPTIONS.optimization.value, global_.DEFAULT_OPTIMIZATION_LEVEL)
23-
self.assertEqual(config.OPTIONS.case_insensitive.value, False)
24-
self.assertEqual(config.OPTIONS.array_base.value, 0)
25-
self.assertEqual(config.OPTIONS.byref.value, False)
26-
self.assertEqual(config.OPTIONS.max_syntax_errors.value, global_.DEFAULT_MAX_SYNTAX_ERRORS)
27-
self.assertEqual(config.OPTIONS.string_base.value, 0)
28-
self.assertEqual(config.OPTIONS.memory_map.value, None)
29-
self.assertEqual(config.OPTIONS.bracket.value, False)
30-
self.assertEqual(config.OPTIONS.use_loader.value, False)
31-
self.assertEqual(config.OPTIONS.autorun.value, False)
32-
self.assertEqual(config.OPTIONS.output_file_type.value, 'bin')
33-
self.assertEqual(config.OPTIONS.include_path.value, '')
34-
self.assertEqual(config.OPTIONS.memoryCheck.value, False)
35-
self.assertEqual(config.OPTIONS.strictBool.value, False)
36-
self.assertEqual(config.OPTIONS.arrayCheck.value, False)
37-
self.assertEqual(config.OPTIONS.enableBreak.value, False)
38-
self.assertEqual(config.OPTIONS.emitBackend.value, False)
39-
self.assertEqual(config.OPTIONS.architecture.value, None)
18+
self.assertEqual(config.OPTIONS.Debug, 0)
19+
self.assertEqual(config.OPTIONS.stdin, sys.stdin)
20+
self.assertEqual(config.OPTIONS.stdout, sys.stdout)
21+
self.assertEqual(config.OPTIONS.stderr, sys.stderr)
22+
self.assertEqual(config.OPTIONS.optimization, global_.DEFAULT_OPTIMIZATION_LEVEL)
23+
self.assertEqual(config.OPTIONS.case_insensitive, False)
24+
self.assertEqual(config.OPTIONS.array_base, 0)
25+
self.assertEqual(config.OPTIONS.byref, False)
26+
self.assertEqual(config.OPTIONS.max_syntax_errors, global_.DEFAULT_MAX_SYNTAX_ERRORS)
27+
self.assertEqual(config.OPTIONS.string_base, 0)
28+
self.assertIsNone(config.OPTIONS.memory_map)
29+
self.assertEqual(config.OPTIONS.bracket, False)
30+
self.assertEqual(config.OPTIONS.use_loader, False)
31+
self.assertEqual(config.OPTIONS.autorun, False)
32+
self.assertEqual(config.OPTIONS.output_file_type, 'bin')
33+
self.assertEqual(config.OPTIONS.include_path, '')
34+
self.assertEqual(config.OPTIONS.memoryCheck, False)
35+
self.assertEqual(config.OPTIONS.strictBool, False)
36+
self.assertEqual(config.OPTIONS.arrayCheck, False)
37+
self.assertEqual(config.OPTIONS.enableBreak, False)
38+
self.assertEqual(config.OPTIONS.emitBackend, False)
39+
self.assertIsNone(config.OPTIONS.architecture)
4040
# private options that cannot be accessed with #pragma
41-
self.assertEqual(config.OPTIONS.option('__DEFINES').value, {})
42-
self.assertEqual(config.OPTIONS.explicit.value, False)
43-
self.assertEqual(config.OPTIONS.Sinclair.value, False)
44-
self.assertEqual(config.OPTIONS.strict.value, False)
41+
self.assertEqual(config.OPTIONS['__DEFINES'].value, {})
42+
self.assertEqual(config.OPTIONS.explicit, False)
43+
self.assertEqual(config.OPTIONS.Sinclair, False)
44+
self.assertEqual(config.OPTIONS.strict, False)
4545

4646
def test_initted_values(self):
4747
config.init()
48-
self.assertEqual(sorted(config.OPTIONS.options.keys()), ['Debug',
49-
'Sinclair',
50-
'StdErrFileName',
51-
'__DEFINES',
52-
'architecture',
53-
'arrayCheck',
54-
'array_base',
55-
'autorun',
56-
'bracket',
57-
'byref',
58-
'case_insensitive',
59-
'emitBackend',
60-
'enableBreak',
61-
'explicit',
62-
'include_path',
63-
'inputFileName',
64-
'max_syntax_errors',
65-
'memoryCheck',
66-
'memory_map',
67-
'optimization',
68-
'outputFileName',
69-
'output_file_type',
70-
'stderr',
71-
'stdin',
72-
'stdout',
73-
'strict',
74-
'strictBool',
75-
'string_base',
76-
'use_loader',
77-
'zxnext'])
48+
self.assertEqual(sorted(config.OPTIONS._options.keys()), [
49+
'Debug',
50+
'Sinclair',
51+
'StdErrFileName',
52+
'__DEFINES',
53+
'architecture',
54+
'arrayCheck',
55+
'array_base',
56+
'autorun',
57+
'bracket',
58+
'byref',
59+
'case_insensitive',
60+
'emitBackend',
61+
'enableBreak',
62+
'explicit',
63+
'include_path',
64+
'inputFileName',
65+
'max_syntax_errors',
66+
'memoryCheck',
67+
'memory_map',
68+
'optimization',
69+
'outputFileName',
70+
'output_file_type',
71+
'stderr',
72+
'stdin',
73+
'stdout',
74+
'strict',
75+
'strictBool',
76+
'string_base',
77+
'use_loader',
78+
'zxnext'
79+
])

‎tests/api/test_symbolTable.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ def setUp(self):
2828
def test__init__(self):
2929
""" Tests symbol table initialization
3030
"""
31-
OPTIONS.optimization.push()
32-
OPTIONS.optimization.value = 0
31+
OPTIONS['optimization'].push()
32+
OPTIONS.optimization = 0
3333
self.assertEqual(len(self.s.types), len(TYPE.types))
3434
for type_ in self.s.types:
3535
self.assertTrue(type_.is_basic)
3636
self.assertIsInstance(type_, symbols.BASICTYPE)
3737

3838
self.assertEqual(self.s.current_scope, self.s.global_scope)
39-
OPTIONS.optimization.pop()
39+
OPTIONS['optimization'].pop()
4040

4141
def test_is_declared(self):
4242
# Checks variable 'a' is not declared yet
@@ -180,12 +180,12 @@ def btyperef(self, type_):
180180
return symbols.TYPEREF(symbols.BASICTYPE(type_), 0)
181181

182182
def clearOutput(self):
183-
OPTIONS.remove_option('stderr')
183+
del OPTIONS.stderr
184184
OPTIONS.add_option('stderr', default_value=StringIO())
185185

186186
@property
187187
def OUTPUT(self):
188-
return OPTIONS.stderr.value.getvalue()
188+
return OPTIONS.stderr.getvalue()
189189

190190

191191
if __name__ == '__main__':

‎tests/cmdline/test_zxb.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ def test_org_allows_0xnnnn_format(file_bas, file_bin):
4848
"""
4949
with EnsureRemoveFile(file_bin):
5050
zxb.main(['--parse-only', '--org', '0xC000', file_bas, '-o', file_bin])
51-
assert zxb.OPTIONS.org.value == 0xC000, 'Should set ORG to 0xC000'
51+
assert zxb.OPTIONS.org == 0xC000, 'Should set ORG to 0xC000'

‎tests/symbols/test_symbolARRAYACCESS.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ def setUp(self):
2828
symbols.ARGUMENT(symbols.NUMBER(3, 1, type_=Type.uinteger), 1))
2929
gl.SYMBOL_TABLE = SymbolTable()
3030
# Clears stderr and prepares for capturing it
31-
config.OPTIONS.remove_option('stderr')
31+
del config.OPTIONS.stderr
3232
config.OPTIONS.add_option('stderr', None, StringIO())
3333
config.OPTIONS.add_option_if_not_defined('explicit', None, False)
3434

3535
@property
3636
def OUTPUT(self):
37-
return config.OPTIONS.stderr.value.getvalue()
37+
return config.OPTIONS.stderr.getvalue()
3838

3939
def test__init__(self):
4040
aa = symbols.ARRAYACCESS(self.arr, self.arg, 2)

‎tests/symbols/test_symbolBINARY.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def setUp(self):
1717
self.r = symbols.NUMBER(3, lineno=2)
1818
self.b = symbols.BINARY('PLUS', self.l, self.r, lineno=3)
1919
self.st = symbols.STRING("ZXBASIC", lineno=1)
20-
if OPTIONS.has_option('stderr'):
21-
OPTIONS.remove_option('stderr')
20+
if 'stderr' in OPTIONS:
21+
del OPTIONS.stderr
2222
OPTIONS.add_option('stderr', type_=None, default_value=StringIO())
2323

2424
def test_left_getter(self):
@@ -69,4 +69,4 @@ def test_make_node_PLUS_STR2(self):
6969

7070
@property
7171
def OUTPUT(self):
72-
return OPTIONS.stderr.value.getvalue()
72+
return OPTIONS.stderr.getvalue()

‎tests/symbols/test_symbolBOUND.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ def test__repr__(self):
5555
self.assertEqual(b.__repr__(), b.token + '(1 TO 3)')
5656

5757
def clearOutput(self):
58-
OPTIONS.remove_option('stderr')
58+
del OPTIONS.stderr
5959
OPTIONS.add_option('stderr', default_value=StringIO())
6060

6161
@property
6262
def stderr(self):
63-
return OPTIONS.stderr.value.getvalue()
63+
return OPTIONS.stderr.getvalue()
6464

6565

6666
if __name__ == '__main__':

‎tests/symbols/test_symbolTYPECAST.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def setUp(self):
1919
zxbpp.init()
2020
self.t = TYPECAST(Type.float_, NUMBER(3, lineno=1), lineno=2)
2121

22-
if OPTIONS.has_option('stderr'):
23-
OPTIONS.remove_option('stderr')
22+
if 'stderr' in OPTIONS:
23+
del OPTIONS.stderr
2424
OPTIONS.add_option('stderr', type_=None, default_value=StringIO())
2525

2626
def test_operand(self):
@@ -84,4 +84,4 @@ def test_make_node_loose_byte4(self):
8484

8585
@property
8686
def OUTPUT(self):
87-
return OPTIONS.stderr.value.getvalue()
87+
return OPTIONS.stderr.getvalue()

0 commit comments

Comments
 (0)