Skip to content

Commit 9c0b4fa

Browse files
committed
Test more language variants in communication
1 parent 39d272b commit 9c0b4fa

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

cmstestsuite/Tests.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
LANG_C, LANG_CPP, LANG_CPP14, LANG_CPP17, LANG_CPP20, LANG_PASCAL, LANG_JAVA,
6565
LANG_PYTHON3, LANG_PYPY3, LANG_HS, LANG_RUST, LANG_C_SHARP
6666
)
67+
COMMUNICATION_LANGUAGES = (
68+
LANG_C, LANG_CPP, LANG_CPP14, LANG_CPP17, LANG_CPP20, LANG_PASCAL, LANG_JAVA,
69+
LANG_PYTHON3, LANG_PYPY3)
6770

6871
ALL_TESTS = [
6972

@@ -251,54 +254,52 @@
251254

252255
Test('managed-correct',
253256
task=batch_fileio_managed, filenames=['managed-correct.%l'],
254-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA,
255-
LANG_C_SHARP),
257+
languages=COMMUNICATION_LANGUAGES + (LANG_C_SHARP,),
256258
checks=[CheckOverallScore(100, 100)],
257259
user_tests=True, user_managers=['grader.%l'],
258260
user_checks=[CheckUserTestEvaluated()]),
259261

260262
Test('managed-incorrect',
261263
task=batch_fileio_managed, filenames=['managed-incorrect.%l'],
262-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA,
263-
LANG_C_SHARP),
264+
languages=COMMUNICATION_LANGUAGES + (LANG_C_SHARP,),
264265
checks=[CheckOverallScore(0, 100)]),
265266

266267
# Communication tasks. PHP is not yet supported.
267268

268269
Test('communication-fifoio-correct',
269270
task=communication_fifoio_stubbed,
270271
filenames=['communication-stubbed-correct.%l'],
271-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
272+
languages=COMMUNICATION_LANGUAGES,
272273
checks=[CheckOverallScore(100, 100)]),
273274

274275
Test('communication-fifoio-incorrect',
275276
task=communication_fifoio_stubbed,
276277
filenames=['communication-stubbed-incorrect.%l'],
277-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
278+
languages=COMMUNICATION_LANGUAGES,
278279
checks=[CheckOverallScore(0, 100)]),
279280

280281
Test('communication-stdio-correct',
281282
task=communication_stdio_stubbed,
282283
filenames=['communication-stubbed-correct.%l'],
283-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
284+
languages=COMMUNICATION_LANGUAGES,
284285
checks=[CheckOverallScore(100, 100)]),
285286

286287
Test('communication-stdio-incorrect',
287288
task=communication_stdio_stubbed,
288289
filenames=['communication-stubbed-incorrect.%l'],
289-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
290+
languages=COMMUNICATION_LANGUAGES,
290291
checks=[CheckOverallScore(0, 100)]),
291292

292293
Test('communication-stdio-unstubbed-correct',
293294
task=communication_stdio,
294295
filenames=['communication-stdio-correct.%l'],
295-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
296+
languages=COMMUNICATION_LANGUAGES,
296297
checks=[CheckOverallScore(100, 100)]),
297298

298299
Test('communication-stdio-unstubbed-incorrect',
299300
task=communication_stdio,
300301
filenames=['communication-stdio-incorrect.%l'],
301-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
302+
languages=COMMUNICATION_LANGUAGES,
302303
checks=[CheckOverallScore(0, 100)]),
303304

304305
# Communication tasks with two processes.
@@ -307,28 +308,28 @@
307308
task=communication_many_fifoio_stubbed,
308309
filenames=['communication-many-correct-user1.%l',
309310
'communication-many-correct-user2.%l'],
310-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
311+
languages=COMMUNICATION_LANGUAGES,
311312
checks=[CheckOverallScore(100, 100)]),
312313

313314
Test('communication-many-fifoio-incorrect',
314315
task=communication_many_fifoio_stubbed,
315316
filenames=['communication-many-incorrect-user1.%l',
316317
'communication-many-incorrect-user2.%l'],
317-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
318+
languages=COMMUNICATION_LANGUAGES,
318319
checks=[CheckOverallScore(0, 100)]),
319320

320321
Test('communication-many-stdio-correct',
321322
task=communication_many_stdio_stubbed,
322323
filenames=['communication-many-correct-user1.%l',
323324
'communication-many-correct-user2.%l'],
324-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
325+
languages=COMMUNICATION_LANGUAGES,
325326
checks=[CheckOverallScore(100, 100)]),
326327

327328
Test('communication-many-stdio-incorrect',
328329
task=communication_many_stdio_stubbed,
329330
filenames=['communication-many-incorrect-user1.%l',
330331
'communication-many-incorrect-user2.%l'],
331-
languages=(LANG_C, LANG_CPP, LANG_PASCAL, LANG_PYTHON3, LANG_JAVA),
332+
languages=COMMUNICATION_LANGUAGES,
332333
checks=[CheckOverallScore(0, 100)]),
333334

334335
# TwoSteps

0 commit comments

Comments
 (0)