Skip to content

Commit

Permalink
add more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@rileyajones
rileyajones committed Nov 10, 2023
1 parent 5767947 commit 8fe4946
Show file tree
Hide file tree
Showing 5 changed files with 237 additions and 36 deletions.
12 changes: 12 additions & 0 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,18 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"

web_test_repositories(omit_bazel_skylib = True)

# rules_python has to be placed before load("@io_bazel_rules_closure//closure:repositories.bzl")
# in the dependencies list, otherwise we get "cannot load '@rules_python//python:py_xxx.bzl': no such file"
http_archive(
name = "rules_python",
sha256 = "0a8003b044294d7840ac7d9d73eef05d6ceb682d7516781a4ec62eeb34702578",
strip_prefix = "rules_python-0.24.0",
urls = [
"http://mirror.tensorflow.org/github.com/bazelbuild/rules_python/releases/download/0.24.0/rules_python-0.24.0.tar.gz",
"https://github.com/bazelbuild/rules_python/releases/download/0.24.0/rules_python-0.24.0.tar.gz", # 2023-07-11
],
)

load("@io_bazel_rules_webtesting//web:py_repositories.bzl", "py_repositories")

py_repositories()
Expand Down
56 changes: 29 additions & 27 deletions tensorboard/webapp/metrics/effects/card_interaction_effects.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,36 +91,38 @@ export class CardInteractionEffects implements OnInitEffects {
this.getPreviousCardInteractions$,
this.store.select(getCardMetadataMap)
),
tap(([, cardInteractions, previousCardInteractions, metadataMap]) => {
const nextCardInteractions = {
pins: makeUnique([
...cardInteractions.pins,
...previousCardInteractions.pins,
]),
clicks: makeUnique([
...cardInteractions.clicks,
...previousCardInteractions.clicks,
]),
tagFilters: Array.from(
new Set([
...cardInteractions.tagFilters,
...previousCardInteractions.tagFilters,
])
),
};
tap(
([, newCardInteractions, previousCardInteractions, metadataMap]) => {
const nextCardInteractions = {
pins: makeUnique([
...previousCardInteractions.pins,
...newCardInteractions.pins,
]),
clicks: makeUnique([
...previousCardInteractions.clicks,
...newCardInteractions.clicks,
]),
tagFilters: Array.from(
new Set([
...previousCardInteractions.tagFilters,
...newCardInteractions.tagFilters,
])
),
};

this.store.dispatch(
metricsPreviousCardInteractionsChanged({
cardInteractions: nextCardInteractions,
})
);
this.store.dispatch(
metricsPreviousCardInteractionsChanged({
cardInteractions: nextCardInteractions,
})
);

function makeUnique(cardMetadata: CardIdWithMetadata[]) {
return Array.from(
new Set(cardMetadata.map(({cardId}) => cardId))
).map((cardId) => ({...metadataMap[cardId], cardId}));
function makeUnique(cardMetadata: CardIdWithMetadata[]) {
return Array.from(
new Set(cardMetadata.map(({cardId}) => cardId))
).map((cardId) => ({...metadataMap[cardId], cardId}));
}
}
})
)
);
},
{dispatch: false}
Expand Down
6 changes: 3 additions & 3 deletions tensorboard/webapp/metrics/effects/card_interactions_effects_test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ describe('CardInteractions Effects', () => {
expect(dispatchedActions).toEqual([
actions.metricsPreviousCardInteractionsChanged({
cardInteractions: {
pins: [card1a, card2a],
clicks: [card1b, card2b],
tagFilters: ['foo', 'bar'],
pins: [card2a, card1a],
clicks: [card2b, card1b],
tagFilters: ['bar', 'foo'],
},
}),
]);
Expand Down
12 changes: 6 additions & 6 deletions tensorboard/webapp/metrics/store/metrics_reducers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ const reducer = createReducer(
return {
...state,
tagFilter,
cardInteractions: nextNewCardInteractions,
newCardInteractions: nextNewCardInteractions,
};
}),
on(actions.metricsChangeTooltipSort, (state, {sort}) => {
Expand Down Expand Up @@ -1192,7 +1192,7 @@ const reducer = createReducer(
cardToPinnedCopy: nextCardToPinnedCopy,
cardToPinnedCopyCache: nextCardToPinnedCopyCache,
pinnedCardToOriginal: nextPinnedCardToOriginal,
cardInteractions: nextNewCardInteractions,
newCardInteractions: nextNewCardInteractions,
previousCardInteractions: nextPreviousCardInteractions,
};
}),
Expand Down Expand Up @@ -1539,10 +1539,10 @@ const reducer = createReducer(
}
),
on(actions.metricsCardClicked, (state, {cardId}) => {
const nextClicksIds = new Set(
state.newCardInteractions.clicks.map(({cardId}) => cardId)
);
nextClicksIds.add(cardId);
const nextClicksIds = state.newCardInteractions.clicks
.map(({cardId}) => cardId)
.filter((id) => id !== cardId)
.concat(cardId);

const nextNewCardInteractions = {
...state.newCardInteractions,
Expand Down
187 changes: 187 additions & 0 deletions tensorboard/webapp/metrics/store/metrics_reducers_test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
TagMetadata as DataSourceTagMetadata,
} from '../data_source';
import {
appStateFromMetricsState,
buildDataSourceTagMetadata,
buildMetricsSettingsState,
buildMetricsState,
Expand Down Expand Up @@ -2938,6 +2939,53 @@ describe('metrics reducers', () => {
return reducers(beforeState, action);
}).toThrow();
});

it('adds an entry to newCardInteractions', () => {
const state = buildMetricsState({
cardMetadataMap: {
card1: {
tag: 'foo',
runId: null,
plugin: PluginType.SCALARS,
},
},
});
const state2 = reducers(
state,
actions.cardPinStateToggled({
cardId: 'card1',
wasPinned: false,
canCreateNewPins: true,
})
);

expect(state2.newCardInteractions.pins).toEqual([
{
cardId: 'card1',
plugin: PluginType.SCALARS,
runId: null,
tag: 'foo',
},
]);

const state3 = reducers(
state2,
actions.cardPinStateToggled({
cardId: 'card1',
wasPinned: false,
canCreateNewPins: true,
})
);

expect(state3.newCardInteractions.pins).toEqual([
{
cardId: 'card1',
plugin: PluginType.SCALARS,
runId: null,
tag: 'foo',
},
]);
});
});

