reorganize tests

Author: mileslucas

Project.toml

@@ -20,5 +20,6 @@ Distances = "0.10"
 KeywordCalls = "0.2"
 RecipesBase = "1"
 SpecialFunctions = "0.10, 1"
+StableRNGs = "1"
 StaticArrays = "0.12, 1"
 julia = "1.5"

test/Project.toml

@@ -2,6 +2,7 @@
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 ChainRulesTestUtils = "cdddcdb0-9152-4a09-a978-84456f9df70a"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
+StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 

test/runtests.jl

@@ -2,9 +2,12 @@ using ChainRulesCore
 using ChainRulesTestUtils
 using PSFModels
 using PSFModels: Gaussian, Normal, AiryDisk, Moffat
+using StableRNGs
 using StaticArrays
 using Test
 
+rng = StableRNG(122)
+
 function test_model_interface(K)
     # test defaults
     m = @inferred K(fwhm=10)
@@ -70,69 +73,85 @@ function test_model_interface(K)
     @test m(m.pos) ≈ BigFloat(1)
 end
 
-function test_model_grads(K)
-
-end
-
-@testset "Model Interface - $K" for K in (Gaussian, AiryDisk, Moffat)
-    test_model_interface(K)
-end
-
 @testset "Gaussian" begin
-    m = Gaussian(fwhm=10)
-    expected = exp(-4 * log(2) * sum(abs2, SA[1, 2]) / 100)
-    @test m[2, 1] ≈ m(1, 2) ≈ expected
-    @test repr(m) == "Gaussian{Float64}(pos=[0, 0], fwhm=10, amp=1.0)"
+    test_model_interface(Gaussian)
+
+    @testset "isotropic" begin
+        m = Gaussian(fwhm=10)
+        expected = exp(-4 * log(2) * sum(abs2, SA[1, 2]) / 100)
+        @test m[2, 1] ≈ m(1, 2) ≈ expected
+        @test repr(m) == "Gaussian{Float64}(pos=[0, 0], fwhm=10, amp=1.0)"
+    end
 
-    m = Gaussian(fwhm=(10, 9))
-    wdist = (1/10)^2 + (2/9)^2
-    expected = exp(-4 * log(2) * wdist)
-    @test m[2, 1] ≈ m(1, 2) ≈ expected
-    @test repr(m) == "Gaussian{Float64}(pos=[0, 0], fwhm=(10, 9), amp=1.0)"
+    @testset "diagonal" begin
+        m = Gaussian(fwhm=(10, 9))
+        wdist = (1/10)^2 + (2/9)^2
+        expected = exp(-4 * log(2) * wdist)
+        @test m[2, 1] ≈ m(1, 2) ≈ expected
+        @test repr(m) == "Gaussian{Float64}(pos=[0, 0], fwhm=(10, 9), amp=1.0)"
+    end
 
     # test Normal alias
     @test Normal(fwhm=10) === Gaussian(fwhm=10)
+
+    @testset "gradients" begin
+        psf_iso = Gaussian(fwhm=10)
+        psf_tang = Tangent{Gaussian}(fwhm=rand(rng), pos=rand(rng, 2), amp=rand(rng), indices=ZeroTangent())
+    end
 end
 
 
 @testset "AiryDisk" begin
