1 files changed, 33 insertions, 13 deletions
diff --git a/src/tests/matrix_test_ops.rs b/src/tests/matrix_test_ops.rs
index 2737ac4..6933ac2 100644
--- a/src/tests/matrix_test_ops.rs
+++ b/src/tests/matrix_test_ops.rs
@@ -13,14 +13,35 @@ struct TestCase {
     test_type: TestCaseType,
     test_data: Vec<Matrix>,
 }
+fn build_mul_test_cases() -> Vec<TestCase> {
+    let mut v = vec![];
+    let from_strs = vec![
+        "1,2\n1,2",
+        "1,3\n2,4",
+        "5,11\n5,11",
+        "1,2\n3,4",
+        "1\n2",
+        "5\n11",
+    ];
+    let mut i = 0;
+    while i < from_strs.len() {
+        let m1 = Matrix::from_str(from_strs[i]).unwrap();
+        let m2 = Matrix::from_str(from_strs[i + 1]).unwrap();
+        let re = Matrix::from_str(from_strs[i + 2]).unwrap();
+        v.push(TestCase {
+            test_type: TestCaseType::Mul,
+            test_data: vec![m1, m2, re],
+        });
+        i += 3;
+    }
+    v
+}
 fn build_add_test_cases() -> Vec<TestCase> {
     let mut v = vec![];
     let from_strs = vec![
         "1,2,3\n4,5,6\n7,8,9",
         "1,1,1\n1,1,1\n1,1,1",
         "2,3,4\n5,6,7\n8,9,10",
-
-
         "1,1,1\n1,1,1\n1,1,1",
         "0,0,0\n0,0,0\n0,0,0",
         "1,1,1\n1,1,1\n1,1,1",
@@ -28,8 +49,8 @@ fn build_add_test_cases() -> Vec<TestCase> {
     let mut i = 0;
     while i < from_strs.len() {
         let m1 = Matrix::from_str(from_strs[i]).unwrap();
-        let m2 = Matrix::from_str(from_strs[i+1]).unwrap();
-        let mr = Matrix::from_str(from_strs[i+2]).unwrap();
+        let m2 = Matrix::from_str(from_strs[i + 1]).unwrap();
+        let mr = Matrix::from_str(from_strs[i + 2]).unwrap();
         v.push(TestCase {
             test_type: TestCaseType::Add,
             test_data: vec![m1, m2, mr],
@@ -55,7 +76,11 @@ pub fn test_matrix_determinate() -> Result<(), ParseMatrixError> {
 }
 #[test]
 pub fn test_matrix_inverse_on_singular() -> Result<(), ()> {
-    let m = Matrix::new(vec![vec![1.0,2.0,3.0], vec![4.0,5.0,6.0], vec![7.0,8.0,9.0]]);
+    let m = Matrix::new(vec![
+        vec![1.0, 2.0, 3.0],
+        vec![4.0, 5.0, 6.0],
+        vec![7.0, 8.0, 9.0],
+    ]);
     match m.inverse() {
         Some(_inverse) => Err(()),
         None => Ok(()),
@@ -70,14 +95,9 @@ pub fn test_matrix_transpose() -> Result<(), ParseMatrixError> {
 }
 #[test]
 pub fn test_matrix_mul() -> Result<(), ParseMatrixError> {
-    let m1 = Matrix::from_str("1,2\n1,2")?;
-    let m2 = Matrix::from_str("1,3\n2,4")?;
-    let m3 = Matrix::from_str("1,2\n3,4")?;
-    let m4 = Matrix::from_str("1\n2")?;
-    let t1 = Matrix::from_str("5,11\n5,11")?;
-    let t2 = Matrix::from_str("5\n11")?;
-    assert_eq!(&m1 * &m2, t1);
-    assert_eq!(&m3 * &m4, t2);
+    for case in build_mul_test_cases() {
+        assert_eq!(&case.test_data[0] * &case.test_data[1], case.test_data[2]);
+    }
     Ok(())
 }
 #[test]