GithubFollow/Surge_by_SukkaW
1
0
Fork 0
mirror of https://github.com/SukkaW/Surge.git synced 2026-03-15 15:36:42 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Chore: repalce expect w/ earl

Browse Source
This commit is contained in:
SukkaW
2026-02-26 01:26:39 +08:00
parent ab421f007c
commit 19713c168b
5 changed files with 112 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Build/lib/create-file.test.ts
View File

@@ -1,4 +1,4 @@
import { expect } from 'expect';
import { expect } from 'earl';
import { fileEqual } from './create-file';
// eslint-disable-next-line @typescript-eslint/require-await -- async iterable
@@ -9,7 +9,7 @@ async function *createSource(input: string[]) {
}
async function test(a: string[], b: string[], expected: boolean) {
expect((await fileEqual(a, createSource(b)))).toBe(expected);
expect((await fileEqual(a, createSource(b)))).toEqual(expected);
}
describe('fileEqual', () => {

4
Build/lib/process-line.test.ts
View File

@@ -1,7 +1,7 @@
import { describe, it } from 'mocha';
import { processLine } from './process-line';
import { expect } from 'expect';
import { expect } from 'earl';
describe('processLine', () => {
([
@@ -16,7 +16,7 @@ describe('processLine', () => {
['##### EOF', null]
] as const).forEach(([input, expected]) => {
it(input, () => {
expect(processLine(input)).toBe(expected);
expect(processLine(input)).toEqual(expected);
});
});
});

174
Build/lib/trie.test.ts
View File

@@ -1,5 +1,5 @@
import { describe, it } from 'mocha';
import { expect } from 'expect';
import { expect } from 'earl';
import { HostnameSmolTrie, HostnameTrie } from './trie';
function createTrie<Meta = any>(from: string[] | Set<string> | null, smolTree: true): HostnameSmolTrie<Meta>;
@@ -13,7 +13,7 @@ function createTrie<_Meta = any>(from?: string[] | Set<string> | null, smolTree
// describe('hostname to tokens', () => {
// it('should split hostname into tokens.', () => {
// expect(hostnameToTokens('.blog.skk.moe')).toStrictEqual([
// expect(hostnameToTokens('.blog.skk.moe')).toEqual([
// '.',
// 'blog',
// '.',
@@ -22,7 +22,7 @@ function createTrie<_Meta = any>(from?: string[] | Set<string> | null, smolTree
// 'moe'
// ]);
// expect(hostnameToTokens('blog.skk.moe')).toStrictEqual([
// expect(hostnameToTokens('blog.skk.moe')).toEqual([
// 'blog',
// '.',
// 'skk',
@@ -30,13 +30,13 @@ function createTrie<_Meta = any>(from?: string[] | Set<string> | null, smolTree
// 'moe'
// ]);
// expect(hostnameToTokens('skk.moe')).toStrictEqual([
// expect(hostnameToTokens('skk.moe')).toEqual([
// 'skk',
// '.',
// 'moe'
// ]);
// expect(hostnameToTokens('moe')).toStrictEqual([
// expect(hostnameToTokens('moe')).toEqual([
// 'moe'
// ]);
// });
@@ -50,14 +50,14 @@ describe('Trie', () => {
trie.add('skk.moe');
trie.add('anotherskk.moe');
expect(trie.size).toBe(3);
expect(trie.size).toEqual(3);
expect(trie.has('a.skk.moe')).toBe(true);
expect(trie.has('skk.moe')).toBe(true);
expect(trie.has('anotherskk.moe')).toBe(true);
expect(trie.has('example.com')).toBe(false);
expect(trie.has('skk.mo')).toBe(false);
expect(trie.has('another.skk.moe')).toBe(false);
expect(trie.has('a.skk.moe')).toEqual(true);
expect(trie.has('skk.moe')).toEqual(true);
expect(trie.has('anotherskk.moe')).toEqual(true);
expect(trie.has('example.com')).toEqual(false);
expect(trie.has('skk.mo')).toEqual(false);
expect(trie.has('another.skk.moe')).toEqual(false);
});
it('adding the same item several times should not increase size.', () => {
@@ -68,19 +68,19 @@ describe('Trie', () => {
// eslint-disable-next-line sukka/no-element-overwrite -- deliberately do testing
trie.add('skk.moe');
expect(trie.size).toBe(2);
expect(trie.has('skk.moe')).toBe(true);
expect(trie.size).toEqual(2);
expect(trie.has('skk.moe')).toEqual(true);
});
it('should be possible to set the null sequence.', () => {
const trie = createTrie(null, false);
trie.add('');
expect(trie.has('')).toBe(true);
expect(trie.has('')).toEqual(true);
const trie2 = createTrie(null, true);
trie2.add('');
expect(trie2.has('')).toBe(true);
expect(trie2.has('')).toEqual(true);
});
it('should be possible to delete items.', () => {
@@ -91,19 +91,19 @@ describe('Trie', () => {
trie.add('example.com');
trie.add('moe.sb');
expect(trie.delete('no-match.com')).toBe(false);
expect(trie.delete('example.org')).toBe(false);
expect(trie.delete('no-match.com')).toEqual(false);
expect(trie.delete('example.org')).toEqual(false);
expect(trie.delete('skk.moe')).toBe(true);
expect(trie.has('skk.moe')).toBe(false);
expect(trie.has('moe.sb')).toBe(true);
expect(trie.delete('skk.moe')).toEqual(true);
expect(trie.has('skk.moe')).toEqual(false);
expect(trie.has('moe.sb')).toEqual(true);
expect(trie.size).toBe(3);
expect(trie.size).toEqual(3);
expect(trie.delete('example.com')).toBe(true);
expect(trie.size).toBe(2);
expect(trie.delete('moe.sb')).toBe(true);
expect(trie.size).toBe(1);
expect(trie.delete('example.com')).toEqual(true);
expect(trie.size).toEqual(2);
expect(trie.delete('moe.sb')).toEqual(true);
expect(trie.size).toEqual(1);
});
it('should be possible to check the existence of a sequence in the Trie.', () => {
@@ -111,10 +111,10 @@ describe('Trie', () => {
trie.add('example.org.skk.moe');
expect(trie.has('example.org.skk.moe')).toBe(true);
expect(trie.has('skk.moe')).toBe(false);
expect(trie.has('example.org')).toBe(false);
expect(trie.has('')).toBe(false);
expect(trie.has('example.org.skk.moe')).toEqual(true);
expect(trie.has('skk.moe')).toEqual(false);
expect(trie.has('example.org')).toEqual(false);
expect(trie.has('')).toEqual(false);
});
it('should be possible to retrieve items matching the given prefix.', () => {
@@ -125,12 +125,12 @@ describe('Trie', () => {
trie.add('cdn.example.com');
trie.add('example.org');
expect(trie.find('example.com')).toStrictEqual(['example.com', 'cdn.example.com', 'blog.example.com']);
expect(trie.find('com')).toStrictEqual(['example.com', 'cdn.example.com', 'blog.example.com']);
expect(trie.find('.example.com')).toStrictEqual(['cdn.example.com', 'blog.example.com']);
expect(trie.find('org')).toStrictEqual(['example.org']);
expect(trie.find('example.net')).toStrictEqual([]);
expect(trie.dump()).toStrictEqual(['example.org', 'example.com', 'cdn.example.com', 'blog.example.com']);
expect(trie.find('example.com')).toEqual(['example.com', 'cdn.example.com', 'blog.example.com']);
expect(trie.find('com')).toEqual(['example.com', 'cdn.example.com', 'blog.example.com']);
expect(trie.find('.example.com')).toEqual(['cdn.example.com', 'blog.example.com']);
expect(trie.find('org')).toEqual(['example.org']);
expect(trie.find('example.net')).toEqual([]);
expect(trie.dump()).toEqual(['example.org', 'example.com', 'cdn.example.com', 'blog.example.com']);
});
it('should be possible to retrieve items matching the given prefix even with a smol trie', () => {
@@ -142,23 +142,23 @@ describe('Trie', () => {
trie.add('cdn.example.com');
trie.add('example.org');
expect(trie.find('example.com')).toStrictEqual(['.example.com']);
expect(trie.find('com')).toStrictEqual(['.example.com']);
expect(trie.find('.example.com')).toStrictEqual(['.example.com']);
expect(trie.find('org')).toStrictEqual(['example.org']);
expect(trie.find('example.net')).toStrictEqual([]);
expect(trie.dump()).toStrictEqual(['example.org', '.example.com']);
expect(trie.find('example.com')).toEqual(['.example.com']);
expect(trie.find('com')).toEqual(['.example.com']);
expect(trie.find('.example.com')).toEqual(['.example.com']);
expect(trie.find('org')).toEqual(['example.org']);
expect(trie.find('example.net')).toEqual([]);
expect(trie.dump()).toEqual(['example.org', '.example.com']);
});
it('should be possible to create a trie from an arbitrary iterable.', () => {
let trie = createTrie(['skk.moe', 'blog.skk.moe'], false);
expect(trie.size).toBe(2);
expect(trie.has('skk.moe')).toBe(true);
expect(trie.size).toEqual(2);
expect(trie.has('skk.moe')).toEqual(true);
trie = createTrie(new Set(['skk.moe', 'example.com']), false);
expect(trie.size).toBe(2);
expect(trie.has('skk.moe')).toBe(true);
expect(trie.size).toEqual(2);
expect(trie.has('skk.moe')).toEqual(true);
});
});
@@ -166,27 +166,27 @@ describe('surge domainset dedupe', () => {
it('should not remove same entry', () => {
const trie = createTrie(['.skk.moe', 'noc.one'], false);
expect(trie.find('.skk.moe')).toStrictEqual(['.skk.moe']);
expect(trie.find('noc.one')).toStrictEqual(['noc.one']);
expect(trie.find('.skk.moe')).toEqual(['.skk.moe']);
expect(trie.find('noc.one')).toEqual(['noc.one']);
});
it('should match subdomain - 1', () => {
const trie = createTrie(['www.noc.one', 'www.sukkaw.com', 'blog.skk.moe', 'image.cdn.skk.moe', 'cdn.sukkaw.net'], false);
expect(trie.find('.skk.moe')).toStrictEqual(['image.cdn.skk.moe', 'blog.skk.moe']);
expect(trie.find('.sukkaw.com')).toStrictEqual(['www.sukkaw.com']);
expect(trie.find('.skk.moe')).toEqual(['image.cdn.skk.moe', 'blog.skk.moe']);
expect(trie.find('.sukkaw.com')).toEqual(['www.sukkaw.com']);
});
it('should match subdomain - 2', () => {
const trie = createTrie(['www.noc.one', 'www.sukkaw.com', '.skk.moe', 'blog.skk.moe', 'image.cdn.skk.moe', 'cdn.sukkaw.net'], false);
expect(trie.find('.skk.moe')).toStrictEqual(['.skk.moe', 'image.cdn.skk.moe', 'blog.skk.moe']);
expect(trie.find('.sukkaw.com')).toStrictEqual(['www.sukkaw.com']);
expect(trie.find('.skk.moe')).toEqual(['.skk.moe', 'image.cdn.skk.moe', 'blog.skk.moe']);
expect(trie.find('.sukkaw.com')).toEqual(['www.sukkaw.com']);
});
it('should not remove non-subdomain', () => {
const trie = createTrie(['skk.moe', 'sukkaskk.moe'], false);
expect(trie.find('.skk.moe')).toStrictEqual([]);
expect(trie.find('.skk.moe')).toEqual([]);
});
});
@@ -202,7 +202,7 @@ describe('smol tree', () => {
'img.skk.local'
], true);
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local',
@@ -220,7 +220,7 @@ describe('smol tree', () => {
'.blog.sub.example.com', 'sub.example.com', 'cdn.sub.example.com', '.sub.example.com'
], true);
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'.sub.example.com',
'cdn.noc.one',
'www.noc.one',
@@ -233,7 +233,7 @@ describe('smol tree', () => {
'.skk.moe', 'blog.skk.moe', '.cdn.skk.moe', 'skk.moe'
], true);
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'.skk.moe'
]);
});
@@ -243,12 +243,12 @@ describe('smol tree', () => {
'.blog.sub.example.com', 'cdn.sub.example.com', '.sub.example.com'
], true);
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'.sub.example.com'
]);
trie.add('.sub.example.com');
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'.sub.example.com'
]);
});
@@ -261,7 +261,7 @@ describe('smol tree', () => {
'px.cdn.creative.medialytics.com'
], true);
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'cdn.creative.medialytics.com',
'px.cdn.creative.medialytics.com',
'commercial.shouji.360.cn',
@@ -277,7 +277,7 @@ describe('smol tree', () => {
'blog.skk.moe'
], true);
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'anotherskk.moe',
'blog.anotherskk.moe',
'skk.moe',
@@ -298,7 +298,7 @@ describe('smol tree', () => {
trie.whitelist('.skk.moe');
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local',
@@ -307,7 +307,7 @@ describe('smol tree', () => {
]);
trie.whitelist('anotherskk.moe');
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local',
@@ -317,25 +317,25 @@ describe('smol tree', () => {
trie.add('anotherskk.moe');
trie.whitelist('.anotherskk.moe');
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'img.skk.local',
'blog.img.skk.local',
'.cdn.local'
]);
trie.whitelist('img.skk.local');
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'blog.img.skk.local',
'.cdn.local'
]);
trie.whitelist('cdn.local');
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'blog.img.skk.local'
]);
trie.whitelist('.skk.local');
expect(trie.dump()).toStrictEqual([]);
expect(trie.dump()).toEqual([]);
});
it('should whitelist trie correctly', () => {
@@ -348,22 +348,22 @@ describe('smol tree', () => {
'cdn.example.com'
], true);
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'cdn.example.com', 'blog.cdn.example.com',
'.skk.moe',
'.t.co'
]);
trie.whitelist('.t.co');
expect(trie.dump()).toStrictEqual([
expect(trie.dump()).toEqual([
'cdn.example.com', 'blog.cdn.example.com', '.skk.moe'
]);
trie.whitelist('skk.moe');
expect(trie.dump()).toStrictEqual(['cdn.example.com', 'blog.cdn.example.com']);
expect(trie.dump()).toEqual(['cdn.example.com', 'blog.cdn.example.com']);
trie.whitelist('cdn.example.com');
expect(trie.dump()).toStrictEqual(['blog.cdn.example.com']);
expect(trie.dump()).toEqual(['blog.cdn.example.com']);
});
it('contains - normal', () => {
@@ -374,15 +374,15 @@ describe('smol tree', () => {
'blog.skk.moe'
], true);
expect(trie.contains('skk.moe')).toBe(true);
expect(trie.contains('blog.skk.moe')).toBe(true);
expect(trie.contains('anotherskk.moe')).toBe(true);
expect(trie.contains('blog.anotherskk.moe')).toBe(true);
expect(trie.contains('skk.moe')).toEqual(true);
expect(trie.contains('blog.skk.moe')).toEqual(true);
expect(trie.contains('anotherskk.moe')).toEqual(true);
expect(trie.contains('blog.anotherskk.moe')).toEqual(true);
expect(trie.contains('example.com')).toBe(false);
expect(trie.contains('blog.example.com')).toBe(false);
expect(trie.contains('skk.mo')).toBe(false);
expect(trie.contains('cdn.skk.moe')).toBe(false);
expect(trie.contains('example.com')).toEqual(false);
expect(trie.contains('blog.example.com')).toEqual(false);
expect(trie.contains('skk.mo')).toEqual(false);
expect(trie.contains('cdn.skk.moe')).toEqual(false);
});
it('contains - subdomain', () => {
@@ -390,9 +390,9 @@ describe('smol tree', () => {
'index.rubygems.org'
], true);
expect(trie.contains('rubygems.org')).toBe(false);
expect(trie.contains('index.rubygems.org')).toBe(true);
expect(trie.contains('sub.index.rubygems.org')).toBe(false);
expect(trie.contains('rubygems.org')).toEqual(false);
expect(trie.contains('index.rubygems.org')).toEqual(true);
expect(trie.contains('sub.index.rubygems.org')).toEqual(false);
});
it('contains - include subdomains', () => {
@@ -400,12 +400,12 @@ describe('smol tree', () => {
'.skk.moe'
], true);
expect(trie.contains('skk.moe')).toBe(true);
expect(trie.contains('blog.skk.moe')).toBe(true);
expect(trie.contains('image.cdn.skk.moe')).toBe(true);
expect(trie.contains('skk.moe')).toEqual(true);
expect(trie.contains('blog.skk.moe')).toEqual(true);
expect(trie.contains('image.cdn.skk.moe')).toEqual(true);
expect(trie.contains('example.com')).toBe(false);
expect(trie.contains('blog.example.com')).toBe(false);
expect(trie.contains('skk.mo')).toBe(false);
expect(trie.contains('example.com')).toEqual(false);
expect(trie.contains('blog.example.com')).toEqual(false);
expect(trie.contains('skk.mo')).toEqual(false);
});
});