img: close test coverage gaps in docx.image

Steve Canny · Steve Canny · commit fc9495267c6c · 2014-03-01T01:35:30.000-08:00
diff --git a/docx/image/helpers.py b/docx/image/helpers.py
@@ -31,7 +31,7 @@ def read(self, count):
         """
         return self._stream.read(count)
 
-    def read_byte(self, base=None, offset=0):
+    def read_byte(self, base, offset=0):
         """
         Return the int value of the byte at the file position defined by
         self._base_offset + *base* + *offset*. If *base* is None, the byte is
@@ -40,7 +40,7 @@ def read_byte(self, base=None, offset=0):
         fmt = 'B'
         return self._read_int(fmt, base, offset)
 
-    def read_long(self, base=None, offset=0):
+    def read_long(self, base, offset=0):
         """
         Return the int value of the four bytes at the file position defined by
         self._base_offset + *base* + *offset*. If *base* is None, the long is
@@ -50,7 +50,7 @@ def read_long(self, base=None, offset=0):
         fmt = '<L' if self._byte_order is LITTLE_ENDIAN else '>L'
         return self._read_int(fmt, base, offset)
 
-    def read_short(self, base=None, offset=0):
+    def read_short(self, base, offset=0):
         """
         Return the int value of the two bytes at the file position determined
         by *base* and *offset*, similarly to ``read_long()`` above.
@@ -90,8 +90,6 @@ def _read_bytes(self, byte_count, base, offset):
 
     def _read_int(self, fmt, base, offset):
         struct = Struct(fmt)
-        if base is None:
-            base = self._stream.tell() - self._base_offset
         return self._unpack_item(struct, base, offset)
 
     def _unpack_item(self, struct, base, offset):
diff --git a/docx/image/jpeg.py b/docx/image/jpeg.py
@@ -77,7 +77,7 @@ def __init__(self, markers):
         super(_JfifMarkers, self).__init__()
         self._markers = list(markers)
 
-    def __str__(self):
+    def __str__(self):  # pragma: no cover
         """
         Returns a tabular listing of the markers in this instance, which can
         be handy for debugging and perhaps other uses.
@@ -243,7 +243,7 @@ def _read_byte(self):
         at end of file.
         """
         byte_ = self._stream.read(1)
-        if not byte_:
+        if not byte_:  # pragma: no cover
             raise Exception('unexpected end of file')
         return byte_
 
@@ -296,11 +296,11 @@ def marker_code(self):
         return self._marker_code
 
     @property
-    def name(self):
+    def name(self):  # pragma: no cover
         return JPEG_MARKER_CODE.marker_names[self._marker_code]
 
     @property
-    def offset(self):
+    def offset(self):  # pragma: no cover
         return self._offset
 
     @property
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
@@ -197,6 +197,11 @@ def call_fixture(self, request):
 
 class DescribeBaseImageHeader(object):
 
+    def it_defines_content_type_as_an_abstract_property(self):
+        base_image_header = BaseImageHeader(None, None, None, None)
+        with pytest.raises(NotImplementedError):
+            base_image_header.content_type
+
     def it_knows_the_image_dimensions(self):
         px_width, px_height = 42, 24
         image_header = BaseImageHeader(px_width, px_height, None, None)
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
@@ -128,6 +128,11 @@ def it_raises_if_it_cant_find_the_APP0_marker(self, no_app0_fixture):
         with pytest.raises(KeyError):
             jfif_markers.app0
 
+    def it_raises_if_it_cant_find_the_APP1_marker(self, no_app1_fixture):
+        jfif_markers = no_app1_fixture
+        with pytest.raises(KeyError):
+            jfif_markers.app1
+
     def it_can_find_the_SOF_marker(self, sof_fixture):
         jfif_markers, sof_ = sof_fixture
         sof = jfif_markers.sof
@@ -202,6 +207,11 @@ def no_app0_fixture(self, soi_, eoi_):
         markers = (soi_, eoi_)
         return _JfifMarkers(markers)
 
+    @pytest.fixture
+    def no_app1_fixture(self, soi_, eoi_):
+        markers = (soi_, eoi_)
+        return _JfifMarkers(markers)
+
     @pytest.fixture
     def no_sof_fixture(self, soi_, eoi_):
         markers = (soi_, eoi_)
diff --git a/tests/image/test_png.py b/tests/image/test_png.py
@@ -9,7 +9,7 @@
 import pytest
 
 from docx.compat import BytesIO
-from docx.image.constants import TAG
+from docx.image.constants import MIME_TYPE, TAG
 from docx.image.exceptions import InvalidImageStreamError
 from docx.image.helpers import BIG_ENDIAN, StreamReader
 from docx.image.png import Png
@@ -71,6 +71,10 @@ def it_can_parse_an_pHYs_chunk(self, parse_pHYs_fixture):
         attrs = Png._parse_pHYs(stream, offset)
         assert attrs == expected_attrs
 
+    def it_knows_its_content_type(self):
+        png = Png(None, None, None)
+        assert png.content_type == MIME_TYPE.PNG
+
     def it_knows_its_dpi(self, dpi_fixture):
         png, expected_dpi = dpi_fixture
         assert png.horz_dpi == expected_dpi
