Skip to content

Commit 6b475f7

Browse files
alexhroomalexhroom
committed
updated tests
1 parent 24eca53 commit 6b475f7

File tree

3 files changed

+168
-5
lines changed

3 files changed

+168
-5
lines changed

‎tests/conftest.py‎

Lines changed: 165 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,7 @@ def reflectivity_calculation_output_results():
417417
],
418418
),
419419
]
420-
results.backgrounds = (
421-
[
420+
results.backgrounds = [
422421
np.array(
423422
[
424423
[1.1403e-02, 2.2300e-06, 0.0000e00],
@@ -591,8 +590,7 @@ def reflectivity_calculation_output_results():
591590
[5.9342e-01, 3.3800e-06, 0.0000e00],
592591
]
593592
),
594-
],
595-
)
593+
]
596594
results.layerSlds = [
597595
[
598596
np.array(
@@ -3538,6 +3536,169 @@ def dream_results():
35383536
],
35393537
),
35403538
],
3539+
backgrounds=[np.array([[1.14030000e-02, 2.26745452e-06, 0.00000000e+00],
3540+
[1.19730000e-02, 2.26745452e-06, 0.00000000e+00],
3541+
[1.25720000e-02, 2.26745452e-06, 0.00000000e+00],
3542+
[1.32010000e-02, 2.26745452e-06, 0.00000000e+00],
3543+
[1.38610000e-02, 2.26745452e-06, 0.00000000e+00],
3544+
[1.45540000e-02, 2.26745452e-06, 0.00000000e+00],
3545+
[1.52810000e-02, 2.26745452e-06, 0.00000000e+00],
3546+
[1.60450000e-02, 2.26745452e-06, 0.00000000e+00],
3547+
[1.68480000e-02, 2.26745452e-06, 0.00000000e+00],
3548+
[1.76900000e-02, 2.26745452e-06, 0.00000000e+00],
3549+
[1.85750000e-02, 2.26745452e-06, 0.00000000e+00],
3550+
[1.95030000e-02, 2.26745452e-06, 0.00000000e+00],
3551+
[2.04790000e-02, 2.26745452e-06, 0.00000000e+00],
3552+
[2.15020000e-02, 2.26745452e-06, 0.00000000e+00],
3553+
[2.25780000e-02, 2.26745452e-06, 0.00000000e+00],
3554+
[2.37060000e-02, 2.26745452e-06, 0.00000000e+00],
3555+
[2.48920000e-02, 2.26745452e-06, 0.00000000e+00],
3556+
[2.61360000e-02, 2.26745452e-06, 0.00000000e+00],
3557+
[2.74430000e-02, 2.26745452e-06, 0.00000000e+00],
3558+
[2.88150000e-02, 2.26745452e-06, 0.00000000e+00],
3559+
[3.02560000e-02, 2.26745452e-06, 0.00000000e+00],
3560+
[3.17690000e-02, 2.26745452e-06, 0.00000000e+00],
3561+
[3.33570000e-02, 2.26745452e-06, 0.00000000e+00],
3562+
[3.50250000e-02, 2.26745452e-06, 0.00000000e+00],
3563+
[3.67770000e-02, 2.26745452e-06, 0.00000000e+00],
3564+
[3.86150000e-02, 2.26745452e-06, 0.00000000e+00],
3565+
[4.05460000e-02, 2.26745452e-06, 0.00000000e+00],
3566+
[4.25730000e-02, 2.26745452e-06, 0.00000000e+00],
3567+
[4.47020000e-02, 2.26745452e-06, 0.00000000e+00],
3568+
[4.69370000e-02, 2.26745452e-06, 0.00000000e+00],
3569+
[4.92840000e-02, 2.26745452e-06, 0.00000000e+00],
3570+
[5.17480000e-02, 2.26745452e-06, 0.00000000e+00],
3571+
[5.43360000e-02, 2.26745452e-06, 0.00000000e+00],
3572+
[5.70520000e-02, 2.26745452e-06, 0.00000000e+00],
3573+
[5.99050000e-02, 2.26745452e-06, 0.00000000e+00],
3574+
[6.29000000e-02, 2.26745452e-06, 0.00000000e+00],
3575+
[6.60450000e-02, 2.26745452e-06, 0.00000000e+00],
3576+
[6.93480000e-02, 2.26745452e-06, 0.00000000e+00],
3577+
[7.28150000e-02, 2.26745452e-06, 0.00000000e+00],
3578+
[7.64560000e-02, 2.26745452e-06, 0.00000000e+00],
3579+
[8.02790000e-02, 2.26745452e-06, 0.00000000e+00],
3580+
[8.42920000e-02, 2.26745452e-06, 0.00000000e+00],
3581+
[8.85070000e-02, 2.26745452e-06, 0.00000000e+00],
3582+
[9.29320000e-02, 2.26745452e-06, 0.00000000e+00],
3583+
[9.75790000e-02, 2.26745452e-06, 0.00000000e+00],
3584+
[1.02460000e-01, 2.26745452e-06, 0.00000000e+00],
3585+
[1.07580000e-01, 2.26745452e-06, 0.00000000e+00],
3586+
[1.12960000e-01, 2.26745452e-06, 0.00000000e+00],
3587+
[1.18610000e-01, 2.26745452e-06, 0.00000000e+00],
3588+
[1.24540000e-01, 2.26745452e-06, 0.00000000e+00],
3589+
[1.30770000e-01, 2.26745452e-06, 0.00000000e+00],
3590+
[1.37300000e-01, 2.26745452e-06, 0.00000000e+00],
3591+
[1.44170000e-01, 2.26745452e-06, 0.00000000e+00],
3592+
[1.51380000e-01, 2.26745452e-06, 0.00000000e+00],
3593+
[1.58950000e-01, 2.26745452e-06, 0.00000000e+00],
3594+
[1.66890000e-01, 2.26745452e-06, 0.00000000e+00],
3595+
[1.75240000e-01, 2.26745452e-06, 0.00000000e+00],
3596+
[1.84000000e-01, 2.26745452e-06, 0.00000000e+00],
3597+
[1.93200000e-01, 2.26745452e-06, 0.00000000e+00],
3598+
[2.02860000e-01, 2.26745452e-06, 0.00000000e+00],
3599+
[2.13000000e-01, 2.26745452e-06, 0.00000000e+00],
3600+
[2.23650000e-01, 2.26745452e-06, 0.00000000e+00],
3601+
[2.34840000e-01, 2.26745452e-06, 0.00000000e+00],
3602+
[2.46580000e-01, 2.26745452e-06, 0.00000000e+00],
3603+
[2.58910000e-01, 2.26745452e-06, 0.00000000e+00],
3604+
[2.71850000e-01, 2.26745452e-06, 0.00000000e+00],
3605+
[2.85440000e-01, 2.26745452e-06, 0.00000000e+00],
3606+
[2.99720000e-01, 2.26745452e-06, 0.00000000e+00],
3607+
[3.14700000e-01, 2.26745452e-06, 0.00000000e+00],
3608+
[3.30440000e-01, 2.26745452e-06, 0.00000000e+00],
3609+
[3.46960000e-01, 2.26745452e-06, 0.00000000e+00],
3610+
[3.64310000e-01, 2.26745452e-06, 0.00000000e+00],
3611+
[3.82520000e-01, 2.26745452e-06, 0.00000000e+00],
3612+
[4.01650000e-01, 2.26745452e-06, 0.00000000e+00],
3613+
[4.21730000e-01, 2.26745452e-06, 0.00000000e+00],
3614+
[4.42820000e-01, 2.26745452e-06, 0.00000000e+00],
3615+
[4.64960000e-01, 2.26745452e-06, 0.00000000e+00],
3616+
[4.88210000e-01, 2.26745452e-06, 0.00000000e+00],
3617+
[5.12620000e-01, 2.26745452e-06, 0.00000000e+00],
3618+
[5.38250000e-01, 2.26745452e-06, 0.00000000e+00],
3619+
[5.65160000e-01, 2.26745452e-06, 0.00000000e+00],
3620+
[5.93420000e-01, 2.26745452e-06, 0.00000000e+00]]), np.array([[1.1403000e-02, 2.0963874e-06, 0.0000000e+00],
3621+
[1.1973000e-02, 2.0963874e-06, 0.0000000e+00],
3622+
[1.2572000e-02, 2.0963874e-06, 0.0000000e+00],
3623+
[1.3201000e-02, 2.0963874e-06, 0.0000000e+00],
3624+
[1.3861000e-02, 2.0963874e-06, 0.0000000e+00],
3625+
[1.4554000e-02, 2.0963874e-06, 0.0000000e+00],
3626+
[1.5281000e-02, 2.0963874e-06, 0.0000000e+00],
3627+
[1.6045000e-02, 2.0963874e-06, 0.0000000e+00],
3628+
[1.6848000e-02, 2.0963874e-06, 0.0000000e+00],
3629+
[1.7690000e-02, 2.0963874e-06, 0.0000000e+00],
3630+
[1.8575000e-02, 2.0963874e-06, 0.0000000e+00],
3631+
[1.9503000e-02, 2.0963874e-06, 0.0000000e+00],
3632+
[2.0479000e-02, 2.0963874e-06, 0.0000000e+00],
3633+
[2.1502000e-02, 2.0963874e-06, 0.0000000e+00],
3634+
[2.2578000e-02, 2.0963874e-06, 0.0000000e+00],
3635+
[2.3706000e-02, 2.0963874e-06, 0.0000000e+00],
3636+
[2.4892000e-02, 2.0963874e-06, 0.0000000e+00],
3637+
[2.6136000e-02, 2.0963874e-06, 0.0000000e+00],
3638+
[2.7443000e-02, 2.0963874e-06, 0.0000000e+00],
3639+
[2.8815000e-02, 2.0963874e-06, 0.0000000e+00],
3640+
[3.0256000e-02, 2.0963874e-06, 0.0000000e+00],
3641+
[3.1769000e-02, 2.0963874e-06, 0.0000000e+00],
3642+
[3.3357000e-02, 2.0963874e-06, 0.0000000e+00],
3643+
[3.5025000e-02, 2.0963874e-06, 0.0000000e+00],
3644+
[3.6777000e-02, 2.0963874e-06, 0.0000000e+00],
3645+
[3.8615000e-02, 2.0963874e-06, 0.0000000e+00],
3646+
[4.0546000e-02, 2.0963874e-06, 0.0000000e+00],
3647+
[4.2573000e-02, 2.0963874e-06, 0.0000000e+00],
3648+
[4.4702000e-02, 2.0963874e-06, 0.0000000e+00],
3649+
[4.6937000e-02, 2.0963874e-06, 0.0000000e+00],
3650+
[4.9284000e-02, 2.0963874e-06, 0.0000000e+00],
3651+
[5.1748000e-02, 2.0963874e-06, 0.0000000e+00],
3652+
[5.4336000e-02, 2.0963874e-06, 0.0000000e+00],
3653+
[5.7052000e-02, 2.0963874e-06, 0.0000000e+00],
3654+
[5.9905000e-02, 2.0963874e-06, 0.0000000e+00],
3655+
[6.2900000e-02, 2.0963874e-06, 0.0000000e+00],
3656+
[6.6045000e-02, 2.0963874e-06, 0.0000000e+00],
3657+
[6.9348000e-02, 2.0963874e-06, 0.0000000e+00],
3658+
[7.2815000e-02, 2.0963874e-06, 0.0000000e+00],
3659+
[7.6456000e-02, 2.0963874e-06, 0.0000000e+00],
3660+
[8.0279000e-02, 2.0963874e-06, 0.0000000e+00],
3661+
[8.4292000e-02, 2.0963874e-06, 0.0000000e+00],
3662+
[8.8507000e-02, 2.0963874e-06, 0.0000000e+00],
3663+
[9.2932000e-02, 2.0963874e-06, 0.0000000e+00],
3664+
[9.7579000e-02, 2.0963874e-06, 0.0000000e+00],
3665+
[1.0246000e-01, 2.0963874e-06, 0.0000000e+00],
3666+
[1.0758000e-01, 2.0963874e-06, 0.0000000e+00],
3667+
[1.1296000e-01, 2.0963874e-06, 0.0000000e+00],
3668+
[1.1861000e-01, 2.0963874e-06, 0.0000000e+00],
3669+
[1.2454000e-01, 2.0963874e-06, 0.0000000e+00],
3670+
[1.3077000e-01, 2.0963874e-06, 0.0000000e+00],
3671+
[1.3730000e-01, 2.0963874e-06, 0.0000000e+00],
3672+
[1.4417000e-01, 2.0963874e-06, 0.0000000e+00],
3673+
[1.5138000e-01, 2.0963874e-06, 0.0000000e+00],
3674+
[1.5895000e-01, 2.0963874e-06, 0.0000000e+00],
3675+
[1.6689000e-01, 2.0963874e-06, 0.0000000e+00],
3676+
[1.7524000e-01, 2.0963874e-06, 0.0000000e+00],
3677+
[1.8400000e-01, 2.0963874e-06, 0.0000000e+00],
3678+
[1.9320000e-01, 2.0963874e-06, 0.0000000e+00],
3679+
[2.0286000e-01, 2.0963874e-06, 0.0000000e+00],
3680+
[2.1300000e-01, 2.0963874e-06, 0.0000000e+00],
3681+
[2.2365000e-01, 2.0963874e-06, 0.0000000e+00],
3682+
[2.3484000e-01, 2.0963874e-06, 0.0000000e+00],
3683+
[2.4658000e-01, 2.0963874e-06, 0.0000000e+00],
3684+
[2.5891000e-01, 2.0963874e-06, 0.0000000e+00],
3685+
[2.7185000e-01, 2.0963874e-06, 0.0000000e+00],
3686+
[2.8544000e-01, 2.0963874e-06, 0.0000000e+00],
3687+
[2.9972000e-01, 2.0963874e-06, 0.0000000e+00],
3688+
[3.1470000e-01, 2.0963874e-06, 0.0000000e+00],
3689+
[3.3044000e-01, 2.0963874e-06, 0.0000000e+00],
3690+
[3.4696000e-01, 2.0963874e-06, 0.0000000e+00],
3691+
[3.6431000e-01, 2.0963874e-06, 0.0000000e+00],
3692+
[3.8252000e-01, 2.0963874e-06, 0.0000000e+00],
3693+
[4.0165000e-01, 2.0963874e-06, 0.0000000e+00],
3694+
[4.2173000e-01, 2.0963874e-06, 0.0000000e+00],
3695+
[4.4282000e-01, 2.0963874e-06, 0.0000000e+00],
3696+
[4.6496000e-01, 2.0963874e-06, 0.0000000e+00],
3697+
[4.8821000e-01, 2.0963874e-06, 0.0000000e+00],
3698+
[5.1262000e-01, 2.0963874e-06, 0.0000000e+00],
3699+
[5.3825000e-01, 2.0963874e-06, 0.0000000e+00],
3700+
[5.6516000e-01, 2.0963874e-06, 0.0000000e+00],
3701+
[5.9342000e-01, 2.0963874e-06, 0.0000000e+00]])],
35413702
layerSlds=[
35423703
[
35433704
np.array(

‎tests/test_models.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ def test_contrast_bad_ratio():
333333
):
334334
RATapi.models.Contrast(name="My Contrast", domain_ratio="bad ratio")
335335

336-
336+
@pytest.mark.skip("Type change is not currently supported")
337337
@pytest.mark.parametrize("model", [RATapi.models.Background, RATapi.models.Resolution])
338338
def test_type_change_clear(model):
339339
"""If the type of a background or resolution is changed, it should wipe the other fields."""

‎tests/test_outputs.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def reflectivity_calculation_str():
2222
"reflectivity = [Data array: [21 x 2], Data array: [21 x 2]],\n"
2323
"simulation = [Data array: [21 x 2], Data array: [21 x 2]],\n"
2424
"shiftedData = [Data array: [21 x 3], Data array: [21 x 3]],\n"
25+
"backgrounds = [Data array: [82 x 3], Data array: [82 x 3]],\n"
2526
"layerSlds = [[Data array: [8 x 3]], [Data array: [8 x 3]]],\n"
2627
"sldProfiles = [[Data array: [25 x 2], Data array: [25 x 2]]],\n"
2728
"resampledLayers = [[Data array: [1 x 3]], [Data array: [1 x 3]]],\n"
@@ -56,6 +57,7 @@ def dream_str():
5657
"reflectivity = [Data array: [21 x 2], Data array: [21 x 2]],\n"
5758
"simulation = [Data array: [21 x 2], Data array: [21 x 2]],\n"
5859
"shiftedData = [Data array: [21 x 3], Data array: [21 x 3]],\n"
60+
"backgrounds = [Data array: [82 x 3], Data array: [82 x 3]],\n"
5961
"layerSlds = [[Data array: [8 x 3]], [Data array: [8 x 3]]],\n"
6062
"sldProfiles = [[Data array: [29 x 2], Data array: [29 x 2]]],\n"
6163
"resampledLayers = [[Data array: [1 x 3]], [Data array: [1 x 3]]],\n"

0 commit comments

Comments
 (0)