Cleanup tests

Author: jagot

Project.toml

@@ -22,6 +22,7 @@ ModelingToolkit = "0.8.0"
 julia = "1"
 
 [extras]
+Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
 OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -30,4 +31,4 @@ SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["FillArrays", "OrdinaryDiffEq", "Random", "SafeTestsets", "SpecialFunctions", "Test"]
+test = ["Compat", "FillArrays", "OrdinaryDiffEq", "Random", "SafeTestsets", "SpecialFunctions", "Test"]

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