Skip to content

Commit 1ca4270

Browse files
committed
fixup
1 parent 724b0a8 commit 1ca4270

File tree

1 file changed

+14
-24
lines changed

1 file changed

+14
-24
lines changed

mantidimaging/eyes_tests/live_viewer_window_test.py

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
# Copyright (C) 2024 ISIS Rutherford Appleton Laboratory UKRI
22
# SPDX - License - Identifier: GPL-3.0-or-later
3-
from __future__ import annotations
43

4+
from __future__ import annotations
55
from typing import TYPE_CHECKING
66
from unittest import mock
7-
87
import numpy as np
9-
108
import os
11-
129
from mantidimaging.core.operations.loader import load_filter_packages
1310
from mantidimaging.gui.windows.live_viewer.model import Image_Data
1411
from mantidimaging.test_helpers.unit_test_helper import FakeFSTestCase
1512
from pathlib import Path
16-
1713
from mantidimaging.eyes_tests.base_eyes import BaseEyesTest
1814

1915
if TYPE_CHECKING:
@@ -22,6 +18,10 @@
2218

2319
class LiveViewerWindowTest(FakeFSTestCase, BaseEyesTest):
2420

21+
def __init__(self, *args, **kwargs):
22+
super().__init__(*args, **kwargs)
23+
self.initial_time = 4000.0
24+
2525
@classmethod
2626
def setUpClass(cls) -> None:
2727
super().setUpClass()
@@ -32,7 +32,6 @@ def setUp(self) -> None:
3232
self.fs.add_real_directory(Path(__file__).parent.parent) # Allow ui file to be found
3333
self.live_directory = Path("/live_dir")
3434
self.fs.create_dir(self.live_directory)
35-
self.initial_time = 4000.0
3635

3736
def _generate_image(self):
3837
image = np.zeros((10, 10))
@@ -43,16 +42,11 @@ def _generate_image(self):
4342

4443
def _make_simple_dir(self, directory: Path):
4544
file_list = [directory / f"abc_{i:06d}.tif" for i in range(5)]
46-
# set initial time to live directory utime
47-
# initial_time = 4000.0
48-
if not directory.exists():
49-
self.fs.create_dir(directory)
50-
# increment = 1
45+
increment = 0
5146
for file in file_list:
5247
self.fs.create_file(file)
53-
# set file time to incrememnt by 1
54-
# os.utime(file, (10, initial_time + increment))
55-
# increment += 1
48+
os.utime(file, (10, self.initial_time + increment))
49+
increment += 1000
5650

5751
return file_list
5852

@@ -100,15 +94,11 @@ def test_rotate_operation_rotates_image(self, _mock_time, _mock_image_watcher, m
10094
@mock.patch('mantidimaging.gui.windows.live_viewer.presenter.LiveViewerWindowPresenter.load_image')
10195
@mock.patch('mantidimaging.gui.windows.live_viewer.model.ImageWatcher')
10296
@mock.patch("time.time", return_value=4000.0)
103-
def test_file_time_is_updated(self, _mock_time, _mock_image_watcher, mock_load_image):
97+
def test_file_time_lebel_displays_correct_time(self, _mock_time, _mock_image_watcher, mock_load_image):
10498
file_list = self._make_simple_dir(self.live_directory)
10599
image_list = [Image_Data(path) for path in file_list]
106-
increment = 0
107-
for image in image_list:
108-
image.image_modified_time_stamp = 4000.0 + increment
109-
mock_load_image.return_value = self._generate_image()
110-
self.imaging.show_live_viewer(self.live_directory)
111-
self.assertEqual(image.image_modified_time_stamp,
112-
4000.0 + increment) # Add this line to check the label time
113-
self.imaging.live_viewer.presenter.model._handle_image_changed_in_list(image_list)
114-
self.check_target(widget=self.imaging.live_viewer)
100+
mock_load_image.return_value = self._generate_image()
101+
self.imaging.show_live_viewer(self.live_directory)
102+
self.imaging.live_viewer.presenter.model._handle_image_changed_in_list(image_list)
103+
self.assertEqual(self.imaging.live_viewer.file_time_label.text(), "1970-01-01 02:13:20")
104+
self.check_target(widget=self.imaging.live_viewer)

0 commit comments

Comments
 (0)