Skip to content

Commit cfd4c2e

Browse files
authored
Use mock instead of generate in tests (#4587)
1 parent 38fef5a commit cfd4c2e

5 files changed

Lines changed: 27 additions & 28 deletions

File tree

src/spikeinterface/core/tests/test_binaryrecordingextractor.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
import numpy as np
33
from pathlib import Path
44

5-
from spikeinterface.core import BinaryRecordingExtractor
5+
from spikeinterface.core import BinaryRecordingExtractor, MockRecording
66
from spikeinterface.core.numpyextractors import NumpyRecording
77
from spikeinterface.core.core_tools import measure_memory_allocation
8-
from spikeinterface.core.generate import NoiseGeneratorRecording
98

109

1110
def test_BinaryRecordingExtractor(create_cache_folder):
@@ -73,7 +72,7 @@ def folder_with_binary_files(tmpdir_factory):
7372
num_channels = 32
7473
sampling_frequency = 30_000.0
7574
dtype = "float32"
76-
recording = NoiseGeneratorRecording(
75+
recording = MockRecording(
7776
durations=[1.0],
7877
sampling_frequency=sampling_frequency,
7978
num_channels=num_channels,

src/spikeinterface/core/tests/test_generate.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from spikeinterface.core.generate import (
1010
generate_recording,
1111
generate_sorting,
12-
NoiseGeneratorRecording,
12+
MockRecording,
1313
SortingGenerator,
1414
TransformSorting,
1515
generate_recording_by_size,
@@ -22,6 +22,7 @@
2222
generate_sorting_to_inject,
2323
synthesize_random_firings,
2424
)
25+
from spikeinterface.generation import NoiseGeneratorRecording
2526

2627
from spikeinterface.core.numpyextractors import NumpySorting
2728

@@ -178,7 +179,7 @@ def test_noise_generator_memory():
178179

179180
# case 1 preallocation of noise use one noise block 88M for 60000 sample of 384
180181
before_instanciation_MiB = measure_memory_allocation() / bytes_to_MiB_factor
181-
rec1 = NoiseGeneratorRecording(
182+
rec1 = MockRecording(
182183
num_channels=num_channels,
183184
sampling_frequency=sampling_frequency,
184185
durations=durations,
@@ -193,11 +194,11 @@ def test_noise_generator_memory():
193194
ratio = expected_allocation_MiB / expected_allocation_MiB
194195
assert (
195196
ratio <= 1.0 + relative_tolerance
196-
), f"NoiseGeneratorRecording with 'tile_pregenerated' wrong memory {memory_usage_MiB} instead of {expected_allocation_MiB}"
197+
), f"MockRecording with 'tile_pregenerated' wrong memory {memory_usage_MiB} instead of {expected_allocation_MiB}"
197198

198199
# case 2: no preallocation very few memory (under 2 MiB)
199200
before_instanciation_MiB = measure_memory_allocation() / bytes_to_MiB_factor
200-
rec2 = NoiseGeneratorRecording(
201+
rec2 = MockRecording(
201202
num_channels=num_channels,
202203
sampling_frequency=sampling_frequency,
203204
durations=durations,
@@ -208,7 +209,7 @@ def test_noise_generator_memory():
208209
)
209210
after_instanciation_MiB = measure_memory_allocation() / bytes_to_MiB_factor
210211
memory_usage_MiB = after_instanciation_MiB - before_instanciation_MiB
211-
assert memory_usage_MiB < 2, f"NoiseGeneratorRecording with 'on_the_fly wrong memory {memory_usage_MiB}MiB"
212+
assert memory_usage_MiB < 2, f"MockRecording with 'on_the_fly wrong memory {memory_usage_MiB}MiB"
212213

213214

214215
def test_noise_generator_several_noise_levels():
@@ -262,7 +263,7 @@ def test_noise_generator_correct_shape(strategy):
262263
num_channels = 2
263264
seed = 0
264265

265-
lazy_recording = NoiseGeneratorRecording(
266+
lazy_recording = MockRecording(
266267
num_channels=num_channels,
267268
sampling_frequency=sampling_frequency,
268269
durations=durations,
@@ -298,7 +299,7 @@ def test_noise_generator_consistency_across_calls(strategy, start_frame, end_fra
298299
num_channels = 2
299300
seed = 0
300301

301-
lazy_recording = NoiseGeneratorRecording(
302+
lazy_recording = MockRecording(
302303
num_channels=num_channels,
303304
sampling_frequency=sampling_frequency,
304305
durations=durations,
@@ -333,7 +334,7 @@ def test_noise_generator_consistency_across_traces(strategy, start_frame, end_fr
333334
num_channels = 2
334335
seed = start_frame + end_frame + extra_samples # To make sure that the seed is different for each test
335336

336-
lazy_recording = NoiseGeneratorRecording(
337+
lazy_recording = MockRecording(
337338
num_channels=num_channels,
338339
sampling_frequency=sampling_frequency,
339340
durations=durations,
@@ -353,7 +354,7 @@ def test_noise_generator_consistency_across_traces(strategy, start_frame, end_fr
353354
@pytest.mark.parametrize("seed", [None, 42])
354355
def test_noise_generator_consistency_after_dump(strategy, seed):
355356
# test same noise after dump even with seed=None
356-
rec0 = NoiseGeneratorRecording(
357+
rec0 = MockRecording(
357358
num_channels=2,
358359
sampling_frequency=30000.0,
359360
durations=[2.0],

src/spikeinterface/core/tests/test_recording_tools.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
import platform
33
import numpy as np
44

5-
from spikeinterface.core import NumpyRecording, generate_recording
5+
from spikeinterface.core import NumpyRecording, generate_recording, MockRecording
66

77
from spikeinterface.core.binaryrecordingextractor import BinaryRecordingExtractor
8-
from spikeinterface.core.generate import NoiseGeneratorRecording
98

109

1110
from spikeinterface.core.recording_tools import (
@@ -30,7 +29,7 @@ def test_write_binary_recording(tmp_path):
3029
dtype = "float32"
3130

3231
durations = [10.0]
33-
recording = NoiseGeneratorRecording(
32+
recording = MockRecording(
3433
durations=durations,
3534
num_channels=num_channels,
3635
sampling_frequency=sampling_frequency,
@@ -57,7 +56,7 @@ def test_write_binary_recording_offset(tmp_path):
5756
dtype = "float32"
5857

5958
durations = [10.0]
60-
recording = NoiseGeneratorRecording(
59+
recording = MockRecording(
6160
durations=durations,
6261
num_channels=num_channels,
6362
sampling_frequency=sampling_frequency,
@@ -91,7 +90,7 @@ def test_write_binary_recording_parallel(tmp_path):
9190
num_channels = 2
9291
dtype = "float32"
9392
durations = [10.30, 3.5]
94-
recording = NoiseGeneratorRecording(
93+
recording = MockRecording(
9594
durations=durations,
9695
num_channels=num_channels,
9796
sampling_frequency=sampling_frequency,
@@ -122,7 +121,7 @@ def test_write_binary_recording_multiple_segment(tmp_path):
122121
dtype = "float32"
123122

124123
durations = [10.30, 3.5]
125-
recording = NoiseGeneratorRecording(
124+
recording = MockRecording(
126125
durations=durations,
127126
num_channels=num_channels,
128127
sampling_frequency=sampling_frequency,
@@ -147,7 +146,7 @@ def test_write_binary_recording_multiple_segment(tmp_path):
147146

148147
def test_write_memory_recording():
149148
# 2 segments
150-
recording = NoiseGeneratorRecording(
149+
recording = MockRecording(
151150
num_channels=2, durations=[10.325, 3.5], sampling_frequency=30_000, strategy="tile_pregenerated"
152151
)
153152
recording = recording.save()
@@ -317,7 +316,7 @@ def test_order_channels_by_depth():
317316

318317

319318
def test_do_recording_attributes_match():
320-
recording = NoiseGeneratorRecording(
319+
recording = MockRecording(
321320
num_channels=2, durations=[10.325, 3.5], sampling_frequency=30_000, strategy="tile_pregenerated"
322321
)
323322
rec_attributes = get_rec_attributes(recording)

src/spikeinterface/core/tests/test_time_series_tools.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import numpy as np
22

3-
from spikeinterface.core import generate_recording
3+
from spikeinterface.core import generate_recording, MockRecording
44

55
from spikeinterface.core.binaryrecordingextractor import BinaryRecordingExtractor
6-
from spikeinterface.core.generate import NoiseGeneratorRecording
76

87

98
from spikeinterface.core.time_series_tools import (
@@ -22,7 +21,7 @@ def test_write_binary(tmp_path):
2221
dtype = "float32"
2322

2423
durations = [10.0]
25-
recording = NoiseGeneratorRecording(
24+
recording = MockRecording(
2625
durations=durations,
2726
num_channels=num_channels,
2827
sampling_frequency=sampling_frequency,
@@ -49,7 +48,7 @@ def test_write_binary_offset(tmp_path):
4948
dtype = "float32"
5049

5150
durations = [10.0]
52-
recording = NoiseGeneratorRecording(
51+
recording = MockRecording(
5352
durations=durations,
5453
num_channels=num_channels,
5554
sampling_frequency=sampling_frequency,
@@ -81,7 +80,7 @@ def test_write_binary_parallel(tmp_path):
8180
num_channels = 2
8281
dtype = "float32"
8382
durations = [10.30, 3.5]
84-
recording = NoiseGeneratorRecording(
83+
recording = MockRecording(
8584
durations=durations,
8685
num_channels=num_channels,
8786
sampling_frequency=sampling_frequency,
@@ -112,7 +111,7 @@ def test_write_binary_multiple_segment(tmp_path):
112111
dtype = "float32"
113112

114113
durations = [10.30, 3.5]
115-
recording = NoiseGeneratorRecording(
114+
recording = MockRecording(
116115
durations=durations,
117116
num_channels=num_channels,
118117
sampling_frequency=sampling_frequency,
@@ -137,7 +136,7 @@ def test_write_binary_multiple_segment(tmp_path):
137136

138137
def test_write_memory_recording():
139138
# 2 segments
140-
recording = NoiseGeneratorRecording(
139+
recording = MockRecording(
141140
num_channels=2, durations=[10.325, 3.5], sampling_frequency=30_000, strategy="tile_pregenerated"
142141
)
143142
recording = recording.save()

src/spikeinterface/generation/tests/test_drift_tools.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
make_linear_displacement,
88
DriftingTemplates,
99
InjectDriftingTemplatesRecording,
10+
NoiseGeneratorRecording,
1011
)
11-
from spikeinterface.core.generate import generate_templates, generate_sorting, NoiseGeneratorRecording
12+
from spikeinterface.core.generate import generate_templates, generate_sorting
1213
from spikeinterface.core import Templates, BaseRecording
1314

1415
from probeinterface import generate_multi_columns_probe

0 commit comments

Comments
 (0)