Add tests for core

didarul-codes · didarul-codes · commit edea99878904 · 2025-02-21T23:57:57.000+08:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,4 +23,7 @@ jobs:
         run: flutter pub get
 
       - name: Run tests
-        run: flutter test
+        run: |
+          flutter test
+          cd packages/adblocker_core && flutter test
+          cd ../adblocker_manager && flutter test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
-## 1.2.0
-* Added support for HTML string loading
+## 2.0.0-beta
+* Added support for easylist and adguard filters
+* Added support for resource rules parsing
+* Removed third party package dependency and using official webview_flutter package
+
+**Breaking Changes**
+* Minimum Supported flutter version is 3.27.1
+* Minimum Supported dart version is 3.7.0
 
 ## 1.1.2
 * Removed redundant isolate uses
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -1,20 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  adblocker_core:
-    dependency: transitive
-    description:
-      path: "../packages/adblocker_core"
-      relative: true
-    source: path
-    version: "0.0.3"
-  adblocker_manager:
-    dependency: transitive
-    description:
-      path: "../packages/adblocker_manager"
-      relative: true
-    source: path
-    version: "0.0.1"
   adblocker_webview:
     dependency: "direct main"
     description:
@@ -479,4 +465,4 @@ packages:
     version: "1.1.0"
 sdks:
   dart: ">=3.7.0 <4.0.0"
-  flutter: ">=3.27.1"
+  flutter: ">=3.24.0"
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
diff --git a/lib/src/adblocker_webview_controller.dart b/lib/src/adblocker_webview_controller.dart
@@ -69,4 +69,7 @@ abstract interface class AdBlockerWebviewController
 
   /// Reloads the current page
   Future<void> reload();
+
+  /// Runs the given script
+  Future<void> runScript(String script);
 }
diff --git a/lib/src/adblocker_webview_controller_impl.dart b/lib/src/adblocker_webview_controller_impl.dart
@@ -118,4 +118,13 @@ class AdBlockerWebviewControllerImpl implements AdBlockerWebviewController {
 
     return _webViewController!.reload();
   }
+
+  @override
+  Future<void> runScript(String script) async {
+    if (_webViewController == null) {
+      return;
+    }
+
+    return _webViewController!.runJavaScript(script);
+  }
 }
diff --git a/packages/adblocker_core/CHANGELOG.md b/packages/adblocker_core/CHANGELOG.md
@@ -1,19 +1,3 @@
-## 0.0.3
+## 0.1.0
 
-* Added support for domain-based resource blocking
-* Improved CSS rule filtering for domains and subdomains
-* Enhanced element hiding mechanism
-* Added logging for blocked resources and hidden elements
-
-## 0.0.2
-
-* Added support for EasyList and AdGuard filter formats
-* Implemented resource blocking rules parser
-* Added CSS element hiding rules parser
-* Added filter initialization with built-in filter lists
-
-## 0.0.1
-
-* Initial release with basic ad-blocking functionality
-* Support for basic URL pattern matching
-* Basic element hiding support
+* Initial release with basic rules parsing
diff --git a/packages/adblocker_core/lib/src/adblocker_filter_impl.dart b/packages/adblocker_core/lib/src/adblocker_filter_impl.dart
@@ -41,9 +41,7 @@ class AdblockerFilterImpl implements AdblockerFilter {
 
     applicableExceptionRules.keys.forEach(applicableRules.remove);
 
-    return applicableRules
-      ..add('.ads')
-      ..add('#anchor-container');
+    return applicableRules;
   }
 
   @override
diff --git a/packages/adblocker_core/pubspec.yaml b/packages/adblocker_core/pubspec.yaml
@@ -1,6 +1,6 @@
 name: adblocker_core
 description: "Core package for adblocker webview"
-version: 0.0.3
+version: 0.1.0
 homepage: "none"
 
 environment:
