From 25719987ef26507d18d716eaae91c0e6f8a3fcee Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bayle <j2b.bayle@gmail.com>
Date: Thu, 14 Apr 2022 10:50:38 +0200
Subject: [PATCH] Rename `_consistent_locking_beatnotes`
---
tests/test_fplan.py | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/tests/test_fplan.py b/tests/test_fplan.py
index 7c6bc0a..93e2d1d 100755
--- a/tests/test_fplan.py
+++ b/tests/test_fplan.py
@@ -10,7 +10,7 @@ from scipy.interpolate import interp1d
from lisainstrument import Instrument
-def _valid_locking_beatnotes(instru, fplan=None):
+def _consistent_locking_beatnotes(instru, fplan=None):
"""Check that TPS locking beatnotes are consistent with ``fplan``.
We check that locking beatnotes are equal up to machine precision.
@@ -92,13 +92,13 @@ def test_static_fplan():
# Check locking beatnotes
instru = Instrument(size=100, lock='N1-12', fplan='static')
instru.simulate()
- assert _valid_locking_beatnotes(instru, static)
+ assert _consistent_locking_beatnotes(instru, static)
instru = Instrument(size=100, lock='N1-21', fplan='static')
instru.simulate()
- assert _valid_locking_beatnotes(instru, static)
+ assert _consistent_locking_beatnotes(instru, static)
instru = Instrument(size=100, lock='N4-12', fplan='static')
instru.simulate()
- assert _valid_locking_beatnotes(instru, static)
+ assert _consistent_locking_beatnotes(instru, static)
def test_static_fplan_valid_with_all_lock_configs():
"""Check that 'static' fplan is valid for all lock configs.
@@ -142,13 +142,13 @@ def test_constant_unequal_fplan():
# Check locking beatnotes
instru = Instrument(size=100, lock='N1-12', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
instru = Instrument(size=100, lock='N1-21', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
instru = Instrument(size=100, lock='N4-12', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
def test_varying_equal_fplan():
"""Test a user-defined time-varying equal fplan."""
@@ -163,13 +163,13 @@ def test_varying_equal_fplan():
fplan = {mosa: fplan for mosa in Instrument.MOSAS}
instru = Instrument(size=100, lock='N1-12', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
instru = Instrument(size=100, lock='N1-21', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
instru = Instrument(size=100, lock='N4-12', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
def test_varying_unequal_fplan():
"""Test a user-defined time-varying unequal fplan."""
@@ -186,13 +186,13 @@ def test_varying_unequal_fplan():
# Check locking beatnotes
instru = Instrument(size=100, lock='N1-12', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
instru = Instrument(size=100, lock='N1-21', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
instru = Instrument(size=100, lock='N4-12', fplan=fplan)
instru.simulate()
- assert _valid_locking_beatnotes(instru, fplan)
+ assert _consistent_locking_beatnotes(instru, fplan)
def test_keplerian_fplan_1_1():
"""Test standard Keplerian fplan file v1.1."""
@@ -215,13 +215,13 @@ def test_keplerian_fplan_1_1():
# Check locking beatnotes
instru = Instrument(size=100, lock='N1-12', fplan='tests/keplerian-fplan-1-1.h5')
instru.simulate()
- assert _valid_locking_beatnotes(instru)
+ assert _consistent_locking_beatnotes(instru)
instru = Instrument(size=100, lock='N1-21', fplan='tests/keplerian-fplan-1-1.h5')
instru.simulate()
- assert _valid_locking_beatnotes(instru)
+ assert _consistent_locking_beatnotes(instru)
instru = Instrument(size=100, lock='N4-12', fplan='tests/keplerian-fplan-1-1.h5')
instru.simulate()
- assert _valid_locking_beatnotes(instru)
+ assert _consistent_locking_beatnotes(instru)
def test_esa_trailing_fplan_1_1():
"""Test standard ESA trailing fplan file v1.1."""
@@ -244,10 +244,10 @@ def test_esa_trailing_fplan_1_1():
# Check locking beatnotes
instru = Instrument(size=100, lock='N1-12', fplan='tests/esa-trailing-fplan-1-1.h5')
instru.simulate()
- assert _valid_locking_beatnotes(instru)
+ assert _consistent_locking_beatnotes(instru)
instru = Instrument(size=100, lock='N1-21', fplan='tests/esa-trailing-fplan-1-1.h5')
instru.simulate()
- assert _valid_locking_beatnotes(instru)
+ assert _consistent_locking_beatnotes(instru)
instru = Instrument(size=100, lock='N4-12', fplan='tests/esa-trailing-fplan-1-1.h5')
instru.simulate()
- assert _valid_locking_beatnotes(instru)
+ assert _consistent_locking_beatnotes(instru)
--
GitLab