diff --git "a/soil_analysis/tests/domain/service/android/JA\344\270\255_all.jpg" "b/soil_analysis/tests/domain/service/android/JA\344\270\255_all.jpg" new file mode 100644 index 00000000..a3885701 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/JA\344\270\255_all.jpg" differ diff --git a/soil_analysis/tests/domain/service/android/Photos-001.zip b/soil_analysis/tests/domain/service/android/Photos-001.zip new file mode 100644 index 00000000..8d9a30ac Binary files /dev/null and b/soil_analysis/tests/domain/service/android/Photos-001.zip differ diff --git "a/soil_analysis/tests/domain/service/android/T\345\255\227_all.jpg" "b/soil_analysis/tests/domain/service/android/T\345\255\227_all.jpg" new file mode 100644 index 00000000..99d4428e Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/T\345\255\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\343\202\204\343\201\276\343\201\253\346\235\261_all.jpg" "b/soil_analysis/tests/domain/service/android/\343\202\204\343\201\276\343\201\253\346\235\261_all.jpg" new file mode 100644 index 00000000..55137dd7 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\343\202\204\343\201\276\343\201\253\346\235\261_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240B2.jpg" "b/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240B2.jpg" new file mode 100644 index 00000000..726d07ec Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240B2.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240\343\201\256\345\206\231\347\234\237\343\201\257\343\203\206\343\202\271\343\203\210\343\201\247\344\275\277\343\201\243\343\201\246\343\201\276\343\201\231.txt" "b/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240\343\201\256\345\206\231\347\234\237\343\201\257\343\203\206\343\202\271\343\203\210\343\201\247\344\275\277\343\201\243\343\201\246\343\201\276\343\201\231.txt" new file mode 100644 index 00000000..e69de29b diff --git "a/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240\357\274\2421_right.jpg" "b/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240\357\274\2421_right.jpg" new file mode 100644 index 00000000..ae0f207b Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\343\202\271\343\202\271\343\203\240\357\274\2421_right.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\343\203\236\343\203\2401_all.jpg" "b/soil_analysis/tests/domain/service/android/\343\203\236\343\203\2401_all.jpg" new file mode 100644 index 00000000..b8a0181a Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\343\203\236\343\203\2401_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\344\270\255\345\271\263\346\235\276\345\205\254\344\274\232\345\240\202\345\211\215\346\235\261_all.jpg" "b/soil_analysis/tests/domain/service/android/\344\270\255\345\271\263\346\235\276\345\205\254\344\274\232\345\240\202\345\211\215\346\235\261_all.jpg" new file mode 100644 index 00000000..aa684e41 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\344\270\255\345\271\263\346\235\276\345\205\254\344\274\232\345\240\202\345\211\215\346\235\261_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223 \345\215\227_all.jpg" "b/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223 \345\215\227_all.jpg" new file mode 100644 index 00000000..c54d6e34 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223 \345\215\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" "b/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" new file mode 100644 index 00000000..7e13835b Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261\343\201\256\345\215\227.jpg" "b/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261\343\201\256\345\215\227.jpg" new file mode 100644 index 00000000..4c1fc5eb Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261\343\201\256\345\215\227.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\346\255\243\347\234\274\351\231\242\344\270\255_all.jpg" "b/soil_analysis/tests/domain/service/android/\346\255\243\347\234\274\351\231\242\344\270\255_all.jpg" new file mode 100644 index 00000000..5dc7a244 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\346\255\243\347\234\274\351\231\242\344\270\255_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\346\265\267\350\200\201\345\263\266\345\215\227_all.jpg" "b/soil_analysis/tests/domain/service/android/\346\265\267\350\200\201\345\263\266\345\215\227_all.jpg" new file mode 100644 index 00000000..0907a680 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\346\265\267\350\200\201\345\263\266\345\215\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\344\270\255_all.jpg" "b/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\344\270\255_all.jpg" new file mode 100644 index 00000000..c7e48a0b Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\344\270\255_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\214\227_all.jpg" "b/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\214\227_all.jpg" new file mode 100644 index 00000000..e11069a4 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\214\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\215\227_all.jpg" "b/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\215\227_all.jpg" new file mode 100644 index 00000000..756c112c Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\215\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/service/android/\351\256\253\345\263\266 \344\270\255\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" "b/soil_analysis/tests/domain/service/android/\351\256\253\345\263\266 \344\270\255\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" new file mode 100644 index 00000000..ab208c25 Binary files /dev/null and "b/soil_analysis/tests/domain/service/android/\351\256\253\345\263\266 \344\270\255\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" differ diff --git a/soil_analysis/tests/domain/service/test_photoprocessingservice.py b/soil_analysis/tests/domain/service/test_photoprocessingservice.py index 0c03f984..7e3c0542 100644 --- a/soil_analysis/tests/domain/service/test_photoprocessingservice.py +++ b/soil_analysis/tests/domain/service/test_photoprocessingservice.py @@ -1,3 +1,4 @@ +import os from unittest import TestCase from soil_analysis.domain.service.photoprocessingservice import PhotoProcessingService @@ -20,9 +21,10 @@ def setUp(self) -> None: '137.6492192,34.7429904 137.6489738,34.7433604') self.land_candidates = LandCandidates([self.land1, self.land2, self.land3, self.land4]) + script_directory = os.path.dirname(os.path.abspath(__file__)) self.photo_paths = [ - r"D:/OneDrive/dev/soil_analysisローカルデータ/サンプルデータ/android/ススムB1_right.jpg", - r"D:/OneDrive/dev/soil_analysisローカルデータ/サンプルデータ/android/ススムB2.jpg" + os.path.join(script_directory, r"./android/ススムB1_right.jpg"), + os.path.join(script_directory, r"./android/ススムB2.jpg") ] def test_calculate_distance(self): @@ -63,9 +65,10 @@ def test_find_nearest_land_a4(self): def test_process_photos(self): service = PhotoProcessingService() processed_photos = service.process_photos(self.photo_paths, self.land_candidates) - # 期待される処理後の写真のリストと一致するか検証する ススムは 6/18 のグーグルフォトにある + # 期待される処理後の写真のリストと一致するか検証する ススムは 2023/6/18 のグーグルフォトにある + script_directory = os.path.dirname(os.path.abspath(__file__)) expected_processed_photos = [ - "D:/OneDrive/dev/soil_analysisローカルデータ/サンプルデータ/android/ススムB1_right.jpg", - "D:/OneDrive/dev/soil_analysisローカルデータ/サンプルデータ/android/ススムB2.jpg" + os.path.join(script_directory, "./android/ススムB1_right.jpg"), + os.path.join(script_directory, "./android/ススムB2.jpg") ] self.assertEqual(expected_processed_photos, processed_photos) diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/JA\344\270\255_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/JA\344\270\255_all.jpg" new file mode 100644 index 00000000..a3885701 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/JA\344\270\255_all.jpg" differ diff --git a/soil_analysis/tests/domain/valueobject/photo/android/Photos-001.zip b/soil_analysis/tests/domain/valueobject/photo/android/Photos-001.zip new file mode 100644 index 00000000..8d9a30ac Binary files /dev/null and b/soil_analysis/tests/domain/valueobject/photo/android/Photos-001.zip differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/T\345\255\227_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/T\345\255\227_all.jpg" new file mode 100644 index 00000000..99d4428e Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/T\345\255\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\343\202\204\343\201\276\343\201\253\346\235\261_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\343\202\204\343\201\276\343\201\253\346\235\261_all.jpg" new file mode 100644 index 00000000..55137dd7 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\343\202\204\343\201\276\343\201\253\346\235\261_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240B2.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240B2.jpg" new file mode 100644 index 00000000..726d07ec Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240B2.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240\343\201\256\345\206\231\347\234\237\343\201\257\343\203\206\343\202\271\343\203\210\343\201\247\344\275\277\343\201\243\343\201\246\343\201\276\343\201\231.txt" "b/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240\343\201\256\345\206\231\347\234\237\343\201\257\343\203\206\343\202\271\343\203\210\343\201\247\344\275\277\343\201\243\343\201\246\343\201\276\343\201\231.txt" new file mode 100644 index 00000000..e69de29b diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240\357\274\2421_right.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240\357\274\2421_right.jpg" new file mode 100644 index 00000000..ae0f207b Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\343\202\271\343\202\271\343\203\240\357\274\2421_right.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\343\203\236\343\203\2401_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\343\203\236\343\203\2401_all.jpg" new file mode 100644 index 00000000..b8a0181a Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\343\203\236\343\203\2401_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\344\270\255\345\271\263\346\235\276\345\205\254\344\274\232\345\240\202\345\211\215\346\235\261_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\344\270\255\345\271\263\346\235\276\345\205\254\344\274\232\345\240\202\345\211\215\346\235\261_all.jpg" new file mode 100644 index 00000000..aa684e41 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\344\270\255\345\271\263\346\235\276\345\205\254\344\274\232\345\240\202\345\211\215\346\235\261_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223 \345\215\227_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223 \345\215\227_all.jpg" new file mode 100644 index 00000000..c54d6e34 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223 \345\215\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" new file mode 100644 index 00000000..7e13835b Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261\343\201\256\345\215\227.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261\343\201\256\345\215\227.jpg" new file mode 100644 index 00000000..4c1fc5eb Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\345\263\266\347\224\260\343\201\225\343\202\223\346\235\261\343\201\256\345\215\227.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\346\255\243\347\234\274\351\231\242\344\270\255_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\346\255\243\347\234\274\351\231\242\344\270\255_all.jpg" new file mode 100644 index 00000000..5dc7a244 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\346\255\243\347\234\274\351\231\242\344\270\255_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\346\265\267\350\200\201\345\263\266\345\215\227_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\346\265\267\350\200\201\345\263\266\345\215\227_all.jpg" new file mode 100644 index 00000000..0907a680 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\346\265\267\350\200\201\345\263\266\345\215\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\344\270\255_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\344\270\255_all.jpg" new file mode 100644 index 00000000..c7e48a0b Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\344\270\255_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\214\227_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\214\227_all.jpg" new file mode 100644 index 00000000..e11069a4 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\214\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\215\227_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\215\227_all.jpg" new file mode 100644 index 00000000..756c112c Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\351\243\233\350\241\214\345\240\264\350\245\277\345\215\227_all.jpg" differ diff --git "a/soil_analysis/tests/domain/valueobject/photo/android/\351\256\253\345\263\266 \344\270\255\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" "b/soil_analysis/tests/domain/valueobject/photo/android/\351\256\253\345\263\266 \344\270\255\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" new file mode 100644 index 00000000..ab208c25 Binary files /dev/null and "b/soil_analysis/tests/domain/valueobject/photo/android/\351\256\253\345\263\266 \344\270\255\347\224\260\343\201\225\343\202\223\346\235\261_all.jpg" differ diff --git a/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1315_left.jpeg b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1315_left.jpeg new file mode 100644 index 00000000..0fd67b93 Binary files /dev/null and b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1315_left.jpeg differ diff --git a/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1317_right.jpeg b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1317_right.jpeg new file mode 100644 index 00000000..169b3eba Binary files /dev/null and b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1317_right.jpeg differ diff --git a/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1318_all.jpeg b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1318_all.jpeg new file mode 100644 index 00000000..563cb5ee Binary files /dev/null and b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1318_all.jpeg differ diff --git a/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1320_all.jpeg b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1320_all.jpeg new file mode 100644 index 00000000..ccdda5ed Binary files /dev/null and b/soil_analysis/tests/domain/valueobject/photo/iphone/IMG_1320_all.jpeg differ diff --git a/soil_analysis/tests/domain/valueobject/photo/test_androidphoto.py b/soil_analysis/tests/domain/valueobject/photo/test_androidphoto.py index 15c07189..e4ec505b 100644 --- a/soil_analysis/tests/domain/valueobject/photo/test_androidphoto.py +++ b/soil_analysis/tests/domain/valueobject/photo/test_androidphoto.py @@ -1,3 +1,4 @@ +import os from unittest import TestCase from soil_analysis.domain.valueobject.capturelocation import CaptureLocation @@ -6,8 +7,9 @@ class TestAndroidPhoto(TestCase): def setUp(self): - self.file_path = r"D:/OneDrive/dev/soil_analysisローカルデータ/サンプルデータ/android/JA中_all.jpg" - self.android_photo = AndroidPhoto(self.file_path) + script_directory = os.path.dirname(os.path.abspath(__file__)) + self.file_path = r"./android/JA中_all.jpg" + self.android_photo = AndroidPhoto(os.path.join(script_directory, self.file_path)) self.android_photo.exif_data = self.android_photo._extract_exif_data() def test_extract_date(self): diff --git a/soil_analysis/tests/domain/valueobject/photo/test_iphonephoto.py b/soil_analysis/tests/domain/valueobject/photo/test_iphonephoto.py index e51be64c..0f54312c 100644 --- a/soil_analysis/tests/domain/valueobject/photo/test_iphonephoto.py +++ b/soil_analysis/tests/domain/valueobject/photo/test_iphonephoto.py @@ -1,3 +1,4 @@ +import os from unittest import TestCase from soil_analysis.domain.valueobject.capturelocation import CaptureLocation @@ -6,8 +7,9 @@ class TestIphonePhoto(TestCase): def setUp(self): - self.file_path = r"D:/OneDrive/dev/soil_analysisローカルデータ/サンプルデータ/iphone/IMG_1315_left.jpeg" - self.iphone_photo = IphonePhoto(self.file_path) + script_directory = os.path.dirname(os.path.abspath(__file__)) + self.file_path = r"./iphone/IMG_1315_left.jpeg" + self.iphone_photo = IphonePhoto(os.path.join(script_directory, self.file_path)) self.iphone_photo.exif_data = self.iphone_photo._extract_exif_data() def test_extract_date(self):