@@ -11,5 +11,8 @@ resolution: workspace
 dependencies:
   flutter:
     sdk: flutter
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
 
 
diff --git a/packages/adblocker_core/test/adblocker_core_test.dart b/packages/adblocker_core/test/adblocker_core_test.dart
diff --git a/packages/adblocker_core/test/adblocker_filter_test.dart b/packages/adblocker_core/test/adblocker_filter_test.dart
@@ -0,0 +1,77 @@
+import 'package:adblocker_core/src/adblocker_filter.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('AdBlockerFilter', () {
+    late AdblockerFilter filter;
+
+    setUp(() async {
+      filter = AdblockerFilter.createInstance();
+      await filter.init('''
+        ! Test filter list
+        ||ads.example.com^
+        ||tracker.com^
+        @@||whitelist.example.com^
+        example.com##.ad-banner
+        test.com##.sponsored
+        ~news.com##.advertisement
+      ''');
+    });
+
+    group('Resource blocking', () {
+      test('blocks matching URLs', () {
+        expect(
+          filter.shouldBlockResource('https://ads.example.com/banner.jpg'),
+          isTrue,
+        );
+        expect(
+          filter.shouldBlockResource('https://tracker.com/pixel.gif'),
+          isTrue,
+        );
+      });
+
+      test('allows non-matching URLs', () {
+        expect(
+          filter.shouldBlockResource('https://example.com/image.jpg'),
+          isFalse,
+        );
+      });
+
+      test('respects exception rules', () {
+        expect(
+          filter.shouldBlockResource('https://whitelist.example.com/ads.js'),
+          isFalse,
+        );
+      });
+    });
+
+    group('CSS rules', () {
+      test('returns rules for matching domain', () {
+        final rules = filter.getCSSRulesForWebsite('https://example.com');
+        expect(rules, contains('.ad-banner'));
+      });
+
+      test('returns rules for multiple domains', () {
+        final rules = filter.getCSSRulesForWebsite('https://test.com');
+        expect(rules, contains('.sponsored'));
+      });
+
+      test('respects domain exclusions', () {
+        final rules = filter.getCSSRulesForWebsite('https://news.com');
+        expect(rules, isNot(contains('.advertisement')));
+      });
+
+      test('returns empty list for non-matching domain', () {
+        final rules = filter.getCSSRulesForWebsite('https://random.com');
+        expect(rules, isEmpty);
+      });
+    });
+
+    test('getAllResourceRules returns all resource rules', () {
+      final rules = filter.getAllResourceRules();
+      expect(rules, hasLength(3)); // 2 block rules + 1 exception rule
+      expect(rules.where((rule) => !rule.isException), hasLength(2));
+      expect(rules.where((rule) => rule.isException), hasLength(1));
+    });
+  });
+}
diff --git a/packages/adblocker_core/test/css_rules_parser_test.dart b/packages/adblocker_core/test/css_rules_parser_test.dart
@@ -0,0 +1,55 @@
+import 'package:adblocker_core/src/parser/css_rules_parser.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('CSSRulesParser', () {
+    late CSSRulesParser parser;
+
+    setUp(() {
+      parser = CSSRulesParser();
+    });
+
+    test('parses basic element hiding rules', () {
+      const rule = '##.ad-banner';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNotNull);
+      expect(result?.selector, equals('.ad-banner'));
+      expect(result?.domain, isEmpty);
+    });
+
+    test('parses domain-specific rules', () {
+      const rule = 'example.com##.ad-banner';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNotNull);
+      expect(result?.selector, equals('.ad-banner'));
+      expect(result?.domain, contains('example.com'));
+      expect(result?.domain, isNot(contains('test.com')));
+    });
+
+    test('parses multiple domain rules', () {
+      const rule = 'example.com,test.com##.ad-banner';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNotNull);
+      expect(result?.selector, equals('.ad-banner'));
+      expect(result?.domain, contains('example.com'));
+      expect(result?.domain, contains('test.com'));
+    });
+
+    test('ignores comment lines', () {
+      const rule = '! This is a comment';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNull);
+    });
+
+    test('ignores empty lines', () {
+      const rule = '';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNull);
+    });
+  });
+}
diff --git a/packages/adblocker_core/test/resource_rules_parser_test.dart b/packages/adblocker_core/test/resource_rules_parser_test.dart
@@ -0,0 +1,51 @@
+import 'package:adblocker_core/src/parser/resource_rules_parser.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  group('ResourceRulesParser', () {
+    late ResourceRulesParser parser;
+
+    setUp(() {
+      parser = ResourceRulesParser();
+    });
+
+    test('parses domain anchor rules correctly', () {
+      const rule = '||ads.example.com^';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNotNull);
+      expect(result?.url, equals('ads.example.com'));
+      expect(result?.isException, isFalse);
+    });
+
+    test('parses exception rules correctly', () {
+      const rule = '@@||ads.example.com^';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNotNull);
+      expect(result?.url, equals('ads.example.com'));
+      expect(result?.isException, isTrue);
+    });
+
+    test('ignores comment lines', () {
+      const rule = '! This is a comment';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNull);
+    });
+
+    test('ignores empty lines', () {
+      const rule = '';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNull);
+    });
+
+    test('ignores invalid rules', () {
+      const rule = 'not a valid rule';
+      final result = parser.parseLine(rule);
+
+      expect(result, isNull);
+    });
+  });
+}
diff --git a/packages/adblocker_manager/CHANGELOG.md b/packages/adblocker_manager/CHANGELOG.md
@@ -1,5 +1,5 @@
-## 0.0.1
+## 1.0.0
 
 * Initial release
 * Support for EasyList and AdGuard filters
