Skip to content

Commit 833875a

Browse files
* Refactor tests a bit
1 parent dedb1ea commit 833875a

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

testsuite/MDAnalysisTests/coordinates/test_imd.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -527,35 +527,38 @@ def test_iterate_current_frame_raises_error(self, reader):
527527
):
528528
ts[0]
529529

530-
def test_iterate_current_frame(self, reader):
530+
@pytest.mark.parametrize("iter_type", [list, np.array])
531+
def test_iterate_current_frame(self, reader, iter_type):
531532
cts = reader.ts
532533
# test iterator length
533-
assert len(reader[[reader.frame]]) == 1
534+
assert len(reader[iter_type([reader.frame])]) == 1
534535
# test list iterator
535-
for ts in reader[[reader.frame]]:
536+
for ts in reader[iter_type([reader.frame])]:
536537
assert ts == cts
537538
assert ts.frame == reader.frame
538-
# test np.ndarray iterator
539-
reader[np.array([reader.frame])]
539+
540+
def test_current_frame(self, reader):
541+
cts = reader.ts
540542
# test same timestep
541543
assert reader[reader.frame] == cts
542544
assert reader[reader.frame] == reader[reader.frame]
543545
# should be able to iterate all 5 frames in reader
544546
# due to server.send_frames(1, 5) in reader setup
545547
for i in range(5):
546-
ts = reader[i]
548+
reader[i]
547549
if i < 4:
548550
reader.next()
549551
else:
550552
with pytest.raises(StopIteration):
551553
reader.next()
552554

553-
def test_iterate_current_frame_no_transformations(self, reader):
555+
def test_current_frame_transformations(self, reader):
554556
reader.add_transformations(
555557
translate([1, 1, 1]), translate([0, 0, 0.33])
556558
)
557559
p1 = reader[reader.frame].positions.copy()
558560
p2 = reader[reader.frame].positions
561+
# test transformations not repeated
559562
assert_allclose(p1, p2)
560563

561564
def test_iterate_continuity_1(self, reader):

0 commit comments

Comments
 (0)