describe('metricsCardStateUpdated', () => {
Expand Down Expand Up @@ -3042,6 +3090,20 @@ describe('metrics reducers', () => {
const nextState = reducers(state, action);
expect(nextState.tagFilter).toBe('foobar');
});

it('adds entry to newCardInteractions', () => {
const state = buildMetricsState({});
const state2 = reducers(
state,
actions.metricsTagFilterChanged({tagFilter: 'foo'})
);
expect(state2.newCardInteractions.tagFilters).toEqual(['foo']);
const state3 = reducers(
state2,
actions.metricsTagFilterChanged({tagFilter: 'foo'})
);
expect(state3.newCardInteractions.tagFilters).toEqual(['foo']);
});
});

describe('metricsTagGroupExpansionChanged', () => {
Expand Down Expand Up @@ -4717,4 +4779,129 @@ describe('metrics reducers', () => {
});
});
});

describe('#metricsPreviousCardInteractionsChanged', () => {
it('sets previousCardInteractions', () => {
const cardInteractions = {
pins: [
{
cardId: 'card1',
runId: null,
plugin: PluginType.SCALARS,
tag: 'bar',
},
],
clicks: [
{
cardId: 'card2',
runId: null,
plugin: PluginType.SCALARS,
tag: 'baz',
},
],
tagFilters: ['foo'],
};
const state = buildMetricsState({});
const state2 = reducers(
state,
actions.metricsPreviousCardInteractionsChanged({
cardInteractions,
})
);

expect(state2.previousCardInteractions).toEqual(cardInteractions);
});
});

describe('#metricsCardClicked', () => {
it('adds entry to newCardInteractions', () => {
const state = buildMetricsState({
cardMetadataMap: {
card1: {
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
card2: {
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
},
});
const state2 = reducers(
state,
actions.metricsCardClicked({cardId: 'card1'})
);
expect(state2.newCardInteractions.clicks).toEqual([
{
cardId: 'card1',
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
]);
const state3 = reducers(
state2,
actions.metricsCardClicked({cardId: 'card2'})
);
expect(state3.newCardInteractions.clicks).toEqual([
{
cardId: 'card1',
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
{
cardId: 'card2',
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
]);
});

it('cannot add duplicate entries to newCardInteractions', () => {
const state = buildMetricsState({
cardMetadataMap: {
card1: {
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
card2: {
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
},
});
const state2 = reducers(
state,
actions.metricsCardClicked({cardId: 'card1'})
);
const state3 = reducers(
state2,
actions.metricsCardClicked({cardId: 'card2'})
);
const state4 = reducers(
state3,
actions.metricsCardClicked({cardId: 'card1'})
);
expect(state4.newCardInteractions.clicks).toEqual([
{
cardId: 'card2',
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
{
cardId: 'card1',
plugin: PluginType.SCALARS,
tag: 'foo',
runId: null,
},
]);
});
});
});

0 comments on commit 8fe4946

Please sign in to comment.