From 1fa977c926520c4e284465f73e75bfe9982d9fdf Mon Sep 17 00:00:00 2001 From: Philip Paquette Date: Mon, 10 Jun 2019 10:27:01 -0400 Subject: Using OrderResults to indicate the correct order results during adjudication - Modified DATC tests for consistency --- diplomacy/tests/test_datc_no_expand.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'diplomacy/tests/test_datc_no_expand.py') diff --git a/diplomacy/tests/test_datc_no_expand.py b/diplomacy/tests/test_datc_no_expand.py index 0e7711f..7dc1f49 100644 --- a/diplomacy/tests/test_datc_no_expand.py +++ b/diplomacy/tests/test_datc_no_expand.py @@ -18,6 +18,7 @@ - Contains the diplomacy adjudication test cases (without order expansion) """ from diplomacy.tests.test_datc import TestDATC as RootDATC +from diplomacy.utils.order_results import OK, BOUNCE, VOID # ----------------- # DATC TEST CASES (Without order expansion) @@ -60,10 +61,10 @@ class TestDATCNoExpand(RootDATC): self.set_orders(game, 'FRANCE', ['F POR S F MAO - SPA/NC', 'F MAO - SPA/SC']) self.set_orders(game, 'ITALY', ['F LYO S F WES - SPA/SC', 'F WES - SPA/SC']) self.process(game) - assert self.check_results(game, 'F POR', 'void') - assert self.check_results(game, 'F MAO', 'bounce') - assert self.check_results(game, 'F LYO', '') - assert self.check_results(game, 'F WES', '') + assert self.check_results(game, 'F POR', VOID) + assert self.check_results(game, 'F MAO', BOUNCE) + assert self.check_results(game, 'F LYO', OK) + assert self.check_results(game, 'F WES', OK) assert self.owner_name(game, 'F POR') == 'FRANCE' assert self.owner_name(game, 'F MAO') == 'FRANCE' assert self.owner_name(game, 'F SPA') == 'ITALY' -- cgit v1.2.3