-    m = AiryDisk(fwhm=10)
-    radius = m.fwhm * 1.18677
-    # first radius is 0
-    @test m(radius, 0) ≈ 0 atol=eps(Float64)
-    @test m(-radius, 0) ≈ 0 atol=eps(Float64)
-    @test m(0, radius) ≈ 0 atol=eps(Float64)
-    @test m(0, -radius) ≈ 0 atol=eps(Float64)
-    @test repr(m) == "AiryDisk{Float64}(pos=[0, 0], fwhm=10, amp=1.0)"
-
-    m = AiryDisk(fwhm=(10, 9))
-    r1 = m.fwhm[1] * 1.18677
-    r2 = m.fwhm[2] * 1.18677
-    # first radius is 0
-    @test m(r1, 0) ≈ 0 atol=eps(Float64)
-    @test m(-r1, 0) ≈ 0 atol=eps(Float64)
-    @test m(0, r2) ≈ 0 atol=eps(Float64)
-    @test m(0, -r2) ≈ 0 atol=eps(Float64)
-    @test repr(m) == "AiryDisk{Float64}(pos=[0, 0], fwhm=(10, 9), amp=1.0)"
+    test_model_interface(AiryDisk)
+
+    @testset "isotropic" begin
+        m = AiryDisk(fwhm=10)
+        radius = m.fwhm * 1.18677
+        # first radius is 0
+        @test m(radius, 0) ≈ 0 atol=eps(Float64)
+        @test m(-radius, 0) ≈ 0 atol=eps(Float64)
+        @test m(0, radius) ≈ 0 atol=eps(Float64)
+        @test m(0, -radius) ≈ 0 atol=eps(Float64)
+        @test repr(m) == "AiryDisk{Float64}(pos=[0, 0], fwhm=10, amp=1.0)"
+    end
+
+    @testset "diagonal" begin
+        m = AiryDisk(fwhm=(10, 9))
+        r1 = m.fwhm[1] * 1.18677
+        r2 = m.fwhm[2] * 1.18677
+        # first radius is 0
+        @test m(r1, 0) ≈ 0 atol=eps(Float64)
+        @test m(-r1, 0) ≈ 0 atol=eps(Float64)
+        @test m(0, r2) ≈ 0 atol=eps(Float64)
+        @test m(0, -r2) ≈ 0 atol=eps(Float64)
+        @test repr(m) == "AiryDisk{Float64}(pos=[0, 0], fwhm=(10, 9), amp=1.0)"
+    end
 end
 
 @testset "Moffat" begin
-    m = Moffat(fwhm=10)
-    expected = inv(1 + sum(abs2, SA[1, 2]) / 25)
-    @test m[2, 1] ≈ m(1, 2) ≈ expected
-    @test repr(m) == "Moffat{Float64}(pos=[0, 0], fwhm=10, amp=1.0, alpha=1)"
-
-    m = Moffat(fwhm=(10, 9))
-    wdist = (1/5)^2 + (2/4.5)^2
-    expected = inv(1 + wdist)
-    @test m[2, 1] ≈ m(1, 2) ≈ expected
-    @test repr(m) == "Moffat{Float64}(pos=[0, 0], fwhm=(10, 9), amp=1.0, alpha=1)"
-
-    # different alpha
-    m = Moffat(fwhm=10, alpha=2)
-    expected = inv(1 + sum(abs2, SA[1, 2]) / 25)^2
-    @test m[2, 1] ≈ m(1, 2) ≈ expected
-    @test repr(m) == "Moffat{Float64}(pos=[0, 0], fwhm=10, amp=1.0, alpha=2)"
+    test_model_interface(Moffat)
+
+    @testset "isotropic" begin
+        m = Moffat(fwhm=10)
+        expected = inv(1 + sum(abs2, SA[1, 2]) / 25)
+        @test m[2, 1] ≈ m(1, 2) ≈ expected
+        @test repr(m) == "Moffat{Float64}(pos=[0, 0], fwhm=10, amp=1.0, alpha=1)"
+    end
+
+    @testset "diagonal" begin
+        m = Moffat(fwhm=(10, 9))
+        wdist = (1/5)^2 + (2/4.5)^2
+        expected = inv(1 + wdist)
+        @test m[2, 1] ≈ m(1, 2) ≈ expected
+        @test repr(m) == "Moffat{Float64}(pos=[0, 0], fwhm=(10, 9), amp=1.0, alpha=1)"
+    end
+
+    @testset "alpha" begin
+        m = Moffat(fwhm=10, alpha=2)
+        expected = inv(1 + sum(abs2, SA[1, 2]) / 25)^2
+        @test m[2, 1] ≈ m(1, 2) ≈ expected
+        @test repr(m) == "Moffat{Float64}(pos=[0, 0], fwhm=10, amp=1.0, alpha=2)"
+    end
 end
 
 include("plotting.jl")