New wrapper testing and adjustmenr for Chain and Distinct.

Author: poing

.github/workflows/rename_project.yml

@@ -16,6 +16,11 @@ function hex2a(hex)
 // Require the secrets package and assign it to a variable
 const secrets = require('../node_modules/secrets.js-grempe/secrets.js');
 
+// Extend secrets package to cause a JSONDecodeError for coverage tests
+secrets.fail = () => {
+  console.log('Oh no, this is a string.  Not JSON.');
+};
+
 // If the script is executed directly, call the appropriate function based on arguments
 if (require.main === module) {
   const commands = hex2a(process.argv[2]);

javascript/wrapper.js

@@ -11,35 +11,23 @@ def __init__(self, func, test=False, distinct=False):
 
     def __call__(self, *args, test=False, distinct=False, **kwargs):
         def wrapped_func(*args, **kwargs):
-            args_str = ", ".join(repr(arg) for arg in args)
-
-            return f"{self.func.__name__}({args_str})"
+            if args:
+                args_str = ", ".join(repr(arg) for arg in args)
+                return f"{self.func.__name__}({args_str})"
+            else:
+                if self.distinct or distinct:
+                    return f"{self.func.__name__}()"
+                else:
+                    return f"{self.func.__name__}()"
 
         if distinct or self.distinct:
-            return (
-                wrapped_func(*args, **kwargs)
-                if args
-                else self.func(*args, **kwargs)
-            )
+            return wrapped_func(*args, **kwargs)
         else:
-
             data = []
-
-            # DO NOT REMOVE THIS
             if test or self.test:
                 data.append("setRNG('testRandom')")
 
-            data.append(
-                wrapped_func(*args, **kwargs)
-                if args
-                else self.func(*args, **kwargs)
-            )
-
-            # Break this section out into a stand-alone function
-            # json_data = json.dumps(data, indent=None).replace("'", "`")
-            # commands = json_data.encode().hex()
-            # results = wrapper(commands)
-            # End of section
+            data.append(wrapped_func(*args, **kwargs))
 
             return get_last_element_or_string(chain(data))
 

js2pysecrets/decorators.py

@@ -18,7 +18,7 @@ def random(*args, **kwargs):
 
 
 @JsFunction
-def foobar(*args, **kwargs):
+def setRNG(*args, **kwargs):
     pass  # pragma: no cover
 
 

js2pysecrets/node.py

@@ -79,7 +79,7 @@ def wrapper(input_data):
         print(
             "Error: Node.js is required. Please install Node.js to continue."
         )  # pragma: no cover
-        exit(1)  # pragma: no cover
+        # exit(1)  # pragma: no cover
     except subprocess.CalledProcessError as e:
         # Print the error from the JavaScript script
         js_error = e.stderr.strip()  # Use e.stderr instead of result.stderr

js2pysecrets/wrapper.py

@@ -1,5 +1,5 @@
 from js2pysecrets.decorators import JsFunction, jsNeedless
-from js2pysecrets.wrapper import wrapper
+from js2pysecrets.wrapper import wrapper, chain
 
 import js2pysecrets.node as node
 import pytest
@@ -25,6 +25,11 @@ def invalidFunction(*args, **kwargs):
     pass
 
 
+@JsFunction
+def fail(*args, **kwargs):
+    pass
+
+
 @jsNeedless
 def needless(*args, **kwargs):
     pass  # pragma: no cover
@@ -34,13 +39,30 @@ def test_JsFunction():
     assert node.random(128) != node.random(32)
 
 
+def test_noArgs():
+    assert node.init() == None
+
+
 def test_jsNeedless():
     assert not_supported(lambda: needless(33, "blue"))
 
 
 def test_Distinct():
-    command = node.share("aabb", 6, 3, distinct=True)
-    assert command == "share('aabb', 6, 3)"
+    assert node.share("aabb", 6, 3, distinct=True) == "share('aabb', 6, 3)"
+    assert node.init(distinct=True) == "init()"
+
+
+def test_Chain():
+    data = []
+    data.append(node.setRNG("testRandom", distinct=True))
+    data.append(node.share("aabb", 6, 3, distinct=True))
+    data.append(node.share("aabb", 6, 3, distinct=True))
+    data.append(node.init(16, distinct=True))
+    data.append(node.share("aabb", 6, 3, distinct=True))
+    data.append(node.share("aabb", 6, 3, distinct=True))
+    results = chain(data)
+    assert results[1][4] == results[2][4]
+    assert results[4][5] != results[5][5]
 
 
 def test_Randomness():
@@ -87,14 +109,14 @@ def test_CalledProcessError():
         assert "Invalid hex character" in str(caught_warnings[0].message)
 
 
-# @pytest.mark.filterwarnings("ignore:fail")
-# def test_JSONDecodeError():
-#     with warnings.catch_warnings(record=True) as caught_warnings:
-#         node.fail()
-#         # Check if any warnings were raised
-#         assert len(caught_warnings) == 1
-#         assert issubclass(caught_warnings[0].category, Warning)
-#         assert "error decoding JSON" in str(caught_warnings[0].message)
+@pytest.mark.filterwarnings("ignore:fail")
+def test_JSONDecodeError():
+    with warnings.catch_warnings(record=True) as caught_warnings:
+        fail(123)
+        # Check if any warnings were raised
+        assert len(caught_warnings) == 1
+        assert issubclass(caught_warnings[0].category, Warning)
+        assert "error decoding JSON" in str(caught_warnings[0].message)
 
 
 # @pytest.mark.filterwarnings("ignore:wrapper")