Update tests to reflect new package structure

Author: rsdc2

tests/utilities/categories/test_monoid.py

@@ -10,8 +10,8 @@
 init_qsharp()
 
 def monoid_reduce_matrix_code(matrices: list[list[list[float]]]) -> str:
-    return (f"import Utilities.Matrices.Constructors.*;"
-            f"import Utilities.Matrices.Identity.*;"
+    return (f"import Matrices.Constructors.*;"
+            f"import Matrices.Identity.*;"
               f"MonoidReduceMatrix(2)({matrices});")
 
 

tests/utilities/matrices/test_identity.py

@@ -1,18 +1,17 @@
-import qsharp # type: ignore
+import qsharp 
 import pytest
-import numpy as np
 
 from .test_multiply import matrix_dot_product_code
 from ..setup import init_qsharp
 
 init_qsharp()
 
 id2x2 = [[1., 0.],
-             [0., 1.]]
+         [0., 1.]]
 
 
 def test_2x2_identity():
-    qscode = ("import Utilities.Matrices.Identity.*;"
+    qscode = ("import Matrices.Identity.*;"
               "Id2x2()")
 
     result = qsharp.eval(qscode)
@@ -21,7 +20,7 @@ def test_2x2_identity():
 
 
 def test_create_identity():
-    qscode = (("import Utilities.Matrices.Identity.*;"
+    qscode = (("import Matrices.Identity.*;"
               "IdentityMatrix(2)"))
 
     result = qsharp.eval(qscode)

tests/utilities/matrices/test_invert.py

@@ -20,8 +20,8 @@
      [3., 4.]]
 ])
 def test_apply_2x2_identity_happy(matrix: list[list[float]]):
-    qscode = ("import Utilities.Matrices.Invert.*;"
-              "import Utilities.Matrices.Multiply.*;"
+    qscode = ("import Matrices.Invert.*;"
+              "import Matrices.Multiply.*;"
               f"MatMul(Invert2x2D({matrix}), {matrix});")
 
     result = qsharp.eval(qscode)

tests/utilities/matrices/test_multiply.py

@@ -7,8 +7,8 @@
 init_qsharp()
 
 def matrix_dot_product_code(m1: list[list[float]], m2: list[list[float]]) -> str:
-    return (f"import Utilities.Matrices.*;"
-              "import Utilities.Matrices.Multiply.*;"
+    return (f"import Matrices.*;"
+              "import Matrices.Multiply.*;"
               f"DotProdMat({m1}, {m2});")
 
 @pytest.mark.parametrize(("m1", "m2"), [

tests/utilities/matrices/test_properties.py

@@ -11,7 +11,7 @@
       [1., 2., 3.]], (2, 3))
 ])
 def test_shape(m: list[list[float]], shape: tuple[int, int]):
-    qscode = ("import Utilities.Matrices.Properties.*;"
+    qscode = ("import Matrices.Properties.*;"
               f"Shape({m})")
 
     result = qsharp.eval(qscode)

tests/utilities/test_complex.py

@@ -6,7 +6,7 @@
 def test_complex_equal_happy():
     # Arrange
     qscode = ("import Std.Math.*;"
-             "import Utilities.Complex.*;"
+             "import Complex.*;"
              "EqualC(Complex(1., 0.), Complex(1., 0.));")
 
     # Act
@@ -19,7 +19,7 @@ def test_complex_equal_happy():
 def test_complex_equal_sad():
     # Arrange
     qscode = ("import Std.Math.*;"
-             "import Utilities.Complex.*;"
+             "import Complex.*;"
              "EqualC(Complex(1., 0.), Complex(1., 1.));")
 
     # Act
@@ -31,7 +31,7 @@ def test_complex_equal_sad():
 
 def test_to_complex():
     # Arrange
-    qscode = ("import Utilities.Complex.*;"
+    qscode = ("import Complex.*;"
               "ToC(1.3)")
 
     # Act

tests/utilities/test_vectors.py

@@ -6,8 +6,8 @@
 def test_vectors_equal():
 
     # Arrange
-    qscode = ("import Utilities.Complex.*;"
-              "import Utilities.Vectors.*;"
+    qscode = ("import Complex.*;"
+              "import Vectors.*;"
               "let vector = [ToC(1.), ToC(2.)];"
               "ScalarMulVecC(ToC(2.), vector);")
     # Act