Commit: c63a41dd6ef42c834212b43e3f3bb1d0edfac6d3 - CCastle2 (hg)

Castle: The best Real-Time/Embedded/HighTech language EVER. Attempt 2

Commit MetaInfo

• Révision: c63a41dd6ef42c834212b43e3f3bb1d0edfac6d3 (tree)
• l'heure: 2023-10-03 05:31:51
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

Refactored TstDoubles (test setup)

Change Summary

• modified: pytst/writers/RPy/__init__.py
• modified: pytst/writers/RPy/test_99_SieveMoats.py

Modification

diff -r 655b2a8b6a00 -r c63a41dd6ef4 pytst/writers/RPy/__init__.py
--- a/pytst/writers/RPy/__init__.py	Mon Oct 02 20:48:31 2023 +0200
+++ b/pytst/writers/RPy/__init__.py	Mon Oct 02 22:31:51 2023 +0200
@@ -43,4 +43,19 @@
 
 
 
+class TstDoubles():
+    _top = Path('TestDoubles')
+    _ref, _gen = Path('reference'), Path('_generated')
 
+    def __init__(self, base_name):
+       self.base_name = Path(base_name)
+
+    @property
+    def ref_file(self, ext='.rpy'):
+        return self._top / self._ref / self.base_name.with_suffix(ext)
+
+    @property
+    def gen_file(self, ext='.rpy'):
+        return self._top / self._gen / self.base_name.with_suffix(ext)
+
+

diff -r 655b2a8b6a00 -r c63a41dd6ef4 pytst/writers/RPy/test_99_SieveMoats.py
--- a/pytst/writers/RPy/test_99_SieveMoats.py	Mon Oct 02 20:48:31 2023 +0200
+++ b/pytst/writers/RPy/test_99_SieveMoats.py	Mon Oct 02 22:31:51 2023 +0200
@@ -7,33 +7,23 @@
 
 from TestDoubles.AIGR.protocols import Sieve
 
-from . import T_Protocol
-
-
-
+from . import T_Protocol, TstDoubles
 
 
 def test_01_StartSieve(T_Protocol):
-    ref_file = 'TestDoubles/reference/protocols/StartSieve.rpy'
-    gen_file = 'Testdoubles/_generated/protocols/StartSieve.rpy'
-
+    td = TstDoubles('protocols/StartSieve')
     out = T_Protocol.render(protocols=[Sieve.StartSieve,])
-    with  open(gen_file, 'w') as f:
+    with  open(td.gen_file, 'w') as f:
         f.write(out)
-    logger.debug(f"Comparing the generated file ({gen_file}) and the reference ({ref_file})")
-    assert filecmp.cmp(gen_file, ref_file), f"The generated file ({gen_file}) and the reference ({ref_file}) are not the same"
+    assert filecmp.cmp(td.gen_file, td.ref_file), f"The generated file ({td.gen_file}) and the reference ({td.ref_file}) are not the same"
 
 
-#@pytest.mark.skip("Need to test AIGR.protocols:: parameters first (and writer for it to)")
 def test_03_SlowStart(T_Protocol):
-    ref_file = 'TestDoubles/reference/protocols/SlowStart.rpy'
-    gen_file = 'Testdoubles/_generated/protocols/SlowStart.rpy'
-
+    td = TstDoubles('protocols/SlowStart')
     out = T_Protocol.render(protocols=[Sieve.SlowStart,])
-    with  open(gen_file, 'w') as f:
+    with  open(td.gen_file, 'w') as f:
         f.write(out)
-    logger.debug(f"Comparing the generated file ({gen_file}) and the reference ({ref_file})")
-    assert filecmp.cmp(gen_file, ref_file), f"The generated file ({gen_file}) and the reference ({ref_file}) are not the same"
+    assert filecmp.cmp(td.gen_file, td.ref_file), f"The generated file ({td.gen_file}) and the reference ({td.ref_file}) are not the same"