adding test

guinslym · Feb 10, 2016 · abd25e9 · abd25e9
1 parent 96fc2e0
commit abd25e9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,8 @@ import pyexifinfo as p
 p.ver() #retrieve your ExifTool version
 filename = 'python-logo.png'
 p.get_json(filename) #retrieve a json representation of this file exif
+```
+```json
 =>
 [{u'File:FilePermissions': u'rw-rw-r--', u'PNG:Interlace': u'Noninterlaced', u'S
 ourceFile': u'/home/laptop/python-logo.png', u'PNG:ColorType': u'RGB with Alpha', u'File:MIMEType': u'image/png',u'File:FileAccessDate': u'2015:07:20 16:37:22-04:00', u'File:FileModifyDate': u'2014:12:12 20:55:59-05:00', u'File:FileSize': u'9.9 kB', u'PNG:ImageWidth': 290, u'File:FileType': u'PNG', u'File:FileName': u'python-logo.png', u'PNG:Compression': u'Deflate/Inflate', u'PNG:PixelsPerUnitY': 2835, u'PNG:PixelsPerUnitX': 2835, u'PNG:ImageHeight': 82, u'PNG:PixelUnits': u'Meters', u'File:Directory': u'/home/laptop', u'File:FileInodeChangDate': u'2015:07:20 16:37:22-04:00', u'PNG:Filter': u'Adaptive', u'PNG:BitDepth': 8, u'Composite:ImageSize': u'290x82', u'ExifTool:ExifToolVersion': 9.46}]
@@ -31,9 +33,6 @@ result = get_csv(filename)
 result = get_xml(filename)
 result = fileType(filename)
 result = mimeType(filename)
-result = imageSize(filename)
-result = imageWidth(filename)
-result = imageHeight(filename)
 ```
 
 
diff --git a/README.rst b/README.rst
@@ -41,9 +41,6 @@ result = get_csv(filename)
 result = get_xml(filename)
 result = fileType(filename)
 result = mimeType(filename)
-result = imageSize(filename)
-result = imageWidth(filename)
-result = imageHeight(filename)
 
 
 
diff --git a/pyexifinfo/pyexifinfo.py b/pyexifinfo/pyexifinfo.py
@@ -57,6 +57,8 @@ def get_csv(filename):
     filename = os.path.abspath(filename)
     s = command_line(['exiftool', '-G', '-csv', '-sort', filename])
     if s:
+        #convert bytes to string
+        s = s.decode('utf-8')
         return s
     else:
         return 0
@@ -66,6 +68,8 @@ def get_xml(filename):
     filename = os.path.abspath(filename)
     s = command_line(['exiftool', '-G', '-X', '-sort', filename])
     if s:
+        #convert bytes to string
+        s = s.decode('utf-8')
         return s
     else:
         return 0

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 setup(
     name='PyExifinfo',
 
-    version='0.1.2',
+    version='0.1.5',
 
     description="Yet another simple wrapper for ExifTool",
 
@@ -41,4 +41,4 @@
     packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
 
 
-)
+)
diff --git a/tests/tests.py b/tests/tests.py
@@ -1,9 +1,12 @@
 import pyexifinfo as p
-import os
+import csv
 
-
-# content of test_sample.py
+#tested with Pytest
+#
+#
+# python logo (MIT)
 image = 'python-logo-master-v3-TM.png'
+
 def test_version_is_greater_than_8():
     """ test the version is greater than 8 """
     a = p.ver()
@@ -17,6 +20,14 @@ def test_get_json():
     a = p.get_json("tests/"+image)
     assert len(a[0]) == 25
 
+def test_get_csv():
+    a = p.get_csv("tests/"+image)
+    assert a[0:10] == "SourceFile"
+
+def test_get_xml():
+    a = p.get_xml("tests/"+image)
+    assert a[0:5] == "<?xml"
+
 def test_get_fileType():
     a = p.fileType("tests/"+image)
     assert a.lower() == 'png'
@@ -28,11 +39,3 @@ def test_get_mimeType():
 def test_get_imageSize():
     a = p.imageSize("tests/"+image)
     assert a.lower() == '601x203'
-
-def test_get_imageWidh():
-    a = p.imageWidth("tests/"+image)
-    assert a == 601
-
-def test_get_imageHeight():
-    a = p.imageHeight("tests/"+image)
-    assert a == 203