Skip to content

Commit

Permalink
test: fix test references
Browse files Browse the repository at this point in the history
  • Loading branch information
@tokebe
tokebe committed Oct 31, 2022
1 parent bf8413d commit 11b5858
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 34 deletions.
13 changes: 8 additions & 5 deletions __test__/integration/QEdge2BTEEdgeHandler.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ const NodeUpdateHandler = require('../../src/update_nodes');
describe('Testing NodeUpdateHandler Module', () => {
const gene_node1 = new QNode({ id: 'n1', categories: ['Gene'], ids: ['NCBIGene:1017'] });
const node1_equivalent_ids = {
'NCBIGene:1017': {
db_ids: {
NCBIGene: ['1017'],
SYMBOL: ['CDK2'],
'NCBIGene:1017': [
{
semanticTypes: [],
db_ids: {
NCBIGene: ['1017'],
SYMBOL: ['CDK2'],
},
},
},
],
};

const gene_node2 = new QNode({ id: 'n2', categories: ['Gene'], ids: ['NCBIGene:1017', 'NCBIGene:1018'] });
Expand Down
58 changes: 29 additions & 29 deletions __test__/unittest/cacheHandler.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const { Readable } = require('stream');
const { Record } = require('@biothings-explorer/api-response-transform');
const Redis = require('ioredis-mock');

const qXedges = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../data/qXEdges.json')), { encoding: 'utf8' });
const qEdges = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../data/qEdges.json')), { encoding: 'utf8' });

const records = Record.unfreezeRecords(
JSON.parse(fs.readFileSync(path.resolve(__dirname, '../data/queryRecords.json')), { encoding: 'utf8' }),
Expand All @@ -31,19 +31,19 @@ describe('test cache handler', () => {
const cacheHandler = new CacheHandler(false);
const categorizeEdges = jest.spyOn(CacheHandler.prototype, 'categorizeEdges');
const _hashEdgeByMetaKG = jest.spyOn(CacheHandler.prototype, '_hashEdgeByMetaKG');
const _groupQueryRecordsByQXEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQXEdgeHash');
const _groupQueryRecordsByQEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQEdgeHash');

expect(cacheHandler.cacheEnabled).toBeFalsy();

const { cachedRecords, nonCachedQXEdges } = await cacheHandler.categorizeEdges(qXedges);
const { cachedRecords, nonCachedQEdges } = await cacheHandler.categorizeEdges(qEdges);
expect(categorizeEdges).toHaveBeenCalledTimes(1);
expect(_hashEdgeByMetaKG).toHaveBeenCalledTimes(0);
expect(cachedRecords).toHaveLength(0);
expect(nonCachedQXEdges).toHaveLength(1);
expect(nonCachedQXEdges).toEqual(qXedges);
expect(nonCachedQEdges).toHaveLength(1);
expect(nonCachedQEdges).toEqual(qEdges);

await cacheHandler.cacheEdges(records);
expect(_groupQueryRecordsByQXEdgeHash).toHaveBeenCalledTimes(0);
expect(_groupQueryRecordsByQEdgeHash).toHaveBeenCalledTimes(0);
});

test("don't use cache when explicitely disabled by ENV", async () => {
Expand All @@ -54,39 +54,39 @@ describe('test cache handler', () => {
const cacheHandler = new CacheHandler(true);
const categorizeEdges = jest.spyOn(CacheHandler.prototype, 'categorizeEdges');
const _hashEdgeByMetaKG = jest.spyOn(CacheHandler.prototype, '_hashEdgeByMetaKG');
const _groupQueryRecordsByQXEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQXEdgeHash');
const _groupQueryRecordsByQEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQEdgeHash');

expect(cacheHandler.cacheEnabled).toBeFalsy();

const { cachedRecords, nonCachedQXEdges } = await cacheHandler.categorizeEdges(qXedges);
const { cachedRecords, nonCachedQEdges } = await cacheHandler.categorizeEdges(qEdges);
expect(categorizeEdges).toHaveBeenCalledTimes(1);
expect(_hashEdgeByMetaKG).toHaveBeenCalledTimes(0);
expect(cachedRecords).toHaveLength(0);
expect(nonCachedQXEdges).toHaveLength(1);
expect(nonCachedQXEdges).toEqual(qXedges);
expect(nonCachedQEdges).toHaveLength(1);
expect(nonCachedQEdges).toEqual(qEdges);

await cacheHandler.cacheEdges(records);
expect(_groupQueryRecordsByQXEdgeHash).toHaveBeenCalledTimes(0);
expect(_groupQueryRecordsByQEdgeHash).toHaveBeenCalledTimes(0);
});

test("don't use cache when redis disabled", async () => {
const CacheHandler = require('../../src/cache_handler');
const cacheHandler = new CacheHandler(true);
const categorizeEdges = jest.spyOn(CacheHandler.prototype, 'categorizeEdges');
const _hashEdgeByMetaKG = jest.spyOn(CacheHandler.prototype, '_hashEdgeByMetaKG');
const _groupQueryRecordsByQXEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQXEdgeHash');
const _groupQueryRecordsByQEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQEdgeHash');

expect(cacheHandler.cacheEnabled).toBeFalsy();

const { cachedRecords, nonCachedQXEdges } = await cacheHandler.categorizeEdges(qXedges);
const { cachedRecords, nonCachedQEdges } = await cacheHandler.categorizeEdges(qEdges);
expect(categorizeEdges).toHaveBeenCalledTimes(1);
expect(_hashEdgeByMetaKG).toHaveBeenCalledTimes(0);
expect(cachedRecords).toHaveLength(0);
expect(nonCachedQXEdges).toHaveLength(1);
expect(nonCachedQXEdges).toEqual(qXedges);
expect(nonCachedQEdges).toHaveLength(1);
expect(nonCachedQEdges).toEqual(qEdges);

await cacheHandler.cacheEdges(records);
expect(_groupQueryRecordsByQXEdgeHash).toHaveBeenCalledTimes(0);
expect(_groupQueryRecordsByQEdgeHash).toHaveBeenCalledTimes(0);
});

test("don't use cache when redis specially disabled", async () => {
Expand All @@ -97,17 +97,17 @@ describe('test cache handler', () => {
const cacheHandler = new CacheHandler(true);
const categorizeEdges = jest.spyOn(CacheHandler.prototype, 'categorizeEdges');
const _hashEdgeByMetaKG = jest.spyOn(CacheHandler.prototype, '_hashEdgeByMetaKG');
const _groupQueryRecordsByQXEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQXEdgeHash');
const _groupQueryRecordsByQEdgeHash = jest.spyOn(CacheHandler.prototype, '_groupQueryRecordsByQEdgeHash');

const { cachedRecords, nonCachedQXEdges } = await cacheHandler.categorizeEdges(qXedges);
const { cachedRecords, nonCachedQEdges } = await cacheHandler.categorizeEdges(qEdges);
expect(categorizeEdges).toHaveBeenCalledTimes(1);
expect(_hashEdgeByMetaKG).toHaveBeenCalledTimes(0);
expect(cachedRecords).toHaveLength(0);
expect(nonCachedQXEdges).toHaveLength(1);
expect(nonCachedQXEdges).toEqual(qXedges);
expect(nonCachedQEdges).toHaveLength(1);
expect(nonCachedQEdges).toEqual(qEdges);

await cacheHandler.cacheEdges(records);
expect(_groupQueryRecordsByQXEdgeHash).toHaveBeenCalledTimes(0);
expect(_groupQueryRecordsByQEdgeHash).toHaveBeenCalledTimes(0);
});
});

Expand Down Expand Up @@ -240,15 +240,15 @@ describe('test cache handler', () => {
});
});

test('_groupQueryRecordsByQXEdgeHash', () => {
test('_groupQueryRecordsByQEdgeHash', () => {
process.env.REDIS_HOST = 'mocked';
process.env.REDIS_PORT = 'mocked';
const CacheHandler = require('../../src/cache_handler');
const cacheHandler = new CacheHandler(true);
const groups = cacheHandler._groupQueryRecordsByQXEdgeHash(records);
const groups = cacheHandler._groupQueryRecordsByQEdgeHash(records);

const numHashes = records.reduce((set, record) => {
set.add(record.qXEdge.getHashedEdgeRepresentation());
set.add(record.qEdge.getHashedEdgeRepresentation());
return set;
}, new Set()).size;

Expand All @@ -269,16 +269,16 @@ describe('test cache handler', () => {
const redisClient = new Redis();

await cacheHandler.cacheEdges(records);
const qXEdges = Object.values(
const qEdges = Object.values(
records.reduce((obj, record) => {
if (!(record.qXEdge.getHashedEdgeRepresentation() in obj)) {
obj[record.qXEdge.getHashedEdgeRepresentation()] = record.qXEdge;
if (!(record.qEdge.getHashedEdgeRepresentation() in obj)) {
obj[record.qEdge.getHashedEdgeRepresentation()] = record.qEdge;
}
return obj;
}, {}),
);
const { cachedRecords, nonCachedQXEdges } = await cacheHandler.categorizeEdges(qXEdges);
expect(nonCachedQXEdges).toHaveLength(0);
const { cachedRecords, nonCachedQEdges } = await cacheHandler.categorizeEdges(qEdges);
expect(nonCachedQEdges).toHaveLength(0);
expect(cachedRecords).toHaveLength(records.length);
// TODO get each record sorted by hash to compare individually
const originalRecordHashes = records.reduce((set, record) => {
Expand Down

0 comments on commit 11b5858

Please sign in to comment.