diff --git a/lib/services/raw_capture_service.dart b/lib/services/raw_capture_service.dart index 545858b..338c256 100644 --- a/lib/services/raw_capture_service.dart +++ b/lib/services/raw_capture_service.dart @@ -125,16 +125,6 @@ /// DNG ファイルのバイト数(書き込み確認用). final int dngFileSize; - /// 縮小プレビュー JPEG の絶対パス. - /// - /// Kotlin 側でプレビュー生成に失敗した場合は null. - final String? previewPath; - - /// プレビュー JPEG のバイト数. - /// - /// Kotlin 側でプレビュー生成に失敗した場合は null. - final int? previewFileSize; - /// 撮影メタデータ(設定値・実測値・センサ特性など). final Map metadata; @@ -150,8 +140,6 @@ const QuantitativeCaptureResult({ required this.dngPath, required this.dngFileSize, - this.previewPath, - this.previewFileSize, required this.metadata, this.lscMap, this.lscMapRowCount, @@ -163,9 +151,6 @@ final dngPath = map['dngPath'] as String; final dngFileSize = (map['dngFileSize'] as num).toInt(); - final previewPath = map['previewPath'] as String?; - final previewFileSize = (map['previewFileSize'] as num?)?.toInt(); - final rawMetadata = map['metadata']; final metadata = (_deepConvert(rawMetadata) as Map?) ?? {}; @@ -184,8 +169,6 @@ return QuantitativeCaptureResult( dngPath: dngPath, dngFileSize: dngFileSize, - previewPath: previewPath, - previewFileSize: previewFileSize, metadata: metadata, lscMap: lscMap, lscMapRowCount: lscMapRowCount, diff --git a/test/services/raw_capture_service_test.dart b/test/services/raw_capture_service_test.dart index 3b0c729..f63ccbf 100644 --- a/test/services/raw_capture_service_test.dart +++ b/test/services/raw_capture_service_test.dart @@ -138,78 +138,5 @@ expect(row[1], closeTo(2.0, 0.0001)); expect(row[2], closeTo(3.14, 0.0001)); }); - - // --- previewPath / previewFileSize 関連テスト --- - - test('previewPath と previewFileSize が両方 non-null の場合,フィールドに値がセットされる', () { - final map = { - 'dngPath': '/test.dng', - 'dngFileSize': 16000000, - 'metadata': {}, - 'previewPath': '/storage/emulated/0/Pictures/MiniTIAS/test.preview.jpg', - 'previewFileSize': 204800, - }; - final result = QuantitativeCaptureResult.fromMap(map); - expect( - result.previewPath, - '/storage/emulated/0/Pictures/MiniTIAS/test.preview.jpg', - ); - expect(result.previewFileSize, 204800); - expect(result.previewFileSize, isA()); - }); - - test('previewPath が null の場合,previewPath は null になる', () { - final map = { - 'dngPath': '/test.dng', - 'dngFileSize': 16000000, - 'metadata': {}, - 'previewPath': null, - 'previewFileSize': null, - }; - final result = QuantitativeCaptureResult.fromMap(map); - expect(result.previewPath, isNull); - expect(result.previewFileSize, isNull); - }); - - test( - 'map に previewPath / previewFileSize キー自体が存在しない場合でも fromMap が成功し両フィールドが null になる', - () { - // 後方互換: プレビュー生成前の Kotlin が返す map にキーが存在しない場合 - final map = { - 'dngPath': '/test.dng', - 'dngFileSize': 16000000, - 'metadata': {}, - }; - final result = QuantitativeCaptureResult.fromMap(map); - expect(result.previewPath, isNull); - expect(result.previewFileSize, isNull); - }, - ); - - test('previewFileSize が int 直接でも num 経由でも正しく int に変換される', () { - // int 直接のケース - final mapInt = { - 'dngPath': '/test.dng', - 'dngFileSize': 100, - 'metadata': {}, - 'previewPath': '/test.preview.jpg', - 'previewFileSize': 204800, // Dart int - }; - final resultInt = QuantitativeCaptureResult.fromMap(mapInt); - expect(resultInt.previewFileSize, 204800); - expect(resultInt.previewFileSize, isA()); - - // num (double) 経由のケース - final mapDouble = { - 'dngPath': '/test.dng', - 'dngFileSize': 100, - 'metadata': {}, - 'previewPath': '/test.preview.jpg', - 'previewFileSize': 204800.0, // double として渡される場合 - }; - final resultDouble = QuantitativeCaptureResult.fromMap(mapDouble); - expect(resultDouble.previewFileSize, 204800); - expect(resultDouble.previewFileSize, isA()); - }); }); }