Commit: ee2503fecb73cd85c90558e78a5f0e8b572ca7d0 - CCastle2 (hg)

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

Commit MetaInfo

• Revisão: ee2503fecb73cd85c90558e78a5f0e8b572ca7d0 (tree)
• Hora: 2023-10-03 19:31:12
• Autor: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Mensagem de Log

Refactored pytst on protocol file with generatedProtocol_verifier

Mudança Sumário

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

Diff

diff -r 6525f57affe6 -r ee2503fecb73 Makefile
--- a/Makefile	Tue Oct 03 11:26:50 2023 +0200
+++ b/Makefile	Tue Oct 03 12:31:12 2023 +0200
@@ -18,10 +18,9 @@
 #
 rPY_CURRENT = \
 	pytst/writers/RPy/test_2_ProtocolDataStructures.py	\
-
+	pytst/writers/RPy/test_99_SieveMoats.py			\
 #
 CC2CPy_TODO = \
-	pytst/writers/RPy/test_99_SieveMoats.py			\
 	pytst/writers/RPy/test_999.py 				\
 #
 

diff -r 6525f57affe6 -r ee2503fecb73 pytst/writers/RPy/test_99_SieveMoats.py
--- a/pytst/writers/RPy/test_99_SieveMoats.py	Tue Oct 03 11:26:50 2023 +0200
+++ b/pytst/writers/RPy/test_99_SieveMoats.py	Tue Oct 03 12:31:12 2023 +0200
@@ -8,22 +8,25 @@
 from TestDoubles.AIGR.protocols import Sieve
 
 from . import T_Protocol, TstDoubles
+from castle.writers import RPy
 
 
-def test_01_StartSieve(T_Protocol):
-    td = TstDoubles('protocols/StartSieve')
-    out = T_Protocol.render(protocols=[Sieve.StartSieve,])
-    with  open(td.gen_file, 'w') as f:
-        f.write(out)
-    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"
[e-mail]
+def generatedProtocol_verifier():
+    def file_matcher(aigr_dummy, td):
+        template = RPy.Template("protocol.jinja2")
+        out = template.render(protocols=(aigr_dummy,))
+        with  open(td.gen_file, 'w') as f:
+            f.write(out)
+        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"
+    return file_matcher
 
 
-def test_03_SlowStart(T_Protocol):
-    td = TstDoubles('protocols/SlowStart')
-    out = T_Protocol.render(protocols=[Sieve.SlowStart,])
-    with  open(td.gen_file, 'w') as f:
-        f.write(out)
-    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"
+def test_01_StartSieve(generatedProtocol_verifier):
+    generatedProtocol_verifier(aigr_dummy=Sieve.StartSieve, td=TstDoubles('protocols/StartSieve'))
+
+def test_02_SlowStart(generatedProtocol_verifier):
+    generatedProtocol_verifier(aigr_dummy=Sieve.SlowStart, td=TstDoubles('protocols/SlowStart'))