graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 06:33:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(test): fix chart test

Browse source
This commit is contained in:
syuilo 2022-09-19 08:25:44 +09:00
parent a2eac9fff6
commit 89174904bc
5 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/core/chart/charts/test-grouped.ts
View file

@ -2,8 +2,8 @@ import { Injectable, Inject } from '@nestjs/common';
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import { AppLockService } from '@/core/AppLockService.js'; import { AppLockService } from '@/core/AppLockService.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import Logger from '@/logger.js';
import Chart from '../core.js'; import Chart from '../core.js';
import { ChartLoggerService } from '../ChartLoggerService.js';
import { name, schema } from './entities/test-grouped.js'; import { name, schema } from './entities/test-grouped.js';
import type { KVs } from '../core.js'; import type { KVs } from '../core.js';
@ -20,9 +20,9 @@ export default class TestGroupedChart extends Chart<typeof schema> {
private db: DataSource, private db: DataSource,
private appLockService: AppLockService, private appLockService: AppLockService,
private chartLoggerService: ChartLoggerService, private logger: Logger,
) { ) {
super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true); super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema, true);
} }
protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> { protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

6
packages/backend/src/core/chart/charts/test-intersection.ts
View file

@ -2,8 +2,8 @@ import { Injectable, Inject } from '@nestjs/common';
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import { AppLockService } from '@/core/AppLockService.js'; import { AppLockService } from '@/core/AppLockService.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import Logger from '@/logger.js';
import Chart from '../core.js'; import Chart from '../core.js';
import { ChartLoggerService } from '../ChartLoggerService.js';
import { name, schema } from './entities/test-intersection.js'; import { name, schema } from './entities/test-intersection.js';
import type { KVs } from '../core.js'; import type { KVs } from '../core.js';
@ -18,9 +18,9 @@ export default class TestIntersectionChart extends Chart<typeof schema> {
private db: DataSource, private db: DataSource,
private appLockService: AppLockService, private appLockService: AppLockService,
private chartLoggerService: ChartLoggerService, private logger: Logger,
) { ) {
super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema); super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema);
} }
protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> { protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

6
packages/backend/src/core/chart/charts/test-unique.ts
View file

@ -2,8 +2,8 @@ import { Injectable, Inject } from '@nestjs/common';
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import { AppLockService } from '@/core/AppLockService.js'; import { AppLockService } from '@/core/AppLockService.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import Logger from '@/logger.js';
import Chart from '../core.js'; import Chart from '../core.js';
import { ChartLoggerService } from '../ChartLoggerService.js';
import { name, schema } from './entities/test-unique.js'; import { name, schema } from './entities/test-unique.js';
import type { KVs } from '../core.js'; import type { KVs } from '../core.js';
@ -18,9 +18,9 @@ export default class TestUniqueChart extends Chart<typeof schema> {
private db: DataSource, private db: DataSource,
private appLockService: AppLockService, private appLockService: AppLockService,
private chartLoggerService: ChartLoggerService, private logger: Logger,
) { ) {
super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema); super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema);
} }
protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> { protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

6
packages/backend/src/core/chart/charts/test.ts
View file

@ -2,8 +2,8 @@ import { Injectable, Inject } from '@nestjs/common';
import { DataSource } from 'typeorm'; import { DataSource } from 'typeorm';
import { AppLockService } from '@/core/AppLockService.js'; import { AppLockService } from '@/core/AppLockService.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import Logger from '@/logger.js';
import Chart from '../core.js'; import Chart from '../core.js';
import { ChartLoggerService } from '../ChartLoggerService.js';
import { name, schema } from './entities/test.js'; import { name, schema } from './entities/test.js';
import type { KVs } from '../core.js'; import type { KVs } from '../core.js';
@ -20,9 +20,9 @@ export default class TestChart extends Chart<typeof schema> {
private db: DataSource, private db: DataSource,
private appLockService: AppLockService, private appLockService: AppLockService,
private chartLoggerService: ChartLoggerService, private logger: Logger,
) { ) {
super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema); super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema);
} }
protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> { protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

10
packages/backend/test/unit/chart.ts
View file

@ -14,6 +14,7 @@ import { entity as TestUniqueChartEntity } from '@/core/chart/charts/entities/te
import { entity as TestIntersectionChartEntity } from '@/core/chart/charts/entities/test-intersection.js'; import { entity as TestIntersectionChartEntity } from '@/core/chart/charts/entities/test-intersection.js';
import { loadConfig } from '@/config.js'; import { loadConfig } from '@/config.js';
import type { AppLockService } from '@/core/AppLockService'; import type { AppLockService } from '@/core/AppLockService';
import Logger from '@/logger.js';
describe('Chart', () => { describe('Chart', () => {
const config = loadConfig(); const config = loadConfig();
@ -57,10 +58,11 @@ describe('Chart', () => {
await db.initialize(); await db.initialize();
testChart = new TestChart(db, appLockService); const logger = new Logger('chart'); // TODO: モックにする
testGroupedChart = new TestGroupedChart(db, appLockService); testChart = new TestChart(db, appLockService, logger);
testUniqueChart = new TestUniqueChart(db, appLockService); testGroupedChart = new TestGroupedChart(db, appLockService, logger);
testIntersectionChart = new TestIntersectionChart(db, appLockService); testUniqueChart = new TestUniqueChart(db, appLockService, logger);
testIntersectionChart = new TestIntersectionChart(db, appLockService, logger);
clock = lolex.install({ clock = lolex.install({
now: new Date(Date.UTC(2000, 0, 1, 0, 0, 0)), now: new Date(Date.UTC(2000, 0, 1, 0, 0, 0)),