From df2190d47889f46c83fb975ae481fd90e259bf6a Mon Sep 17 00:00:00 2001 From: Jordan Pellizzari Date: Sun, 19 Mar 2017 17:28:43 -0700 Subject: [PATCH] Fixed tests --- .../charts/__tests__/node-layout-test.js | 38 ++++++++++--------- client/app/scripts/constants/naming.js | 2 +- .../scripts/reducers/__tests__/root-test.js | 7 ++-- .../utils/__tests__/layouter-utils-test.js | 11 +++--- client/app/scripts/utils/layouter-utils.js | 2 +- 5 files changed, 32 insertions(+), 28 deletions(-) diff --git a/client/app/scripts/charts/__tests__/node-layout-test.js b/client/app/scripts/charts/__tests__/node-layout-test.js index a9fcb99e09..b37a11c990 100644 --- a/client/app/scripts/charts/__tests__/node-layout-test.js +++ b/client/app/scripts/charts/__tests__/node-layout-test.js @@ -1,5 +1,7 @@ import { fromJS, Map } from 'immutable'; +import { constructEdgeId as edge } from '../../utils/layouter-utils'; + const makeMap = Map; describe('NodesLayout', () => { @@ -30,9 +32,9 @@ describe('NodesLayout', () => { n4: {id: 'n4'} }), edges: fromJS({ - 'n1-n3': {id: 'n1-n3', source: 'n1', target: 'n3'}, - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'}, - 'n2-n4': {id: 'n2-n4', source: 'n2', target: 'n4'} + [edge('n1', 'n3')]: {id: edge('n1', 'n3'), source: 'n1', target: 'n3'}, + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'}, + [edge('n2', 'n4')]: {id: edge('n2', 'n4'), source: 'n2', target: 'n4'} }) }, rank4: { @@ -43,9 +45,9 @@ describe('NodesLayout', () => { n4: {id: 'n4', rank: 'B'} }), edges: fromJS({ - 'n1-n3': {id: 'n1-n3', source: 'n1', target: 'n3'}, - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'}, - 'n2-n4': {id: 'n2-n4', source: 'n2', target: 'n4'} + [edge('n1', 'n3')]: {id: edge('n1', 'n3'), source: 'n1', target: 'n3'}, + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'}, + [edge('n2', 'n4')]: {id: edge('n2', 'n4'), source: 'n2', target: 'n4'} }) }, rank6: { @@ -58,11 +60,11 @@ describe('NodesLayout', () => { n6: {id: 'n6', rank: 'B'}, }), edges: fromJS({ - 'n1-n3': {id: 'n1-n3', source: 'n1', target: 'n3'}, - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'}, - 'n1-n5': {id: 'n1-n5', source: 'n1', target: 'n5'}, - 'n2-n4': {id: 'n2-n4', source: 'n2', target: 'n4'}, - 'n2-n6': {id: 'n2-n6', source: 'n2', target: 'n6'}, + [edge('n1', 'n3')]: {id: edge('n1', 'n3'), source: 'n1', target: 'n3'}, + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'}, + [edge('n1', 'n5')]: {id: edge('n1', 'n5'), source: 'n1', target: 'n5'}, + [edge('n2', 'n4')]: {id: edge('n2', 'n4'), source: 'n2', target: 'n4'}, + [edge('n2', 'n6')]: {id: edge('n2', 'n6'), source: 'n2', target: 'n6'}, }) }, removeEdge24: { @@ -73,8 +75,8 @@ describe('NodesLayout', () => { n4: {id: 'n4'} }), edges: fromJS({ - 'n1-n3': {id: 'n1-n3', source: 'n1', target: 'n3'}, - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'} + [edge('n1', 'n3')]: {id: edge('n1', 'n3'), source: 'n1', target: 'n3'}, + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'} }) }, removeNode2: { @@ -84,8 +86,8 @@ describe('NodesLayout', () => { n4: {id: 'n4'} }), edges: fromJS({ - 'n1-n3': {id: 'n1-n3', source: 'n1', target: 'n3'}, - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'} + [edge('n1', 'n3')]: {id: edge('n1', 'n3'), source: 'n1', target: 'n3'}, + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'} }) }, removeNode23: { @@ -94,7 +96,7 @@ describe('NodesLayout', () => { n4: {id: 'n4'} }), edges: fromJS({ - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'} + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'} }) }, single3: { @@ -114,7 +116,7 @@ describe('NodesLayout', () => { n5: {id: 'n5'} }), edges: fromJS({ - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'} + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'} }) }, singlePortrait6: { @@ -127,7 +129,7 @@ describe('NodesLayout', () => { n6: {id: 'n6'} }), edges: fromJS({ - 'n1-n4': {id: 'n1-n4', source: 'n1', target: 'n4'} + [edge('n1', 'n4')]: {id: edge('n1', 'n4'), source: 'n1', target: 'n4'} }) } }; diff --git a/client/app/scripts/constants/naming.js b/client/app/scripts/constants/naming.js index 148d4de0e1..d49dc782e0 100644 --- a/client/app/scripts/constants/naming.js +++ b/client/app/scripts/constants/naming.js @@ -1,2 +1,2 @@ -export const EDGE_ID_SEPARATOR = '-------'; +export const EDGE_ID_SEPARATOR = '---'; diff --git a/client/app/scripts/reducers/__tests__/root-test.js b/client/app/scripts/reducers/__tests__/root-test.js index 7f788187a5..e880d58223 100644 --- a/client/app/scripts/reducers/__tests__/root-test.js +++ b/client/app/scripts/reducers/__tests__/root-test.js @@ -1,5 +1,6 @@ import {is, fromJS} from 'immutable'; // Root reducer test suite using Jasmine matchers +import { constructEdgeId } from '../../utils/layouter-utils'; describe('RootReducer', () => { const ActionTypes = require('../../constants/action-types').default; @@ -543,12 +544,12 @@ describe('RootReducer', () => { it('highlights bidirectional edges', () => { const action = { type: ActionTypes.ENTER_EDGE, - edgeId: 'abc123-def456' + edgeId: constructEdgeId('abc123', 'def456') }; const nextState = reducer(initialState, action); expect(nextState.get('highlightedEdgeIds').toJS()).toEqual([ - 'abc123-def456', - 'def456-abc123' + constructEdgeId('abc123', 'def456'), + constructEdgeId('def456', 'abc123') ]); }); }); diff --git a/client/app/scripts/utils/__tests__/layouter-utils-test.js b/client/app/scripts/utils/__tests__/layouter-utils-test.js index 7b06599295..e0ed8fc2d3 100644 --- a/client/app/scripts/utils/__tests__/layouter-utils-test.js +++ b/client/app/scripts/utils/__tests__/layouter-utils-test.js @@ -1,7 +1,8 @@ import { fromJS } from 'immutable'; import { - initEdgesFromNodes + initEdgesFromNodes, + constructEdgeId as edge } from '../layouter-utils'; @@ -14,10 +15,10 @@ describe('LayouterUtils', () => { c: {} }); expect(initEdgesFromNodes(input).toJS()).toEqual({ - 'a-b': { id: 'a-b', source: 'a', target: 'b', value: 1 }, - 'a-c': { id: 'a-c', source: 'a', target: 'c', value: 1 }, - 'b-a': { id: 'b-a', source: 'b', target: 'a', value: 1 }, - 'b-b': { id: 'b-b', source: 'b', target: 'b', value: 1 }, + [edge('a', 'b')]: { id: edge('a', 'b'), source: 'a', target: 'b', value: 1 }, + [edge('a', 'c')]: { id: edge('a', 'c'), source: 'a', target: 'c', value: 1 }, + [edge('b', 'a')]: { id: edge('b', 'a'), source: 'b', target: 'a', value: 1 }, + [edge('b', 'b')]: { id: edge('b', 'b'), source: 'b', target: 'b', value: 1 }, }); }); }); diff --git a/client/app/scripts/utils/layouter-utils.js b/client/app/scripts/utils/layouter-utils.js index 4c853571c8..9acf23cdb9 100644 --- a/client/app/scripts/utils/layouter-utils.js +++ b/client/app/scripts/utils/layouter-utils.js @@ -3,7 +3,7 @@ import { Map as makeMap } from 'immutable'; import { EDGE_ID_SEPARATOR } from '../constants/naming'; -function constructEdgeId(source, target) { +export function constructEdgeId(source, target) { return [source, target].join(EDGE_ID_SEPARATOR); }