-* Aggregation of blocking decisions and CSS rules 
+* Aggregation of blocking decisions and CSS rules parsing
diff --git a/packages/adblocker_manager/pubspec.yaml b/packages/adblocker_manager/pubspec.yaml
@@ -1,6 +1,6 @@
 name: adblocker_manager
 description: "Manager package for handling multiple ad-blocking filters"
-version: 0.0.1
+version: 1.0.0
 homepage: "none"
 
 environment:
@@ -10,8 +10,7 @@ environment:
 resolution: workspace
 
 dependencies:
-  adblocker_core:
-    path: ../adblocker_core
+  adblocker_core: ^0.1.0
   flutter:
     sdk: flutter
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -13,8 +13,7 @@ workspace:
   - packages/adblocker_manager
 
 dependencies:
-  adblocker_manager:
-    path: packages/adblocker_manager
+  adblocker_manager: ^1.0.0
   flutter:
     sdk: flutter
 
diff --git a/test/adblocker_webview_test.dart b/test/adblocker_webview_test.dart
diff --git a/test/fakes/fake_adblocker_repository_impl.dart b/test/fakes/fake_adblocker_repository_impl.dart

Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,7 @@ abstract interface class AdBlockerWebviewController`
`69`	`69`
`70`	`70`	`/// Reloads the current page`
`71`	`71`	`Future<void> reload();`
	`72`	`+`
	`73`	`+ /// Runs the given script`
	`74`	`+ Future<void> runScript(String script);`
`72`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,4 +118,13 @@ class AdBlockerWebviewControllerImpl implements AdBlockerWebviewController {`
`118`	`118`
`119`	`119`	`return _webViewController!.reload();`
`120`	`120`	`}`
	`121`	`+`
	`122`	`+ @override`
	`123`	`+ Future<void> runScript(String script) async {`
	`124`	`+ if (_webViewController == null) {`
	`125`	`+ return;`
	`126`	`+ }`
	`127`	`+`
	`128`	`+ return _webViewController!.runJavaScript(script);`
	`129`	`+ }`
`121`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,7 @@ class AdblockerFilterImpl implements AdblockerFilter {`
`41`	`41`
`42`	`42`	`applicableExceptionRules.keys.forEach(applicableRules.remove);`
`43`	`43`
`44`		`- return applicableRules`
`45`		`- ..add('.ads')`
`46`		`- ..add('#anchor-container');`
	`44`	`+ return applicableRules;`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`@override`