Расширить общие API графиков и GAS обмена

python/tests/test_spectrum.py

@@ -35,6 +35,9 @@ class SpectrumTests(unittest.TestCase):
                 peak = max(range(len(result.amplitudes)), key=result.amplitudes.__getitem__)
                 self.assertEqual(64, result.frequencies[peak])
                 self.assertAlmostEqual(3.25, result.amplitudes[peak], places=9)
+                detected = self.core.dominant_peak(result)
+                self.assertAlmostEqual(64, detected.frequency_hz, places=9)
+                self.assertAlmostEqual(3.25, detected.amplitude, places=9)
 
     def test_dc_and_nyquist_are_not_doubled(self):
         times, _ = self.sample()

python/tests/test_trends.py

@@ -57,7 +57,6 @@ class TrendTests(unittest.TestCase):
         for value in ("-1", "+1", "FF", "0x", "1.0", "256"):
             with self.assertRaises(ValueError):
                 parse_address(value, 255)
-        self.assertEqual(-2.0, TrendSignal("s", valueType="INT16").word_value(65534))
 
     def test_bounded_history(self):
         history = TrendHistory()
@@ -81,6 +80,13 @@ class TrendTests(unittest.TestCase):
         self.assertIsNone(core.can_value(signal, frame_id ^ 0x08000000, 1, data))
         raw = replace(signal, source="CAN_RAW", address="0x321", extended=False, byteOffset=2)
         self.assertEqual(-2.0, core.can_value(raw, 0x321, 0, data))
+        self.assertEqual(-2.0, core.word_value(TrendSignal("s", valueType="INT16"), 65534))
+        self.assertEqual(bytes([232, 3, 2, 0, 52, 18, 255, 255]),
+                         core.watch_request(1000, [0x1234, 0xFFFF]))
+        core.validate_watch_ack(bytes([232, 3, 2, 0]), 1000, 2)
+        timestamp, words = core.watch_values(bytes([1, 2, 3, 4, 2, 0, 52, 18, 255, 255]), 2)
+        self.assertEqual(0x04030201, timestamp)
+        self.assertEqual([0x1234, 0xFFFF], words)
 
 
 if __name__ == "__main__":