Adjust test cases to match changes in the library

diff --git a/tests/matrix.cpp b/tests/matrix.cpp
index 6f578883e6d047d83ee245e000b9ce8b64f1ea2a..f11b068a46579883c876c6aee30484e355e7a491 100644 (file)
--- a/tests/matrix.cpp
+++ b/tests/matrix.cpp
@@ -1,6 +1,5 @@
 #include <limits>
 #include <msp/linal/matrix.h>
-#include <msp/linal/squarematrix.h>
 #include <msp/test/test.h>
 
 using namespace std;
@@ -9,10 +8,10 @@ using namespace Msp;
 class MatrixTests: public Test::RegisteredTest<MatrixTests>
 {
 private:
-       typedef LinAl::SquareMatrix<double, 2> Matrix2d;
+       typedef LinAl::Matrix<double, 2, 2> Matrix2d;
        typedef LinAl::Matrix<double, 3, 2> Matrix3x2d;
        typedef LinAl::Matrix<double, 2, 3> Matrix2x3d;
-       typedef LinAl::SquareMatrix<double, 3> Matrix3d;
+       typedef LinAl::Matrix<double, 3, 3> Matrix3d;
 
 public:
        MatrixTests();

diff --git a/tests/transformedshape.cpp b/tests/transformedshape.cpp
index 540e9b8baa60217497d61d76dd80d2a3ead44fc4..43f89c652656023eb52cb5bf5d8ff7abdcf76f57 100644 (file)
--- a/tests/transformedshape.cpp
+++ b/tests/transformedshape.cpp
@@ -22,7 +22,7 @@ TransformedShapeTests::TransformedShapeTests()
 
 void TransformedShapeTests::ray_intersection()
 {
-       Geometry::TransformedShape<double, 2> shape(Geometry::Rectangle<double>(2, 1), Geometry::AffineTransformation<double, 2>::rotation(Geometry::Angle<double>::from_degrees(45)));
+       Geometry::TransformedShape<double, 2> shape(Geometry::Rectangle<double>(2, 1), Geometry::AffineTransform<double, 2>::rotation(Geometry::Angle<double>::from_degrees(45)));
        Geometry::Ray<double, 2> ray(LinAl::Vector<double, 2>(3, 1.05), LinAl::Vector<double, 2>(-1, 0));
        EXPECT(shape.check_intersection(ray));
        ray = Geometry::Ray<double, 2>(LinAl::Vector<double, 2>(2.65, 3.35), LinAl::Vector<double, 2>(-1, -1));