From 05e4315d86e27fffed2b3170fe49b5815e773add Mon Sep 17 00:00:00 2001
From: Mary Bucknell <mbucknell@usgs.gov>
Date: Fri, 27 Apr 2018 12:59:05 -0500
Subject: [PATCH] Fixed hydrograph tests
---
.../components/hydrograph/cursor.spec.js | 28 +++++-----
.../components/hydrograph/drawingData.spec.js | 39 +++++++-------
.../components/hydrograph/index.spec.js | 12 ++---
.../components/hydrograph/legend.spec.js | 4 +-
.../components/hydrograph/parameters.spec.js | 36 ++++++-------
.../components/hydrograph/timeSeries.js | 2 +-
.../components/hydrograph/timeSeries.spec.js | 54 ++++++++++++-------
.../components/hydrograph/tooltip.spec.js | 24 ++++-----
8 files changed, 107 insertions(+), 92 deletions(-)
diff --git a/assets/src/scripts/components/hydrograph/cursor.spec.js b/assets/src/scripts/components/hydrograph/cursor.spec.js
index 9aed8e5ea..8b048d563 100644
--- a/assets/src/scripts/components/hydrograph/cursor.spec.js
+++ b/assets/src/scripts/components/hydrograph/cursor.spec.js
@@ -32,7 +32,7 @@ DATA = DATA.concat([
const TEST_STATE_THREE_VARS = {
series: {
queryInfo: {
- current: {
+ 'current:P7D': {
notes: {
'filter:timeRange': {
mode: 'RANGE',
@@ -44,7 +44,7 @@ const TEST_STATE_THREE_VARS = {
}
}
},
- compare: {
+ 'compare:P7D': {
notes: {
'filter:timeRange': {
mode: 'RANGE',
@@ -58,7 +58,7 @@ const TEST_STATE_THREE_VARS = {
},
timeSeries: {
'00060': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2018-03-06T15:45:00.000Z'),
endTime: new Date('2018-03-13t13:45:00.000Z'),
variable: '45807197',
@@ -77,7 +77,7 @@ const TEST_STATE_THREE_VARS = {
}]
},
'00010': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2017-03-06T15:45:00.000Z'),
endTime: new Date('2017-03-13t13:45:00.000Z'),
variable: '45807196',
@@ -96,7 +96,7 @@ const TEST_STATE_THREE_VARS = {
}]
},
'00045': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2017-03-06T15:45:00.000Z'),
endTime: new Date('2017-03-13t13:45:00.000Z'),
variable: '45807140',
@@ -126,7 +126,7 @@ const TEST_STATE_THREE_VARS = {
}
},
requests: {
- current: {
+ 'current:P7D': {
timeSeriesCollections: ['coll1']
}
},
@@ -172,21 +172,21 @@ const TEST_STATE_ONE_VAR = {
timeSeries: {
'00060:current': {
points: DATA,
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: '00060id'
},
'00060:compare': {
points: DATA,
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
variable: '00060id'
}
},
timeSeriesCollections: {
- 'current': {
+ 'current:P7D': {
variable: '00060id',
timeSeries: ['00060:current']
},
- 'compare': {
+ 'compare:P7D': {
variable: '00060id',
timeSeries: ['00060:compare']
}
@@ -203,15 +203,15 @@ const TEST_STATE_ONE_VAR = {
}
},
requests: {
- 'current': {
+ 'current:P7D': {
timeSeriesCollections: ['current']
},
- 'compare': {
+ 'compare:P7D': {
timeSeriesCollections: ['compare']
}
},
queryInfo: {
- current: {
+ 'current:P7D': {
notes: {
'filter:timeRange': {
mode: 'RANGE',
@@ -222,7 +222,7 @@ const TEST_STATE_ONE_VAR = {
}
}
},
- compare: {
+ 'compare:P7D': {
notes: {
'filter:timeRange': {
mode: 'RANGE',
diff --git a/assets/src/scripts/components/hydrograph/drawingData.spec.js b/assets/src/scripts/components/hydrograph/drawingData.spec.js
index 017b72fa5..278a001dc 100644
--- a/assets/src/scripts/components/hydrograph/drawingData.spec.js
+++ b/assets/src/scripts/components/hydrograph/drawingData.spec.js
@@ -7,7 +7,7 @@ const TEST_DATA = {
series: {
timeSeries: {
'00060': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2018-03-06T15:45:00.000Z'),
endTime: new Date('2018-03-13t13:45:00.000Z'),
variable: '45807197',
@@ -29,7 +29,7 @@ const TEST_DATA = {
}]
},
'00010': {
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
startTime: new Date('2017-03-06T15:45:00.000Z'),
endTime: new Date('2017-03-13t13:45:00.000Z'),
variable: '45807196',
@@ -51,7 +51,7 @@ const TEST_DATA = {
}]
},
'00045': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2017-03-06T15:45:00.000Z'),
endTime: new Date('2017-03-13t13:45:00.000Z'),
variable: '45807140',
@@ -85,9 +85,10 @@ const TEST_DATA = {
}
},
requests: {
- current: {
+ 'current:P7D': {
timeSeriesCollections: ['coll1']
- }
+ },
+ 'compare:P7D': {}
},
variables: {
'45807197': {
@@ -241,11 +242,11 @@ describe('drawingData module', () => {
value: 10,
qualifiers: ['A']
}],
- tsKey: 'current'
+ tsKey: 'current:P7D'
},
'00045': {
...TEST_DATA.series.timeSeries['00045'],
- tsKey: 'compare'
+ tsKey: 'compare:P7D'
}
}
}
@@ -308,11 +309,11 @@ describe('drawingData module', () => {
value: 10,
qualifiers: ['P', 'E']
}],
- tsKey: 'current'
+ tsKey: 'current:P7D'
},
'00045': {
...TEST_DATA.series.timeSeries['00045'],
- tsKey: 'compare'
+ tsKey: 'compare:P7D'
}
}
}
@@ -379,11 +380,11 @@ describe('drawingData module', () => {
value: null,
qualifiers: ['P', 'FLD']
}],
- tsKey: 'current'
+ tsKey: 'current:P7D'
},
'00045': {
...TEST_DATA.series.timeSeries['00045'],
- tsKey: 'compare'
+ tsKey: 'compare:P7D'
}
}
}
@@ -463,11 +464,11 @@ describe('drawingData module', () => {
qualifiers: ['P']
};
}),
- tsKey: 'current'
+ tsKey: 'current:P7D'
},
'00045': {
...TEST_DATA.series.timeSeries['00045'],
- tsKey: 'compare'
+ tsKey: 'compare:P7D'
}
}
}
@@ -539,11 +540,11 @@ describe('drawingData module', () => {
qualifiers: ['Ice']
};
}),
- tsKey: 'current'
+ tsKey: 'current:P7D'
},
'00045': {
...TEST_DATA.series.timeSeries['00045'],
- tsKey: 'compare'
+ tsKey: 'compare:P7D'
}
}
}
@@ -625,12 +626,12 @@ describe('drawingData module', () => {
timeSeries: {
one: {
points: ['ptOne', 'ptTwo', 'ptThree'],
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: 45807197
},
two: {
points: ['ptOne2', 'ptTwo2', 'ptThree2'],
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: 45807197
}
},
@@ -747,7 +748,7 @@ describe('drawingData module', () => {
const result = pointsTableDataSelector('current')({
series: {
requests: {
- current: {
+ 'current:P7D': {
timeSeriesCollections: ['coll1']
}
},
@@ -759,7 +760,7 @@ describe('drawingData module', () => {
},
timeSeries: {
one: {
- tsKey: 'current',
+ tsKey: 'current:P7D',
points: [{
dateTime: '2018-01-01',
qualifiers: ['P'],
diff --git a/assets/src/scripts/components/hydrograph/index.spec.js b/assets/src/scripts/components/hydrograph/index.spec.js
index 755a003bc..8191bd295 100644
--- a/assets/src/scripts/components/hydrograph/index.spec.js
+++ b/assets/src/scripts/components/hydrograph/index.spec.js
@@ -15,7 +15,7 @@ const TEST_STATE = {
qualifiers: ['P']
}],
method: 'method1',
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: '45807190'
},
'00060:current': {
@@ -25,7 +25,7 @@ const TEST_STATE = {
qualifiers: ['P']
}],
method: 'method1',
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: '45807197'
},
'00060:compare': {
@@ -35,7 +35,7 @@ const TEST_STATE = {
qualifiers: ['P']
}],
method: 'method1',
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
variable: '45807197'
},
'00060:median': {
@@ -71,7 +71,7 @@ const TEST_STATE = {
}
},
queryInfo: {
- current: {
+ 'current:P7D': {
notes: {
'filter:timeRange': {
mode: 'PERIOD',
@@ -82,10 +82,10 @@ const TEST_STATE = {
}
},
requests: {
- current: {
+ 'current:P7D': {
timeSeriesCollections: ['coll1']
},
- compare: {
+ 'compare:P7D': {
timeSeriesCollections: ['coll2', 'col4']
},
median: {
diff --git a/assets/src/scripts/components/hydrograph/legend.spec.js b/assets/src/scripts/components/hydrograph/legend.spec.js
index cb8383545..f878475bd 100644
--- a/assets/src/scripts/components/hydrograph/legend.spec.js
+++ b/assets/src/scripts/components/hydrograph/legend.spec.js
@@ -89,7 +89,7 @@ describe('Legend module', () => {
series: {
timeSeries: {
'00060:current': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2018-03-06T15:45:00.000Z'),
endTime: new Date('2018-03-13t13:45:00.000Z'),
variable: '45807197',
@@ -112,7 +112,7 @@ describe('Legend module', () => {
},
'00065:compare': {
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
startTime: new Date('2017-03-06T15:45:00.000Z'),
endTime: new Date('2017-03-13t13:45:00.000Z'),
variable: '45807202',
diff --git a/assets/src/scripts/components/hydrograph/parameters.spec.js b/assets/src/scripts/components/hydrograph/parameters.spec.js
index afef29429..4c61f60f1 100644
--- a/assets/src/scripts/components/hydrograph/parameters.spec.js
+++ b/assets/src/scripts/components/hydrograph/parameters.spec.js
@@ -11,12 +11,12 @@ describe('Parameters module', () => {
const available = availableTimeseriesSelector({
series: {
timeSeries: {
- 'current:00060': {description: '00060', tsKey: 'current', variable: 'code0', points: [{x: 1, y: 2}]},
- 'current:00061': {description: '00061', tsKey: 'current', variable: 'code1', points: [{x: 2, y: 3}]},
- 'current:00062': {description: '00062', tsKey: 'current', variable: 'code2', points: [{x: 3, y: 4}]},
- 'compare:00061': {description: '00061', tsKey: 'compare', variable: 'code1', points: [{x: 1, y: 17}]},
- 'compare:00062': {description: '00062', tsKey: 'compare', variable: 'code2', points: [{x: 2, y: 18}]},
- 'compare:00063': {description: '00063', tsKey: 'compare', variable: 'code3', points: [{x: 3, y: 46}]}
+ 'current:00060': {description: '00060', tsKey: 'current:P7D', variable: 'code0', points: [{x: 1, y: 2}]},
+ 'current:00061': {description: '00061', tsKey: 'current:P7D', variable: 'code1', points: [{x: 2, y: 3}]},
+ 'current:00062': {description: '00062', tsKey: 'current:P7D', variable: 'code2', points: [{x: 3, y: 4}]},
+ 'compare:00061': {description: '00061', tsKey: 'compare:P7D', variable: 'code1', points: [{x: 1, y: 17}]},
+ 'compare:00062': {description: '00062', tsKey: 'compare:P7D', variable: 'code2', points: [{x: 2, y: 18}]},
+ 'compare:00063': {description: '00063', tsKey: 'compare:P7D', variable: 'code3', points: [{x: 3, y: 46}]}
},
variables: {
'code0': {
@@ -65,12 +65,12 @@ describe('Parameters module', () => {
const available = availableTimeseriesSelector({
series: {
timeSeries: {
- 'current:00060': {description: '00060', tsKey: 'current', variable: 'code0', points: [{x: 1, y: 2}]},
- 'current:00061': {description: '00061', tsKey: 'current', variable: 'code1', points: [{x: 2, y: 3}]},
- 'current:00062': {description: '00062', tsKey: 'current', variable: 'code2', points: [{x: 3, y: 4}]},
- 'compare:00061': {description: '00061', tsKey: 'compare', variable: 'code1', points: []},
- 'compare:00062': {description: '00062', tsKey: 'compare', variable: 'code2', points: [{x: 2, y: 18}]},
- 'compare:00063': {description: '00063', tsKey: 'compare', variable: 'code3', points: [{x: 3, y: 46}]}
+ 'current:00060': {description: '00060', tsKey: 'current:P7D', variable: 'code0', points: [{x: 1, y: 2}]},
+ 'current:00061': {description: '00061', tsKey: 'current:P7D', variable: 'code1', points: [{x: 2, y: 3}]},
+ 'current:00062': {description: '00062', tsKey: 'current:P7D', variable: 'code2', points: [{x: 3, y: 4}]},
+ 'compare:00061': {description: '00061', tsKey: 'compare:P7D', variable: 'code1', points: []},
+ 'compare:00062': {description: '00062', tsKey: 'compare:P7D', variable: 'code2', points: [{x: 2, y: 18}]},
+ 'compare:00063': {description: '00063', tsKey: 'compare:P7D', variable: 'code3', points: [{x: 3, y: 46}]}
},
variables: {
'code0': {
@@ -119,12 +119,12 @@ describe('Parameters module', () => {
const available = availableTimeseriesSelector({
series: {
timeSeries: {
- 'current:00060': {description: '00060', tsKey: 'current', variable: 'code0', points: [{x: 1, y: 2}]},
- 'current:00061': {description: '00061', tsKey: 'current', variable: 'code1', points: []},
- 'current:00062': {description: '00062', tsKey: 'current', variable: 'code2', points: [{x: 3, y: 4}]},
- 'compare:00061': {description: '00061', tsKey: 'compare', variable: 'code1', points: []},
- 'compare:00062': {description: '00062', tsKey: 'compare', variable: 'code2', points: [{x: 2, y: 18}]},
- 'compare:00063': {description: '00063', tsKey: 'compare', variable: 'code3', points: [{x: 3, y: 46}]}
+ 'current:00060': {description: '00060', tsKey: 'current:P7D', variable: 'code0', points: [{x: 1, y: 2}]},
+ 'current:00061': {description: '00061', tsKey: 'current:P7D', variable: 'code1', points: []},
+ 'current:00062': {description: '00062', tsKey: 'current:P7D', variable: 'code2', points: [{x: 3, y: 4}]},
+ 'compare:00061': {description: '00061', tsKey: 'compare:P7D', variable: 'code1', points: []},
+ 'compare:00062': {description: '00062', tsKey: 'compare:P7D', variable: 'code2', points: [{x: 2, y: 18}]},
+ 'compare:00063': {description: '00063', tsKey: 'compare:P7D', variable: 'code3', points: [{x: 3, y: 46}]}
},
variables: {
'code0': {
diff --git a/assets/src/scripts/components/hydrograph/timeSeries.js b/assets/src/scripts/components/hydrograph/timeSeries.js
index db657b569..2406610f1 100644
--- a/assets/src/scripts/components/hydrograph/timeSeries.js
+++ b/assets/src/scripts/components/hydrograph/timeSeries.js
@@ -149,7 +149,7 @@ export const descriptionSelector = createSelector(
requestTimeRangeSelector,
(variable, requestTimeRanges) => {
const desc = variable ? variable.variableDescription : '';
- const range = requestTimeRanges['current'];
+ const range = requestTimeRanges['current:P7D'];
if (range) {
return `${desc} from ${formatTime(range.start)} to ${formatTime(range.end)}`;
} else {
diff --git a/assets/src/scripts/components/hydrograph/timeSeries.spec.js b/assets/src/scripts/components/hydrograph/timeSeries.spec.js
index a23756a99..11cc82d1b 100644
--- a/assets/src/scripts/components/hydrograph/timeSeries.spec.js
+++ b/assets/src/scripts/components/hydrograph/timeSeries.spec.js
@@ -7,7 +7,7 @@ const TEST_DATA = {
series: {
timeSeries: {
'00060': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2018-03-06T15:45:00.000Z'),
endTime: new Date('2018-03-13T13:45:00.000Z'),
variable: '45807197',
@@ -29,7 +29,7 @@ const TEST_DATA = {
}]
},
'00010': {
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
startTime: new Date('2017-03-06T15:45:00.000Z'),
endTime: new Date('2017-03-13t13:45:00.000Z'),
variables: '45807196',
@@ -80,9 +80,10 @@ const TEST_DATA = {
}
},
requests: {
- current: {
+ 'current:P7D': {
timeSeriesCollections: ['coll1']
- }
+ },
+ 'current:P30D:00060': {}
},
variables: {
'45807197': {
@@ -103,7 +104,7 @@ const TEST_DATA = {
}
},
queryInfo: {
- current: {
+ 'current:P7D': {
notes: {
requestDT: new Date('2017-01-09T20:46:07.542Z'),
'filter:timeRange': {
@@ -112,6 +113,19 @@ const TEST_DATA = {
modifiedSince: null
}
}
+ },
+ 'current:P30D:00060': {
+ notes: {
+ requestDT: new Date('2017-01-09T20:46:07.542Z'),
+ 'filter:timeRange': {
+ mode: 'RANGE',
+ interval: {
+ start: new Date('2017-01-09'),
+ end: new Date('2017-02-08')
+ },
+ modifiedSince: null
+ }
+ }
}
}
},
@@ -172,7 +186,7 @@ describe('TimeSeries module', () => {
expect(currentVariableTimeSeriesSelector('current')({
series: {
requests: {
- current: {
+ 'current:P7D': {
timeSeriesCollections: ['coll1', 'coll2']
}
},
@@ -194,37 +208,37 @@ describe('TimeSeries module', () => {
one: {
item: 'one',
points: [1, 2],
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: 45807197
},
two: {
item: 'two',
points: [],
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: 45807197
},
three: {
item: 'three',
points: [3, 4],
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: 45807197
},
four: {
item: 'four',
points: [4, 5],
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: 45807197
},
five: {
item: 'five',
points: [5, 6],
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
variable: 45807190
},
six: {
item: 'six',
points: [6, 7],
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
variable: 45807190
}
},
@@ -243,9 +257,9 @@ describe('TimeSeries module', () => {
currentDateRange: 'P7D'
}
})).toEqual({
- one: {item: 'one', points: [1, 2], tsKey: 'current', variable: 45807197},
- three: {item: 'three', points: [3, 4], tsKey: 'current', variable: 45807197},
- four: {item: 'four', points: [4, 5], tsKey: 'current', variable: 45807197}
+ one: {item: 'one', points: [1, 2], tsKey: 'current:P7D', variable: 45807197},
+ three: {item: 'three', points: [3, 4], tsKey: 'current:P7D', variable: 45807197},
+ four: {item: 'four', points: [4, 5], tsKey: 'current:P7D', variable: 45807197}
});
});
@@ -265,7 +279,7 @@ describe('TimeSeries module', () => {
it('should return the selected time series', () => {
expect(timeSeriesSelector('current')(TEST_DATA)).toEqual({
'00060': {
- tsKey: 'current',
+ tsKey: 'current:P7D',
startTime: new Date('2018-03-06T15:45:00.000Z'),
endTime: new Date('2018-03-13T13:45:00.000Z'),
points: [{
@@ -382,7 +396,7 @@ describe('TimeSeries module', () => {
expect(requestTimeRangeSelector({
series: {
queryInfo: {
- current: {
+ 'current:P7D': {
notes: {
requestDT: new Date('2017-01-09T20:46:07.542Z'),
'filter:timeRange': {
@@ -395,7 +409,7 @@ describe('TimeSeries module', () => {
}
}
})).toEqual({
- current: {
+ 'current:P7D': {
start: new Date('2017-01-02T20:46:07.542Z'),
end: new Date('2017-01-09T20:46:07.542Z')
}
@@ -408,7 +422,7 @@ describe('TimeSeries module', () => {
expect(requestTimeRangeSelector({
series: {
queryInfo: {
- compare: {
+ 'compare:P7D': {
notes: {
requestDT: new Date('2017-01-09T20:46:07.542Z'),
'filter:timeRange': {
@@ -424,7 +438,7 @@ describe('TimeSeries module', () => {
}
}
})).toEqual({
- compare: {
+ 'compare:P7D': {
start: new Date(2017, 10, 10),
end: new Date(2017, 10, 20)
}
diff --git a/assets/src/scripts/components/hydrograph/tooltip.spec.js b/assets/src/scripts/components/hydrograph/tooltip.spec.js
index 01a6eac00..033aadbbe 100644
--- a/assets/src/scripts/components/hydrograph/tooltip.spec.js
+++ b/assets/src/scripts/components/hydrograph/tooltip.spec.js
@@ -36,21 +36,21 @@ describe('Hydrograph tooltip module', () => {
timeSeries: {
'00060:current': {
points: data,
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: '00060id'
},
'00060:compare': {
points: data,
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
variable: '00060id'
}
},
timeSeriesCollections: {
- 'current': {
+ 'current:P7D': {
variable: '00060id',
timeSeries: ['00060:current']
},
- 'compare': {
+ 'compare:P7D': {
variable: '00060id',
timeSeries: ['00060:compare']
}
@@ -67,15 +67,15 @@ describe('Hydrograph tooltip module', () => {
}
},
requests: {
- 'current': {
+ 'current:P7D': {
timeSeriesCollections: ['current']
},
- 'compare': {
+ 'compare:P7D': {
timeSeriesCollections: ['compare']
}
},
queryInfo: {
- current: {
+ 'current:P7D': {
notes: {
'filter:timeRange': {
mode: 'RANGE',
@@ -86,7 +86,7 @@ describe('Hydrograph tooltip module', () => {
}
}
},
- compare: {
+ 'compare:P7D': {
notes: {
'filter:timeRange': {
mode: 'RANGE',
@@ -328,12 +328,12 @@ describe('Hydrograph tooltip module', () => {
timeSeries: Object.assign({}, testState.series.timeSeries, {
'00060:current': {
points: currentTsData,
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: '00060id'
},
'00060:compare': {
points: compareTsData,
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
variable: '00060id'
}
})
@@ -357,12 +357,12 @@ describe('Hydrograph tooltip module', () => {
timeSeries: Object.assign({}, testState.series.timeSeries, {
'00060:current': {
points: currentTsData,
- tsKey: 'current',
+ tsKey: 'current:P7D',
variable: '00060id'
},
'00060:compare': {
points: compareTsData,
- tsKey: 'compare',
+ tsKey: 'compare:P7D',
variable: '00060id'
}
})
--
GitLab