Skip to content

Commit 4294659

Browse files
author
Victor Verbeke
authored
Merge pull request #52 from VictorVerbeke/master
Translate templates_parser tests to e3.testsuite
2 parents b63c08d + 9b3e054 commit 4294659

File tree

175 files changed

+290
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+290
-304
lines changed

‎regtests/run-test‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎regtests/test_support.py‎

100644100755
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@
22
This module contains support functions for all test.py
33
"""
44

5+
from e3.os.process import Run
56
import os
67
import sys
78

89
# Change directory
9-
10-
TEST = sys.modules['__main__']
11-
TESTDIR = os.path.dirname(TEST.__file__)
10+
TEST = sys.modules["__main__"]
11+
TESTDIR = os.path.dirname(os.path.realpath(TEST.__file__))
1212
TEST_NAME = os.path.basename(TESTDIR)
1313
os.chdir(TESTDIR)
1414

15-
from gnatpython.ex import Run
16-
1715

1816
def gprbuild(prj):
1917
"""Compile a project with gprbuild"""
2018
cmd = ["gprbuild", "-p", "-P" + prj, "-bargs", "-E"]
2119
process = Run(cmd)
2220
if process.status:
23-
print process.out
21+
print(process.out)
2422

2523

2624
def run(bin, options=None, output_file=None):

‎regtests/tests/0001_tag_demo/test.yaml‎

Whitespace-only changes.

‎regtests/tests/0002_testme/test.out‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,35 +125,35 @@ Should be 0 : 0
125125
Should be 0 : 0
126126
[INFO] testme.tmplt
127127
[C_INFO] 1 FALSE
128-
[TEXT]
128+
[TEXT]
129129
[TEXT] This is a test template for Templates_Parser
130-
[TEXT]
130+
[TEXT]
131131
[TEXT] A single value : @_VAR1_@
132-
[TEXT]
132+
[TEXT]
133133
[TEXT] Should be 0 : @_NUMBER_LINE_@
134134
[TEXT] Should be 0 : @_TABLE_LEVEL_@
135-
[TEXT]
135+
[TEXT]
136136
[TEXT] A table :
137-
[TEXT]
137+
[TEXT]
138138
[TABLE]
139139
[BLOCK]
140140
[COMMON]
141141
[TEXT] @_VAR2_@
142142
[END_BLOCK]
143143
[END_TABLE]
144-
[TEXT]
144+
[TEXT]
145145
[IF] @_COND1_@
146146
[TEXT] ERROR: test is not correct
147147
[ELSE]
148148
[TEXT] OK: test passed
149149
[END_IF]
150-
[TEXT]
150+
[TEXT]
151151
[IF] @_COND2_@
152152
[TEXT] OK: test passed
153153
[ELSE]
154154
[TEXT] ERROR: test is not correct
155155
[END_IF]
156-
[TEXT]
156+
[TEXT]
157157
[IF] @_COND2_@
158158
[TABLE]
159159
[BLOCK]
@@ -166,7 +166,7 @@ Should be 0 : 0
166166
[END_BLOCK]
167167
[END_TABLE]
168168
[END_IF]
169-
[TEXT]
169+
[TEXT]
170170
[TABLE'TERMINATE_SECTIONS]
171171
[BLOCK]
172172
[SECTION]
@@ -177,7 +177,7 @@ Should be 0 : 0
177177
[TEXT] Well a another one [@_VAR2_@]
178178
[END_BLOCK]
179179
[END_TABLE]
180-
[TEXT]
180+
[TEXT]
181181
[TABLE]
182182
[BLOCK]
183183
[COMMON]
@@ -198,9 +198,9 @@ Should be 0 : 0
198198
[END_TABLE]
199199
[END_BLOCK]
200200
[END_TABLE]
201-
[TEXT]
201+
[TEXT]
202202
[TEXT] Cond1: @_COND1_@ - @_YES_NO:COND1_@ - @_OUI_NON:COND1_@
203203
[TEXT] Cond2: @_COND2_@ - @_YES_NO:COND2_@ - @_OUI_NON:COND2_@
204-
[TEXT]
204+
[TEXT]
205205
[TEXT] Should be 0 : @_NUMBER_LINE_@
206206
[TEXT] Should be 0 : @_TABLE_LEVEL_@

‎regtests/tests/0002_testme/test.yaml‎

Whitespace-only changes.

‎regtests/tests/0003_testme/test.yaml‎

Whitespace-only changes.

‎regtests/tests/0004_testme/test.yaml‎

Whitespace-only changes.

‎regtests/tests/0005_testme/test.out‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -259,25 +259,25 @@ Idem with @@TERMINATE_SECTIONS@@
259259
S1) A1.1
260260
S2) A1.2
261261
S1) A1.3
262-
S2)
262+
S2)
263263
S1) A2.1
264264
S2) A2.2
265265
S1) A2.3
266-
S2)
266+
S2)
267267
S1) A3.1
268268
S2) A3.2
269269
S1) A3.3
270-
S2)
270+
S2)
271271
S1) A4.1
272272
S2) A4.2
273273
S1) A4.3
274-
S2)
274+
S2)
275275

276276
[INFO] testme6.tmplt
277277
[C_INFO] 1 FALSE
278-
[TEXT]
278+
[TEXT]
279279
[TEXT] This is a test for the matrix feature:
280-
[TEXT]
280+
[TEXT]
281281
[TABLE]
282282
[BLOCK]
283283
[COMMON]
@@ -293,17 +293,17 @@ S2)
293293
[TEXT] [@_MAT_@]
294294
[END_BLOCK]
295295
[END_TABLE]
296-
[TEXT]
296+
[TEXT]
297297
[TEXT] ======================================================================
298-
[TEXT]
298+
[TEXT]
299299
[TEXT] A table with labels (vector):
300-
[TEXT]
300+
[TEXT]
301301
[TABLE]
302302
[BLOCK]
303303
[COMMON]
304-
[TEXT]
304+
[TEXT]
305305
[TEXT] Label: @_LABELS_@
306-
[TEXT]
306+
[TEXT]
307307
[TEXT] Table1: @_UP_TABLE_LINE_@ @_TABLE_LINE_@ @_NUMBER_LINE_@ @_TABLE_LEVEL_@
308308
[TABLE]
309309
[BLOCK]
@@ -314,21 +314,21 @@ S2)
314314
[END_TABLE]
315315
[END_BLOCK]
316316
[END_TABLE]
317-
[TEXT]
317+
[TEXT]
318318
[TEXT] ======================================================================
319-
[TEXT]
319+
[TEXT]
320320
[TEXT] A matrix inside a table with labels (vectors):
321-
[TEXT]
321+
[TEXT]
322322
[TABLE]
323323
[BLOCK]
324324
[COMMON]
325-
[TEXT]
325+
[TEXT]
326326
[TEXT] Label: @_LABELS_@
327-
[TEXT]
327+
[TEXT]
328328
[TABLE]
329329
[BLOCK]
330330
[COMMON]
331-
[TEXT]
331+
[TEXT]
332332
[TEXT] Table1: @_UP_TABLE_LINE_@ @_TABLE_LINE_@ @_NUMBER_LINE_@ @_TABLE_LEVEL_@
333333
[TABLE]
334334
[BLOCK]
@@ -341,17 +341,17 @@ S2)
341341
[END_TABLE]
342342
[END_BLOCK]
343343
[END_TABLE]
344-
[TEXT]
344+
[TEXT]
345345
[TEXT] ======================================================================
346-
[TEXT]
346+
[TEXT]
347347
[TEXT] A matrix outside a table:
348-
[TEXT]
348+
[TEXT]
349349
[TEXT] @_MAT_@
350-
[TEXT]
350+
[TEXT]
351351
[TEXT] ======================================================================
352-
[TEXT]
352+
[TEXT]
353353
[TEXT] A matrix with section:
354-
[TEXT]
354+
[TEXT]
355355
[TABLE]
356356
[BLOCK]
357357
[COMMON]
@@ -365,9 +365,9 @@ S2)
365365
[END_TABLE]
366366
[END_BLOCK]
367367
[END_TABLE]
368-
[TEXT]
368+
[TEXT]
369369
[TEXT] Idem with @@TERMINATE_SECTIONS@@
370-
[TEXT]
370+
[TEXT]
371371
[TABLE]
372372
[BLOCK]
373373
[COMMON]

‎regtests/tests/0005_testme/test.yaml‎

Whitespace-only changes.

‎regtests/tests/0006_testme/test.yaml‎

Whitespace-only changes.

0 commit comments

Comments
 (0)