increase test coverage

Author: jcjaskula-aws

oqpy/control_flow.py

@@ -86,7 +86,7 @@ def ForIn(
     iterator: Iterable[AstConvertible] | range | AstConvertible,
     identifier_name: Optional[str],
 ) -> contextlib._GeneratorContextManager[IntVar]:
-    ...
+    ...  # pragma: no cover
 
 
 @overload
@@ -96,7 +96,7 @@ def ForIn(
     identifier_name: Optional[str],
     identifier_type: type[ClassicalVarT],
 ) -> contextlib._GeneratorContextManager[ClassicalVarT]:
-    ...
+    ...  # pragma: no cover
 
 
 @contextlib.contextmanager

oqpy/subroutines.py

@@ -100,16 +100,17 @@ def increment_variable(int[32] i) {
     for argname in argnames[1:]:  # arg 0 should be program
         if argname not in type_hints:
             raise ValueError(f"No type hint provided for {argname} on subroutine {name}.")
+        elif not issubclass(type_hints[argname], (_ClassicalVar, Qubit)):
+            raise ValueError(
+                f"Type hint for {argname} on subroutine {name} is not an oqpy variable type."
+            )
+
         input_ = inputs[argname] = type_hints[argname](name=argname)
 
         if isinstance(input_, _ClassicalVar):
             arguments.append(ast.ClassicalArgument(input_.type, ast.Identifier(argname)))
         elif isinstance(input_, Qubit):
             arguments.append(ast.QuantumArgument(ast.Identifier(input_.name), None))
-        else:
-            raise ValueError(
-                f"Type hint for {argname} on subroutine {name} is not an oqpy variable type."
-            )
 
     inner_prog = oqpy.Program()
     for input_val in inputs.values():

tests/test_directives.py

@@ -141,6 +141,8 @@ def test_variable_declaration():
         BitVar[-1](name="d")
     with pytest.raises(IndexError):
         prog.set(arr[1.3], 0)
+    with pytest.raises(IndexError):
+        prog.set(arr[index * 2.0], 0)
     with pytest.raises(TypeError):
         prog.set(c[0], 1)
 
@@ -811,10 +813,18 @@ def return2(prog: Program) -> float:
     with pytest.raises(ValueError):
 
         @subroutine
-        def add(prog: Program, x: IntVar, y) -> IntVar:
+        def add1(prog: Program, x: IntVar, y) -> IntVar:
             return x + y
 
-        prog.set(y, add(prog, y, 3))
+        prog.set(y, add1(prog, y, 3))
+
+    with pytest.raises(ValueError):
+
+        @subroutine
+        def add2(prog: Program, x: IntVar, y: int) -> IntVar:
+            return x + y
+
+        prog.set(y, add2(prog, y, 3))
 
     expected = textwrap.dedent(
         """
@@ -1972,9 +1982,16 @@ def to_ast(self):
     obj = MyToAst()
     assert convert_float_to_duration(obj) is obj
 
+    with pytest.warns(DeprecationWarning):
+        make_duration(obj)
+
     with pytest.raises(TypeError):
         convert_float_to_duration("asdf")
 
+    b = BoolVar(True, "b")
+    with pytest.raises(TypeError):
+        convert_float_to_duration(b)
+
 
 def test_autoencal():
     port = PortVar("portname")