summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-22 15:16:29 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-02-22 15:16:29 +0900
commit3bb7afe544275c18e49d96cfe84bb56d7e5621b5 (patch)
treeebb8ea9fae00152b321d50ce39716d2454f4540b
parentfix test (diff)
downloadmisskey-3bb7afe544275c18e49d96cfe84bb56d7e5621b5.tar.gz
misskey-3bb7afe544275c18e49d96cfe84bb56d7e5621b5.tar.bz2
misskey-3bb7afe544275c18e49d96cfe84bb56d7e5621b5.zip
improve performance of some tests
-rw-r--r--packages/backend/test/unit/MfmService.ts102
-rw-r--r--packages/backend/test/unit/ReactionService.ts92
-rw-r--r--packages/backend/test/unit/mfm.ts109
-rw-r--r--packages/backend/test/unit/reaction-lib.ts90
4 files changed, 194 insertions, 199 deletions
diff --git a/packages/backend/test/unit/MfmService.ts b/packages/backend/test/unit/MfmService.ts
new file mode 100644
index 0000000000..5496738778
--- /dev/null
+++ b/packages/backend/test/unit/MfmService.ts
@@ -0,0 +1,102 @@
+import * as assert from 'assert';
+import * as mfm from 'mfm-js';
+import { Test } from '@nestjs/testing';
+
+import { CoreModule } from '@/core/CoreModule.js';
+import { MfmService } from '@/core/MfmService.js';
+import { GlobalModule } from '@/GlobalModule.js';
+
+describe('MfmService', () => {
+ let mfmService: MfmService;
+
+ beforeAll(async () => {
+ const app = await Test.createTestingModule({
+ imports: [GlobalModule, CoreModule],
+ }).compile();
+ mfmService = app.get<MfmService>(MfmService);
+ });
+
+ describe('toHtml', () => {
+ test('br', () => {
+ const input = 'foo\nbar\nbaz';
+ const output = '<p><span>foo<br>bar<br>baz</span></p>';
+ assert.equal(mfmService.toHtml(mfm.parse(input)), output);
+ });
+
+ test('br alt', () => {
+ const input = 'foo\r\nbar\rbaz';
+ const output = '<p><span>foo<br>bar<br>baz</span></p>';
+ assert.equal(mfmService.toHtml(mfm.parse(input)), output);
+ });
+ });
+
+ describe('fromHtml', () => {
+ test('p', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a</p><p>b</p>'), 'a\n\nb');
+ });
+
+ test('block element', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<div>a</div><div>b</div>'), 'a\nb');
+ });
+
+ test('inline element', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<ul><li>a</li><li>b</li></ul>'), 'a\nb');
+ });
+
+ test('block code', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<pre><code>a\nb</code></pre>'), '```\na\nb\n```');
+ });
+
+ test('inline code', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<code>a</code>'), '`a`');
+ });
+
+ test('quote', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<blockquote>a\nb</blockquote>'), '> a\n> b');
+ });
+
+ test('br', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>abc<br><br/>d</p>'), 'abc\n\nd');
+ });
+
+ test('link with different text', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b">c</a> d</p>'), 'a [c](https://example.com/b) d');
+ });
+
+ test('link with different text, but not encoded', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/ä">c</a> d</p>'), 'a [c](<https://example.com/ä>) d');
+ });
+
+ test('link with same text', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b">https://example.com/b</a> d</p>'), 'a https://example.com/b d');
+ });
+
+ test('link with same text, but not encoded', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/ä">https://example.com/ä</a> d</p>'), 'a <https://example.com/ä> d');
+ });
+
+ test('link with no url', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="b">c</a> d</p>'), 'a [c](b) d');
+ });
+
+ test('link without href', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a>c</a> d</p>'), 'a c d');
+ });
+
+ test('link without text', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b"></a> d</p>'), 'a https://example.com/b d');
+ });
+
+ test('link without both', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a></a> d</p>'), 'a d');
+ });
+
+ test('mention', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/@user" class="u-url mention">@user</a> d</p>'), 'a @user@example.com d');
+ });
+
+ test('hashtag', () => {
+ assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/tags/a">#a</a> d</p>', ['#a']), 'a #a d');
+ });
+ });
+});
diff --git a/packages/backend/test/unit/ReactionService.ts b/packages/backend/test/unit/ReactionService.ts
new file mode 100644
index 0000000000..6a20a1e08e
--- /dev/null
+++ b/packages/backend/test/unit/ReactionService.ts
@@ -0,0 +1,92 @@
+import * as assert from 'assert';
+import { Test } from '@nestjs/testing';
+
+import { CoreModule } from '@/core/CoreModule.js';
+import { ReactionService } from '@/core/ReactionService.js';
+import { GlobalModule } from '@/GlobalModule.js';
+
+describe('ReactionService', () => {
+ let reactionService: ReactionService;
+
+ beforeAll(async () => {
+ const app = await Test.createTestingModule({
+ imports: [GlobalModule, CoreModule],
+ }).compile();
+ reactionService = app.get<ReactionService>(ReactionService);
+ });
+
+ describe('toDbReaction', () => {
+ test('絵文字リアクションはそのまま', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('👍'), '👍');
+ assert.strictEqual(await reactionService.toDbReaction('🍅'), '🍅');
+ });
+
+ test('既存のリアクションは絵文字化する pudding', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('pudding'), '🍮');
+ });
+
+ test('既存のリアクションは絵文字化する like', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('like'), '👍');
+ });
+
+ test('既存のリアクションは絵文字化する love', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('love'), '❤');
+ });
+
+ test('既存のリアクションは絵文字化する laugh', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('laugh'), '😆');
+ });
+
+ test('既存のリアクションは絵文字化する hmm', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('hmm'), '🤔');
+ });
+
+ test('既存のリアクションは絵文字化する surprise', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('surprise'), '😮');
+ });
+
+ test('既存のリアクションは絵文字化する congrats', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('congrats'), '🎉');
+ });
+
+ test('既存のリアクションは絵文字化する angry', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('angry'), '💢');
+ });
+
+ test('既存のリアクションは絵文字化する confused', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('confused'), '😥');
+ });
+
+ test('既存のリアクションは絵文字化する rip', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('rip'), '😇');
+ });
+
+ test('既存のリアクションは絵文字化する star', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('star'), '⭐');
+ });
+
+ test('異体字セレクタ除去', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('㊗️'), '㊗');
+ });
+
+ test('異体字セレクタ除去 必要なし', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('㊗'), '㊗');
+ });
+
+ test('fallback - undefined', async () => {
+ assert.strictEqual(await reactionService.toDbReaction(undefined), '👍');
+ });
+
+ test('fallback - null', async () => {
+ assert.strictEqual(await reactionService.toDbReaction(null), '👍');
+ });
+
+ test('fallback - empty', async () => {
+ assert.strictEqual(await reactionService.toDbReaction(''), '👍');
+ });
+
+ test('fallback - unknown', async () => {
+ assert.strictEqual(await reactionService.toDbReaction('unknown'), '👍');
+ });
+ });
+});
diff --git a/packages/backend/test/unit/mfm.ts b/packages/backend/test/unit/mfm.ts
deleted file mode 100644
index d7ef14dfa3..0000000000
--- a/packages/backend/test/unit/mfm.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import * as assert from 'assert';
-import * as mfm from 'mfm-js';
-import { Test } from '@nestjs/testing';
-
-import { CoreModule } from '@/core/CoreModule.js';
-import { MfmService } from '@/core/MfmService.js';
-import { GlobalModule } from '@/GlobalModule.js';
-
-describe('toHtml', () => {
- let mfmService: MfmService;
-
- beforeEach(async () => {
- const app = await Test.createTestingModule({
- imports: [GlobalModule, CoreModule],
- }).compile();
- mfmService = app.get<MfmService>(MfmService);
- });
-
- test('br', () => {
- const input = 'foo\nbar\nbaz';
- const output = '<p><span>foo<br>bar<br>baz</span></p>';
- assert.equal(mfmService.toHtml(mfm.parse(input)), output);
- });
-
- test('br alt', () => {
- const input = 'foo\r\nbar\rbaz';
- const output = '<p><span>foo<br>bar<br>baz</span></p>';
- assert.equal(mfmService.toHtml(mfm.parse(input)), output);
- });
-});
-
-describe('fromHtml', () => {
- let mfmService: MfmService;
-
- beforeEach(async () => {
- const app = await Test.createTestingModule({
- imports: [GlobalModule, CoreModule],
- }).compile();
- mfmService = app.get<MfmService>(MfmService);
- });
-
- test('p', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a</p><p>b</p>'), 'a\n\nb');
- });
-
- test('block element', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<div>a</div><div>b</div>'), 'a\nb');
- });
-
- test('inline element', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<ul><li>a</li><li>b</li></ul>'), 'a\nb');
- });
-
- test('block code', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<pre><code>a\nb</code></pre>'), '```\na\nb\n```');
- });
-
- test('inline code', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<code>a</code>'), '`a`');
- });
-
- test('quote', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<blockquote>a\nb</blockquote>'), '> a\n> b');
- });
-
- test('br', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>abc<br><br/>d</p>'), 'abc\n\nd');
- });
-
- test('link with different text', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b">c</a> d</p>'), 'a [c](https://example.com/b) d');
- });
-
- test('link with different text, but not encoded', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/ä">c</a> d</p>'), 'a [c](<https://example.com/ä>) d');
- });
-
- test('link with same text', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b">https://example.com/b</a> d</p>'), 'a https://example.com/b d');
- });
-
- test('link with same text, but not encoded', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/ä">https://example.com/ä</a> d</p>'), 'a <https://example.com/ä> d');
- });
-
- test('link with no url', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="b">c</a> d</p>'), 'a [c](b) d');
- });
-
- test('link without href', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a>c</a> d</p>'), 'a c d');
- });
-
- test('link without text', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/b"></a> d</p>'), 'a https://example.com/b d');
- });
-
- test('link without both', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a></a> d</p>'), 'a d');
- });
-
- test('mention', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/@user" class="u-url mention">@user</a> d</p>'), 'a @user@example.com d');
- });
-
- test('hashtag', () => {
- assert.deepStrictEqual(mfmService.fromHtml('<p>a <a href="https://example.com/tags/a">#a</a> d</p>', ['#a']), 'a #a d');
- });
-});
diff --git a/packages/backend/test/unit/reaction-lib.ts b/packages/backend/test/unit/reaction-lib.ts
deleted file mode 100644
index ac8e143a5d..0000000000
--- a/packages/backend/test/unit/reaction-lib.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import * as assert from 'assert';
-import { Test } from '@nestjs/testing';
-
-import { CoreModule } from '@/core/CoreModule.js';
-import { ReactionService } from '@/core/ReactionService.js';
-import { GlobalModule } from '@/GlobalModule.js';
-
-describe('toDbReaction', () => {
- let reactionService: ReactionService;
-
- beforeEach(async () => {
- const app = await Test.createTestingModule({
- imports: [GlobalModule, CoreModule],
- }).compile();
- reactionService = app.get<ReactionService>(ReactionService);
- });
-
- test('絵文字リアクションはそのまま', async () => {
- assert.strictEqual(await reactionService.toDbReaction('👍'), '👍');
- assert.strictEqual(await reactionService.toDbReaction('🍅'), '🍅');
- });
-
- test('既存のリアクションは絵文字化する pudding', async () => {
- assert.strictEqual(await reactionService.toDbReaction('pudding'), '🍮');
- });
-
- test('既存のリアクションは絵文字化する like', async () => {
- assert.strictEqual(await reactionService.toDbReaction('like'), '👍');
- });
-
- test('既存のリアクションは絵文字化する love', async () => {
- assert.strictEqual(await reactionService.toDbReaction('love'), '❤');
- });
-
- test('既存のリアクションは絵文字化する laugh', async () => {
- assert.strictEqual(await reactionService.toDbReaction('laugh'), '😆');
- });
-
- test('既存のリアクションは絵文字化する hmm', async () => {
- assert.strictEqual(await reactionService.toDbReaction('hmm'), '🤔');
- });
-
- test('既存のリアクションは絵文字化する surprise', async () => {
- assert.strictEqual(await reactionService.toDbReaction('surprise'), '😮');
- });
-
- test('既存のリアクションは絵文字化する congrats', async () => {
- assert.strictEqual(await reactionService.toDbReaction('congrats'), '🎉');
- });
-
- test('既存のリアクションは絵文字化する angry', async () => {
- assert.strictEqual(await reactionService.toDbReaction('angry'), '💢');
- });
-
- test('既存のリアクションは絵文字化する confused', async () => {
- assert.strictEqual(await reactionService.toDbReaction('confused'), '😥');
- });
-
- test('既存のリアクションは絵文字化する rip', async () => {
- assert.strictEqual(await reactionService.toDbReaction('rip'), '😇');
- });
-
- test('既存のリアクションは絵文字化する star', async () => {
- assert.strictEqual(await reactionService.toDbReaction('star'), '⭐');
- });
-
- test('異体字セレクタ除去', async () => {
- assert.strictEqual(await reactionService.toDbReaction('㊗️'), '㊗');
- });
-
- test('異体字セレクタ除去 必要なし', async () => {
- assert.strictEqual(await reactionService.toDbReaction('㊗'), '㊗');
- });
-
- test('fallback - undefined', async () => {
- assert.strictEqual(await reactionService.toDbReaction(undefined), '👍');
- });
-
- test('fallback - null', async () => {
- assert.strictEqual(await reactionService.toDbReaction(null), '👍');
- });
-
- test('fallback - empty', async () => {
- assert.strictEqual(await reactionService.toDbReaction(''), '👍');
- });
-
- test('fallback - unknown', async () => {
- assert.strictEqual(await reactionService.toDbReaction('unknown'), '👍');
- });
-});