simplify wav tests

Author: Teque5

tests/test_convert_wav.py

@@ -67,30 +67,36 @@ def test_wav_to_sigmf_pair(self):
         """test standard wav to sigmf conversion with file pairs"""
         sigmf_path = self.tmp_path / "bar.tmp"
         meta = wav_to_sigmf(wav_path=str(self.wav_path), out_path=str(sigmf_path))
+        filenames = sigmf.sigmffile.get_sigmf_filenames(sigmf_path)
+        self.assertTrue(filenames["data_fn"].exists(), "dataset path missing")
+        self.assertTrue(filenames["meta_fn"].exists(), "metadata path missing")
+        # verify data
         data = meta.read_samples()
         self.assertGreater(len(data), 0, "Should read some samples")
         # allow numerical differences due to PCM quantization
         self.assertTrue(np.allclose(self.audio_data, data, atol=1e-4))
-        filenames = sigmf.sigmffile.get_sigmf_filenames(sigmf_path)
-        self.assertTrue(filenames["data_fn"].exists(), "dataset path missing")
-        self.assertTrue(filenames["meta_fn"].exists(), "metadata path missing")
 
     def test_wav_to_sigmf_archive(self):
         """test wav to sigmf conversion with archive output"""
         sigmf_path = self.tmp_path / "baz.ext"
-        wav_to_sigmf(wav_path=str(self.wav_path), out_path=str(sigmf_path), create_archive=True)
+        meta = wav_to_sigmf(wav_path=str(self.wav_path), out_path=str(sigmf_path), create_archive=True)
         filenames = sigmf.sigmffile.get_sigmf_filenames(sigmf_path)
         self.assertTrue(filenames["archive_fn"].exists(), "archive path missing")
+        # verify data
+        data = meta.read_samples()
+        self.assertGreater(len(data), 0, "Should read some samples")
+        # allow numerical differences due to PCM quantization
+        self.assertTrue(np.allclose(self.audio_data, data, atol=1e-4))
 
     def test_wav_to_sigmf_ncd(self):
         """test wav to sigmf conversion as Non-Conforming Dataset"""
         meta = wav_to_sigmf(wav_path=str(self.wav_path), create_ncd=True)
         _validate_ncd(self, meta, self.wav_path)
 
-        # verify data can still be read correctly from NCD
+        # verify data
         data = meta.read_samples()
-        self.assertGreater(len(data), 0, "Should read some samples")
         # allow numerical differences due to PCM quantization
+        self.assertGreater(len(data), 0, "Should read some samples")
         self.assertTrue(np.allclose(self.audio_data, data, atol=1e-4))