diff --git a/src/test/mocks/Canon_40D.jpg b/src/test/mocks/Canon_40D.jpg deleted file mode 100644 index 6eb33f1..0000000 Binary files a/src/test/mocks/Canon_40D.jpg and /dev/null differ diff --git a/src/test/mocks/Canon_40D_photoshop_import.jpg b/src/test/mocks/Canon_40D_photoshop_import.jpg deleted file mode 100644 index 10ee97e..0000000 Binary files a/src/test/mocks/Canon_40D_photoshop_import.jpg and /dev/null differ diff --git a/src/test/mocks/Canon_DIGITAL_IXUS_400.jpg b/src/test/mocks/Canon_DIGITAL_IXUS_400.jpg deleted file mode 100644 index 1bc238d..0000000 Binary files a/src/test/mocks/Canon_DIGITAL_IXUS_400.jpg and /dev/null differ diff --git a/src/test/mocks/Fujifilm_FinePix6900ZOOM.jpg b/src/test/mocks/Fujifilm_FinePix6900ZOOM.jpg deleted file mode 100644 index c13141a..0000000 Binary files a/src/test/mocks/Fujifilm_FinePix6900ZOOM.jpg and /dev/null differ diff --git a/src/test/mocks/Fujifilm_FinePix_E500.jpg b/src/test/mocks/Fujifilm_FinePix_E500.jpg deleted file mode 100644 index 8cf1e5c..0000000 Binary files a/src/test/mocks/Fujifilm_FinePix_E500.jpg and /dev/null differ diff --git a/src/test/mocks/Kodak_CX7530.jpg b/src/test/mocks/Kodak_CX7530.jpg deleted file mode 100644 index 29b3651..0000000 Binary files a/src/test/mocks/Kodak_CX7530.jpg and /dev/null differ diff --git a/src/test/mocks/Konica_Minolta_DiMAGE_Z3.jpg b/src/test/mocks/Konica_Minolta_DiMAGE_Z3.jpg deleted file mode 100644 index 7ac8404..0000000 Binary files a/src/test/mocks/Konica_Minolta_DiMAGE_Z3.jpg and /dev/null differ diff --git a/src/test/mocks/Nikon_COOLPIX_P1.jpg b/src/test/mocks/Nikon_COOLPIX_P1.jpg deleted file mode 100644 index 6535fea..0000000 Binary files a/src/test/mocks/Nikon_COOLPIX_P1.jpg and /dev/null differ diff --git a/src/test/mocks/Nikon_D70.jpg b/src/test/mocks/Nikon_D70.jpg deleted file mode 100644 index 8ea0bcc..0000000 Binary files a/src/test/mocks/Nikon_D70.jpg and /dev/null differ diff --git a/src/test/mocks/Olympus_C8080WZ.jpg b/src/test/mocks/Olympus_C8080WZ.jpg deleted file mode 100644 index 6771637..0000000 Binary files a/src/test/mocks/Olympus_C8080WZ.jpg and /dev/null differ diff --git a/src/test/mocks/PaintTool_sample.jpg b/src/test/mocks/PaintTool_sample.jpg deleted file mode 100644 index 463e050..0000000 Binary files a/src/test/mocks/PaintTool_sample.jpg and /dev/null differ diff --git a/src/test/mocks/Panasonic_DMC-FZ30.jpg b/src/test/mocks/Panasonic_DMC-FZ30.jpg deleted file mode 100644 index 6a39d8c..0000000 Binary files a/src/test/mocks/Panasonic_DMC-FZ30.jpg and /dev/null differ diff --git a/src/test/mocks/Pentax_K10D.jpg b/src/test/mocks/Pentax_K10D.jpg deleted file mode 100644 index eeaec60..0000000 Binary files a/src/test/mocks/Pentax_K10D.jpg and /dev/null differ diff --git a/src/test/mocks/Ricoh_Caplio_RR330.jpg b/src/test/mocks/Ricoh_Caplio_RR330.jpg deleted file mode 100644 index 7c0411b..0000000 Binary files a/src/test/mocks/Ricoh_Caplio_RR330.jpg and /dev/null differ diff --git a/src/test/mocks/Samsung_Digimax_i50_MP3.jpg b/src/test/mocks/Samsung_Digimax_i50_MP3.jpg deleted file mode 100644 index a8ca9a8..0000000 Binary files a/src/test/mocks/Samsung_Digimax_i50_MP3.jpg and /dev/null differ diff --git a/src/test/mocks/Sony_HDR-HC3.jpg b/src/test/mocks/Sony_HDR-HC3.jpg deleted file mode 100644 index 1b5066d..0000000 Binary files a/src/test/mocks/Sony_HDR-HC3.jpg and /dev/null differ diff --git a/src/test/mocks/WWL_(Polaroid)_ION230.jpg b/src/test/mocks/WWL_(Polaroid)_ION230.jpg deleted file mode 100644 index ddfec79..0000000 Binary files a/src/test/mocks/WWL_(Polaroid)_ION230.jpg and /dev/null differ diff --git a/src/test/mocks/long_description.jpg b/src/test/mocks/long_description.jpg deleted file mode 100644 index c5dfe67..0000000 Binary files a/src/test/mocks/long_description.jpg and /dev/null differ diff --git a/src/test/mocks/m.avi b/src/test/mocks/m.avi deleted file mode 100644 index b19f4b6..0000000 Binary files a/src/test/mocks/m.avi and /dev/null differ diff --git a/src/test/mocks/m.mkv b/src/test/mocks/m.mkv deleted file mode 100644 index 0ffe561..0000000 Binary files a/src/test/mocks/m.mkv and /dev/null differ diff --git a/src/test/mocks/m.mpg b/src/test/mocks/m.mpg deleted file mode 100644 index 31530cc..0000000 Binary files a/src/test/mocks/m.mpg and /dev/null differ diff --git a/src/test/mocks/m.ogm b/src/test/mocks/m.ogm deleted file mode 100644 index b01b094..0000000 Binary files a/src/test/mocks/m.ogm and /dev/null differ diff --git a/src/test/mocks/m1.avi b/src/test/mocks/m1.avi deleted file mode 100644 index 64e6279..0000000 Binary files a/src/test/mocks/m1.avi and /dev/null differ diff --git a/src/test/mocks/test_image_info.txt b/src/test/mocks/test_image_info.txt deleted file mode 100644 index 7346596..0000000 --- a/src/test/mocks/test_image_info.txt +++ /dev/null @@ -1,44 +0,0 @@ - -|== INFO ON TEST IMAGES ==| - -Unless stated otherwise, all images come from Wikipedia Commons - http://commons.wikimedia.org -For author and license information please refer to their respective description pages. - -All images were scaled down using the GIMP v 2.4.5 since all we care about is the Exif info. -Tested before and after scaling to ensure Exif data was not modified (except for 'software' field). - - -== Filename == == Wiki Filename == - -= Camera Makes and Models = -Canon_40D.jpg Iguana_iguana_male_head.jpg -Canon_40D_photoshop_import.jpg Anolis_equestris_-_bright_close_3-4.jpg -Canon_DIGITAL_IXUS_400.jpg Ducati749.jpg -Fujifilm_FinePix6900ZOOM.jpg Hylidae_cinerea.JPG -Fujifilm_FinePix_E500.jpg VlaamseGaaiVeertje1480.JPG -Kodak_CX7530.jpg Red-headed_Rock_Agama.jpg -Konica_Minolta_DiMAGE_Z3.jpg Knechtova01.jpg -Nikon_COOLPIX_P1.jpg Miyagikotsu-castle6861.JPG -Nikon_D70.jpg Anolis_carolinensis_brown.jpg -Olympus_C8080WZ.jpg Pterois_volitans_Manado-e.jpg -Panasonic_DMC-FZ30.jpg Rømø_-_St.Klement_-_Kanzel_3.jpg -Pentax_K10D.jpg Mrs._Herbert_Stevens_May_2008.jpg -Ricoh_Caplio_RR330.jpg Steveston_dusk.JPG -Samsung_Digimax_i50_MP3.jpg Villa_di_Poggio_a_Caiano,_sala_neoclassica_4.JPG -Sony_HDR-HC3.jpg Positive_roll_film.jpg -WWL_(Polaroid)_ION230.jpg PoudriereBoisSousRoche3.jpg - -= Other Stuff = -long_description.jpg US_10th_Mountain_Division_soldiers_in_Afghanistan.jpg - - - -Contributions : - -PaintTool_sample.jpg -- Submitted by Jan Trofimov (OXIj) - - -If you come across an image which is incorrectly parsed or errors out, consider -contributing it to the test cases : ianare@gmail.com - - diff --git a/src/test/__init__.py b/test/__init__.py similarity index 100% rename from src/test/__init__.py rename to test/__init__.py diff --git a/src/test/run_tests.py b/test/run_tests.py similarity index 83% rename from src/test/run_tests.py rename to test/run_tests.py index b56b1a1..791bc11 100755 --- a/src/test/run_tests.py +++ b/test/run_tests.py @@ -14,13 +14,13 @@ import glob def setup_path(): """Sets up the python include paths to include needed directories""" this_path = path.abspath(path.dirname(__file__)) - sys.path = [path.join(this_path, "../../src")] + sys.path - sys.path = [path.join(this_path, "../../src/test/unit")] + sys.path + sys.path = [path.join(this_path, "unit")] + sys.path return def build_suite(): """Build suite test from files in unit directory. Filenames with test - suites should always end with "_test.py".""" + suites should always end with "_test.py". + """ modules = [] for fname in glob.glob1('unit', '*_test.py'): class_name = fname[:-8] @@ -39,7 +39,7 @@ def build_suite(): return unittest.TestSuite(map(load, modules)) if __name__ == "__main__": - chdir(path.abspath(path.curdir)) + chdir(path.abspath(path.dirname(__file__))) setup_path() unittest.main(defaultTest="build_suite") diff --git a/src/test/unit/__init__.py b/test/unit/__init__.py similarity index 100% rename from src/test/unit/__init__.py rename to test/unit/__init__.py diff --git a/src/test/unit/dummy_test.py b/test/unit/dummy_test.py similarity index 100% rename from src/test/unit/dummy_test.py rename to test/unit/dummy_test.py diff --git a/src/test/unit/foo_bar_test.py b/test/unit/foo_bar_test.py similarity index 100% rename from src/test/unit/foo_bar_test.py rename to test/unit/foo_bar_test.py diff --git a/src/test/unit/video_test.py b/test/unit/video_test.py similarity index 96% rename from src/test/unit/video_test.py rename to test/unit/video_test.py index 4d4722d..0f40cd4 100644 --- a/src/test/unit/video_test.py +++ b/test/unit/video_test.py @@ -7,7 +7,7 @@ """ import unittest import os -from lib.video import Video +from pygtktalog.video import Video class TestVideo(unittest.TestCase): """Class for retrive midentify script output and put it in dict. @@ -102,4 +102,6 @@ class TestVideo(unittest.TestCase): os.unlink(filename) if __name__ == "__main__": + os.chdir(os.path.join(os.path.abspath(os.path.dirname(__file__)), "../")) + print os.path.abspath(os.path.curdir) unittest.main()