提交: 224c887cdfd84a7463870b59dbf58f31a9f3166f - CCastle2 (hg)

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

Commit MetaInfo

• 修訂: 224c887cdfd84a7463870b59dbf58f31a9f3166f (tree)
• 時間: 2023-10-04 00:24:58
• 作者: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Log Message

refacored test

Change Summary

• modified: Makefile
• modified: TestDoubles/_generated/protocols/_keepThisDir
• modified: pytst/aigr/test_2b_protocol.py
• modified: pytst/writers/RPy/__init__.py
• add: TestDoubles/reference/protocols/_keepThisDir

差異

diff -r 59fa4cf96410 -r 224c887cdfd8 Makefile
--- a/Makefile	Tue Oct 03 16:42:37 2023 +0200
+++ b/Makefile	Tue Oct 03 17:24:58 2023 +0200
@@ -20,6 +20,7 @@
 rPY_CURRENT = \
 	pytst/writers/RPy/test_2_ProtocolDataStructures.py	\
 	pytst/writers/RPy/test_99_SieveMoats.py			\
+	pytst/aigr/test_2b_protocol.py				\
 #
 CC2CPy_TODO = \
 	pytst/writers/RPy/test_999.py 				\
@@ -37,7 +38,7 @@
 	diff -w -rs TestDoubles/reference/ TestDoubles/_generated/
 
 clean_generated:
-	rm -f TestDoubles/_generated/*.* TestDoubles/_generated/*/*.*
+	rm -f TestDoubles/_generated/*.{py,rpy} TestDoubles/_generated/*/*.{py,rpy}
 
 clean_caches:
 	find . -type d -name __pycache__    -print0 | xargs -0  rm -r

diff -r 59fa4cf96410 -r 224c887cdfd8 TestDoubles/_generated/protocols/_keepThisDir
--- a/TestDoubles/_generated/protocols/_keepThisDir	Tue Oct 03 16:42:37 2023 +0200
+++ b/TestDoubles/_generated/protocols/_keepThisDir	Tue Oct 03 17:24:58 2023 +0200
@@ -1,1 +1,2 @@
-This directory is needed to store generated/rendered files (which is an option during testing)
\ No newline at end of file
+This directory is needed to store generated/rendered files (which is an option during testing)
+.. note:: a "mirror" of this file is found in :dir:`reference` -- to be able to diff dirs
\ No newline at end of file

diff -r 59fa4cf96410 -r 224c887cdfd8 TestDoubles/reference/protocols/_keepThisDir
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/TestDoubles/reference/protocols/_keepThisDir	Tue Oct 03 17:24:58 2023 +0200
@@ -0,0 +1,2 @@
+This directory is needed to store generated/rendered files (which is an option during testing)
+.. note:: a "mirror" of this file is found in :dir:`reference` -- to be able to diff dirs
\ No newline at end of file

diff -r 59fa4cf96410 -r 224c887cdfd8 pytst/aigr/test_2b_protocol.py
--- a/pytst/aigr/test_2b_protocol.py	Tue Oct 03 16:42:37 2023 +0200
+++ b/pytst/aigr/test_2b_protocol.py	Tue Oct 03 17:24:58 2023 +0200
@@ -78,3 +78,8 @@
     assert (e.typedParameters[1].name, e.typedParameters[1].type) == ('p1', int)
     assert (e.typedParameters[2].name, e.typedParameters[2].type) == ('p2', str)
     assert (e.typedParameters[3].name, e.typedParameters[3].type) == ('p3', None)
+
+
[e-mail](reason="Implementation is needed (test & prod)")
+def test_inherit_base_withParms():
+    assert False

diff -r 59fa4cf96410 -r 224c887cdfd8 pytst/writers/RPy/__init__.py
--- a/pytst/writers/RPy/__init__.py	Tue Oct 03 16:42:37 2023 +0200
+++ b/pytst/writers/RPy/__init__.py	Tue Oct 03 17:24:58 2023 +0200
@@ -55,22 +55,35 @@
     def gen_file(self, ext='.rpy'):
         return self._top / self._gen / self.base_name.with_suffix(ext)
 
+    def read_ref(self) -> str:             #File content as one (long, multi-line) string (aka Text)
+        with open(self.ref_file) as f:
+            ref = f.read()
+        logger.debug("---------- ref: ----------\n%s\n==========================", ref)
+        return ref
+
+    def write_gen(self,txt) ->None:
+        with open(self.gen_file, 'w') as f:
+            f.write(txt)
+        logger.info("Saved rendered protocol in: %s", self.gen_file)
+
 
 @pytest.fixture
 def generatedProtocol_verifier(T_Protocol):
      def matcher(aigr_mock, td, save_file=False):
         out = T_Protocol.render(protocols=(aigr_mock,))
         logger.debug("---------- out: (%s)----------\n%s", aigr_mock, out)
+
         if save_file:
-            with open(td.gen_file, 'w') as f:
-                f.write(out)
-            logger.info("Saved rendered protocol in: %s", td.gen_file)
-        ref = open(td.ref_file).read()
-        logger.debug("---------- ref: ----------\n%s\n==========================", out)
+            td.write_gen(out)
 
-        #assert line by line: gives better feedback when they do not match
-        for n, (o,r) in enumerate(zip(out.splitlines(keepends=True), ref.splitlines(keepends=True), strict=True)):
-            assert o == r, "line %s does not match: >>%s<< != <<%s>>" % (n, o.strip('\n'), r.strip('\n'))
+        ref = td.read_ref()
+        try:
+            #assert line by line: gives better feedback when they do not match
+            for n, (o,r) in enumerate(zip(out.splitlines(keepends=True), ref.splitlines(keepends=True), strict=True)):
+                assert o == r, "line %s does not match: >>%s<< != <<%s>>" % (n, o.strip('\n'), r.strip('\n'))
+        except ValueError as err:
+            assert False, f"Note the same length: files {td.gen_file} and {td.ref_file}"
+
         assert out == ref                 #Should be needed
      return matcher