. t coverage code 97% by tests, need to add tests for diff tool: wind…

…ows and linux, android studio for mac

lib/approval_tests.dart

@@ -22,9 +22,7 @@ part 'src/core/scrubber.dart';
 part 'src/core/utils/converter.dart';
 part 'src/core/utils/executable_query.dart';
 part 'src/core/utils/utils.dart';
-part 'src/exceptions/command_line_comparator_exception.dart';
 part 'src/exceptions/doesnt_match_exception.dart';
-part 'src/exceptions/ide_comparator_exception.dart';
 part 'src/namer/file_namer_options.dart';
 part 'src/namer/namer.dart';
 part 'src/reporters/command_line/command_line_reporter.dart';
@@ -35,3 +33,7 @@ part 'src/scrubbers/date_scrubber.dart';
 part 'src/scrubbers/nothing_scrubber.dart';
 part 'src/scrubbers/reg_exp_scrubber.dart';
 part 'src/writers/approval_text_writer.dart';
+part 'src/core/stack_trace_fetcher/stack_trace_fetcher.dart';
+part 'src/core/file_path_extractor.dart';
+part 'src/exceptions/file_not_found_exception.dart';
+part 'src/core/stack_trace_fetcher/fetcher.dart';

lib/src/approvals.dart

@@ -2,6 +2,8 @@ part of '../approval_tests.dart';
 
 /// `Approvals` is a class that provides methods to verify the content of a response.
 class Approvals {
+  static const FilePathExtractor filePathExtractor = FilePathExtractor(stackTraceFetcher: StackTraceFetcher());
+
   // Factory method to create an instance of ApprovalNamer with given file name
   static ApprovalNamer makeNamer(String filePath) => Namer(filePath: filePath);
 
@@ -14,7 +16,7 @@ class Approvals {
   }) {
     try {
       // Get the file path without extension or use the provided file path
-      final completedPath = options.namer?.filePath ?? ApprovalUtils.filePath.split('.dart').first;
+      final completedPath = options.namer?.filePath ?? filePathExtractor.filePath.split('.dart').first;
 
       // Create namer object with given or computed file name
       final namer = options.namer ?? makeNamer(completedPath);
@@ -69,7 +71,7 @@ class Approvals {
         ApprovalUtils.deleteFile(options.namer!.received);
       } else {
         ApprovalUtils.deleteFile(
-          Namer(filePath: ApprovalUtils.filePath.split('.dart').first).received,
+          Namer(filePath: filePathExtractor.filePath.split('.dart').first).received,
         );
       }
     }

lib/src/core/file_path_extractor.dart

@@ -0,0 +1,30 @@
+part of '../../approval_tests.dart';
+
+class FilePathExtractor {
+  final IStackTraceFetcher _stackTraceFetcher;
+
+  const FilePathExtractor({
+    IStackTraceFetcher? stackTraceFetcher,
+  }) : _stackTraceFetcher = stackTraceFetcher ?? const StackTraceFetcher();
+
+  String get filePath {
+    try {
+      final stackTraceString = _stackTraceFetcher.currentStackTrace;
+      final uriRegExp = RegExp(r'file:\/\/\/([^\s:]+)');
+
+      final match = uriRegExp.firstMatch(stackTraceString);
+
+      if (match != null) {
+        final filePath = Uri.tryParse('file:///${match.group(1)!}');
+        return filePath!.toFilePath();
+      } else {
+        throw FileNotFoundException(
+          message: 'File not found in stack trace',
+          stackTrace: StackTrace.current,
+        );
+      }
+    } catch (e) {
+      rethrow;
+    }
+  }
+}

lib/src/core/options.dart

@@ -17,6 +17,9 @@ class Options {
   /// A final bool variable `deleteReceivedFile` used to determine if the received file should be deleted after passed test.
   final bool deleteReceivedFile;
 
+  /// A final bool variable `deleteApprovedFile` used to determine if the approved file should be deleted after passed test.
+  final bool deleteApprovedFile;
+
   /// A final variable `namer` of type `Namer` used to set the name and path of the file.
   final Namer? namer;
 
@@ -33,6 +36,7 @@ class Options {
     this.comparator = const FileComparator(),
     this.reporter = const CommandLineReporter(),
     this.deleteReceivedFile = false,
+    this.deleteApprovedFile = false,
     this.namer,
     this.logErrors = true,
     this.logResults = true,

lib/src/core/stack_trace_fetcher/fetcher.dart

@@ -0,0 +1,6 @@
+part of '../../../approval_tests.dart';
+
+/// Interface for fetching the current stack trace.
+abstract interface class IStackTraceFetcher {
+  String get currentStackTrace;
+}

lib/src/core/stack_trace_fetcher/stack_trace_fetcher.dart

@@ -0,0 +1,9 @@
+part of '../../../approval_tests.dart';
+
+/// A class that provides the current stack trace.
+final class StackTraceFetcher implements IStackTraceFetcher {
+  const StackTraceFetcher();
+
+  @override
+  String get currentStackTrace => StackTrace.current.toString();
+}

lib/src/core/utils/utils.dart

@@ -7,8 +7,7 @@ final class ApprovalUtils {
     final int green = int.parse(hex.substring(2, 4), radix: 16);
     final int blue = int.parse(hex.substring(4, 6), radix: 16);
 
-    final AnsiPen pen = AnsiPen()
-      ..rgb(r: red / 255, g: green / 255, b: blue / 255);
+    final AnsiPen pen = AnsiPen()..rgb(r: red / 255, g: green / 255, b: blue / 255);
     return pen;
   }
 
@@ -25,21 +24,6 @@ final class ApprovalUtils {
     }
   }
 
-  // Property that gets the file path of the current file.
-  static String get filePath {
-    final stackTraceString = StackTrace.current.toString();
-    final uriRegExp = RegExp(r'file:\/\/\/([^:]*):');
-
-    final match = uriRegExp.firstMatch(stackTraceString);
-
-    if (match != null) {
-      final filePath = Uri.tryParse(match.group(0)!);
-      return filePath!.toFilePath();
-    } else {
-      throw Exception('Could not find file path');
-    }
-  }
-
   static String readFile({
     required String path,
   }) {

lib/src/exceptions/file_not_found_exception.dart

@@ -0,0 +1,12 @@
+part of '../../approval_tests.dart';
+
+class FileNotFoundException implements Exception {
+  final String message;
+
+  final StackTrace? stackTrace;
+
+  FileNotFoundException({
+    required this.message,
+    this.stackTrace,
+  });
+}

test/approval_test.dart

@@ -10,6 +10,7 @@ import 'queries/db_request_query.dart';
 
 part 'utils/helper.dart';
 part 'constants/lines.dart';
+part 'utils/testable_file_path_extractor.dart';
 
 void main() {
   /// ================== Init fields ==================
@@ -38,6 +39,7 @@ void main() {
       helper.verify(
         'Hello World',
         'verify',
+        approveResult: true,
       );
     });
 
@@ -116,7 +118,7 @@ void main() {
       ApprovalLogger.log("$lines25 Group: Minor cases are starting $lines25");
     });
 
-    test('Simulate file not found error during comparison. Must throw CommandLineComparatorException.', () async {
+    test('Simulate file not found error during comparison. Must throw PathNotFoundException.', () async {
       const comparator = FileComparator();
 
       // Setup: paths to non-existent files
@@ -226,6 +228,39 @@ void main() {
         deleteReceivedFile: false,
       );
     });
+
+    test('returns correct file path', () {
+      const fakeStackTraceFetcher = FakeStackTraceFetcher('file:///path/to/file.dart:10:11\nother stack trace lines...');
+
+      const filePathExtractor = FilePathExtractor(stackTraceFetcher: fakeStackTraceFetcher);
+      final filePath = filePathExtractor.filePath;
+
+      expect(filePath, '/path/to/file.dart');
+      ApprovalLogger.success(
+        "Test Passed: Successfully extracted the file path from the stack trace.",
+      );
+    });
+
+    test('throws FileNotFoundException when no file path in stack trace', () {
+      const fakeStackTraceFetcher = FakeStackTraceFetcher('no file path in this stack trace\nother stack trace lines...');
+
+      const filePathExtractor = FilePathExtractor(stackTraceFetcher: fakeStackTraceFetcher);
+
+      expect(() => filePathExtractor.filePath, throwsA(isA<FileNotFoundException>()));
+
+      ApprovalLogger.success(
+        "Test Passed: Successfully handled a file not found error during comparison.",
+      );
+    });
+
+    test('verify without namer', () {
+      Approvals.verify(
+        'Hello World',
+        options: const Options(
+          deleteReceivedFile: true,
+        ),
+      );
+    });
   });
 
   /// ================== Tear down ==================

test/approval_test.verify_without_namer.approved.txt

@@ -0,0 +1 @@
+Hello World

test/utils/testable_file_path_extractor.dart

@@ -0,0 +1,11 @@
+part of '../approval_test.dart';
+
+/// `FakeStackTraceFetcher` is a fake implementation of [IStackTraceFetcher] that needs to be used in tests.
+class FakeStackTraceFetcher implements IStackTraceFetcher {
+  final String stackTrace;
+
+  const FakeStackTraceFetcher(this.stackTrace);
+
+  @override
+  String get currentStackTrace => stackTrace;
+}