Cleanup tests

Author: jagot

test/bc_coeff_compositions.jl

@@ -86,20 +86,29 @@ end
     u = rand(22)
     @test (L + L2) * u ≈ convert(AbstractMatrix,L + L2) * u ≈ (BandedMatrix(L) + BandedMatrix(L2)) * u
 
-    # Test concretization
-    @test Array(A)[1] ≈ (Array(L)*Array(Q,N)[1], Array(L)*Array(Q,N)[2])[1]
-    @test Array(A)[2] ≈ (Array(L)*Array(Q,N)[1], Array(L)*Array(Q,N)[2])[2]
-    @test SparseMatrixCSC(A)[1] ≈ (SparseMatrixCSC(L)*SparseMatrixCSC(Q,N)[1], SparseMatrixCSC(L)*SparseMatrixCSC(Q,N)[2])[1]
-    @test SparseMatrixCSC(A)[2] ≈ (SparseMatrixCSC(L)*SparseMatrixCSC(Q,N)[1], SparseMatrixCSC(L)*SparseMatrixCSC(Q,N)[2])[2]
-    @test sparse(A)[1] ≈ (sparse(L)*sparse(Q,N)[1], sparse(L)*sparse(Q,N)[2])[1]
-    @test sparse(A)[2] ≈ (sparse(L)*sparse(Q,N)[1], sparse(L)*sparse(Q,N)[2])[2]
-    @test BandedMatrix(A)[1] ≈ (BandedMatrix(L)*BandedMatrix(Q,N)[1], BandedMatrix(L)*BandedMatrix(Q,N)[2])[1]
-    @test BandedMatrix(A)[2] ≈ (BandedMatrix(L)*BandedMatrix(Q,N)[1], BandedMatrix(L)*BandedMatrix(Q,N)[2])[2]
-
-    # Test that concretization works with multiplication
-    u = rand(20)
-    @test Array(A)[1]*u + Array(A)[2] ≈ L*(Q*u) ≈ A*u
-    @test sparse(A)[1]*u + sparse(A)[2] ≈ L*(Q*u) ≈ A*u
+    @testset "$mode concretization" for (mode,Mat) in [("Dense", Array),
+                                                       ("Sparse", SparseMatrixCSC),
+                                                       ("Best sparse", sparse),
+                                                       ("BandedMatrix", BandedMatrix)]
+        Am,Au = Mat(A)
+        Lm = Mat(L)
+        Qm,Qu = Mat(Q,N)
+
+        @test Am ≈ Lm*Qm
+        @test Au ≈ Lm*Qu
+    end
+    
+    @testset "$mode concrete multiplication" for (mode,Mat) in [("Dense", Array),
+                                                                ("Sparse", SparseMatrixCSC),
+                                                                ("Best sparse", sparse),
+                                                                ("BandedMatrix", BandedMatrix)]
+        u = rand(20)
+        Am,Au = Mat(A)
+        Lm = Mat(L)
+        Qm,Qu = Mat(Q,N)
+
+        @test Am*u + Au ≈ L*(Q*u) ≈ A*u
+    end
 end
 
 @testset "Test Left Division L2 (second order)" begin