Skip to content

Lightpanda: the headless browser designed for AI and automation

update tests

Halil Duraka481cd7c4077
diff --git a/src/network/adblock/NetworkFilter.zig b/src/network/adblock/NetworkFilter.zig
index 7ded503bb..dbc2c613a 100644
--- a/src/network/adblock/NetworkFilter.zig
+++ b/src/network/adblock/NetworkFilter.zig
@@ -736,27 +736,24 @@ test "adblock.NetworkFilter: anchors and pattern kinds" {
var f = try testParse(arena, "/banner/ads.");
try testing.expectEqual(.plain, f.kind);
- try testing.expectString("/banner/ads.", f.pattern);
+ try testing.expectString("", f.hostname);
// Starting AND ending with '/' means regex, not path substring — lists
// write "*/banner/" or "/banner/*" to force substring semantics.
f = try testParse(arena, "/banner/ads/");
try testing.expectEqual(.regex, f.kind);
- try testing.expectString("banner/ads", f.pattern);
f = try testParse(arena, "|https://ads.");
try testing.expectEqual(.plain, f.kind);
try testing.expect(f.left_anchor);
- try testing.expectString("https://ads.", f.pattern);
f = try testParse(arena, "-Ad-300x250.gif|");
+ try testing.expectEqual(.plain, f.kind);
try testing.expect(f.right_anchor);
- try testing.expectString("-ad-300x250.gif", f.pattern);
f = try testParse(arena, "||example.com/ads/*.js");
try testing.expectEqual(.wildcard, f.kind);
try testing.expectString("example.com", f.hostname);
- try testing.expectString("/ads/*.js", f.pattern);
f = try testParse(arena, "/ads/banner^");
try testing.expectEqual(.wildcard, f.kind);
@@ -765,7 +762,6 @@ test "adblock.NetworkFilter: anchors and pattern kinds" {
f = try testParse(arena, "*-ads-*|");
try testing.expectEqual(.plain, f.kind);
try testing.expect(!f.right_anchor);
- try testing.expectString("-ads-", f.pattern);
// A pattern that trims down to a bare hostname shape gets promoted
// (uBO flavor rules), even a single label.
@@ -787,12 +783,10 @@ test "adblock.NetworkFilter: regex literals" {
var f = try testParse(arena, "/banner\\d+/");
try testing.expectEqual(.regex, f.kind);
- try testing.expectString("banner\\d+", f.pattern);
// '$' inside a regex must not be mistaken for an options separator.
f = try testParse(arena, "/ads\\$/");
try testing.expectEqual(.regex, f.kind);
- try testing.expectString("ads\\$", f.pattern);
// ... but a real options list after a regex still splits.
f = try testParse(arena, "/^https?:.*banner/$image");
@@ -877,10 +871,7 @@ test "adblock.NetworkFilter: domain option" {
const arena = arena_state.allocator();
const f = try testParse(arena, "||ads.com^$script,domain=news.com|~sports.news.com|google.*");
- try testing.expectEqual(2, f.domains.included.len);
- try testing.expectEqual(1, f.domains.excluded.len);
- try testing.expectString("news.com", f.domains.included[0].value);
- try testing.expect(f.domains.included[1].entity);
+ try testing.expect(f.has_domains);
try testing.expectError(error.InvalidOption, testParse(arena, "||ads.com^$domain="));
try testing.expectError(error.NoSupportedDomains, testParse(arena, "||ads.com^$domain=/re/"));
@@ -919,6 +910,7 @@ test "adblock.NetworkFilter: unsupported and modifier options" {
// $redirect keeps its blocking half; the directive itself is ignored.
var f = try testParse(arena, "||ads.com/ad.js$script,redirect=noopjs");
try testing.expect(f.types.script);
+ try testing.expectEqual(.plain, f.kind);
try testing.expectString("ads.com", f.hostname);
f = try testParse(arena, "||ads.com/v.mp4$mp4");
diff --git a/src/network/adblock/domain.zig b/src/network/adblock/domain.zig
index 5b4e73b86..90b4d500d 100644
--- a/src/network/adblock/domain.zig
+++ b/src/network/adblock/domain.zig
@@ -85,46 +85,16 @@ pub fn lowered(arena: std.mem.Allocator, s: []const u8) ![]const u8 {
const testing = @import("../../testing.zig");
test "adblock.domain: plain, negated and entity entries" {
- var arena_state = std.heap.ArenaAllocator.init(testing.allocator);
- defer arena_state.deinit();
- const arena = arena_state.allocator();
-
- const list = try parse(arena, "example.com|~sub.Example.com|google.*", '|');
- try testing.expectEqual(2, list.included.len);
- try testing.expectEqual(1, list.excluded.len);
- try testing.expectString("example.com", list.included[0].value);
- try testing.expect(!list.included[0].entity);
- try testing.expectString("google", list.included[1].value);
- try testing.expect(list.included[1].entity);
- try testing.expectString("sub.example.com", list.excluded[0].value);
-}
-
-test "adblock.domain: comma separator (cosmetic prefixes)" {
- var arena_state = std.heap.ArenaAllocator.init(testing.allocator);
- defer arena_state.deinit();
-
- const list = try parse(arena_state.allocator(), "a.com,~b.a.com", ',');
- try testing.expectEqual(1, list.included.len);
- try testing.expectEqual(1, list.excluded.len);
+ try validate("example.com|~sub.Example.com|google.*");
}
test "adblock.domain: regex entries are skipped, all-regex errors" {
- var arena_state = std.heap.ArenaAllocator.init(testing.allocator);
- defer arena_state.deinit();
- const arena = arena_state.allocator();
-
- const list = try parse(arena, "/foo/|example.com", '|');
- try testing.expectEqual(1, list.included.len);
-
- try testing.expectError(error.NoSupportedDomains, parse(arena, "/foo/", '|'));
+ try validate("/foo/|example.com");
+ try testing.expectError(error.NoSupportedDomains, validate("/foo/"));
}
test "adblock.domain: invalid entries" {
- var arena_state = std.heap.ArenaAllocator.init(testing.allocator);
- defer arena_state.deinit();
- const arena = arena_state.allocator();
-
- try testing.expectError(error.InvalidDomainList, parse(arena, "exa mple.com", '|'));
- try testing.expectError(error.InvalidDomainList, parse(arena, ".example.com", '|'));
- try testing.expectError(error.InvalidDomainList, parse(arena, "~", '|'));
+ try testing.expectError(error.InvalidDomainList, validate("exa mple.com"));
+ try testing.expectError(error.InvalidDomainList, validate(".example.com"));
+ try testing.expectError(error.InvalidDomainList, validate("~"));
}