Skip to content

Commit 0810d75

Browse files
author
Lee Kamentsky
committed
Issue #38 - corrected test cases and added regression test
1 parent 1ee6f2f commit 0810d75

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

bioformats/tests/test_omexml.py

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,25 @@ def test_04_04_image_set_name(self):
9999
o.image(0).Name = "Foo"
100100
self.assertEquals(o.image(0).node.get("Name"), "Foo")
101101

102-
def test_04_05_image_get_acquired_date(self):
102+
def test_04_05_image_get_acquisition_date(self):
103103
o = O.OMEXML(TIFF_XML)
104-
self.assertEqual(o.image(0).AcquiredDate, "2008-02-05T17:24:46")
104+
self.assertEqual(o.image(0).AcquisitionDate, "2008-02-05T17:24:46")
105105

106-
def test_04_06_image_set_acquired_date(self):
106+
def test_04_06_image_set_acquisition_date(self):
107107
o = O.OMEXML(TIFF_XML)
108-
o.image(0).AcquiredDate = "2011-12-21T11:04:14.903000"
109-
self.assertEqual(o.image(0).AcquiredDate, "2011-12-21T11:04:14.903000")
108+
o.image(0).AcquisitionDate = "2011-12-21T11:04:14.903000"
109+
self.assertEqual(o.image(0).AcquisitionDate, "2011-12-21T11:04:14.903000")
110+
111+
def test_04_07_image_1_acquisition_date(self):
112+
# regression test of #38
113+
o = O.OMEXML()
114+
o.set_image_count(2)
115+
date_1 = "2011-12-21T11:04:14.903000"
116+
date_2 = "2015-10-13T09:57:00.000000"
117+
o.image(0).AcquisitionDate = date_1
118+
o.image(1).AcquisitionDate = date_2
119+
self.assertEqual(o.image(0).AcquisitionDate, date_1)
120+
self.assertEqual(o.image(1).AcquisitionDate, date_2)
110121

111122
def test_05_01_pixels_get_id(self):
112123
o = O.OMEXML(TIFF_XML)
@@ -736,7 +747,7 @@ def test_14_17_set_position_z(self):
736747
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
737748
xsi:schemaLocation="http://www.openmicroscopy.org/Schemas/OME/2013-06 http://www.openmicroscopy.org/Schemas/OME/2013-06/ome.xsd">
738749
<Image ID="Image:0" Name="Channel1-01-A-01.tif">
739-
<AcquiredDate>2008-02-05T17:24:46</AcquiredDate>
750+
<AcquisitionDate>2008-02-05T17:24:46</AcquisitionDate>
740751
<Pixels DimensionOrder="XYCZT" ID="Pixels:0" PhysicalSizeX="352.77777777777777"
741752
PhysicalSizeY="352.77777777777777" SizeC="2" SizeT="3" SizeX="640"
742753
SizeY="512" SizeZ="1" Type="uint8">

0 commit comments

Comments
 (0)