Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created separate function for Env check and applied in all other places. #30856

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Created separate function for Env check and applied in all other places. #30856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d60347c
Fixed time zone related test cases by adding UTC timezone
v-baambati Feb 22, 2024
458646c
removed unwanted tag
v-baambati Feb 27, 2024
66124dd
Merge branch 'master' of https://github.com/microsoft/fluentui into T…
v-baambati Mar 7, 2024
bee14b3
removed files
v-baambati Mar 7, 2024
f676ddf
added snapshots
v-baambati Mar 7, 2024
b3616c4
updated Heatmapchart snapshots
v-baambati Mar 7, 2024
ec488dd
added env condition check for time zone issues
v-baambati Mar 7, 2024
9f22197
resolved merge conflicts
v-baambati Mar 8, 2024
1cdec58
fixed failed test case
v-baambati Mar 8, 2024
5b7950c
added env condition check for time zone related tests
v-baambati Mar 8, 2024
2758294
removed unwanted chnages
v-baambati Mar 8, 2024
fdd9552
Enabled Area chart UTs for all the timezones
v-baambati Mar 11, 2024
34f1202
Enabled heatmap chart UTs for all the timezones
v-baambati Mar 11, 2024
5bdc6c1
resolved PR comments
v-baambati Mar 14, 2024
29debbd
Merge branch 'master' of https://github.com/microsoft/fluentui into T…
v-baambati Mar 19, 2024
32970a6
Merge branch 'master' of https://github.com/microsoft/fluentui into T…
v-baambati Mar 22, 2024
7e652db
moved env check to separate function
v-baambati Mar 22, 2024
7217cdb
moved env check to separate function
v-baambati Mar 22, 2024
3d3909f
Merge branch 'master' of https://github.com/microsoft/fluentui into T…
v-baambati Mar 22, 2024
5ac7a57
Merge branch 'master' into TestCasesTimeZoneIssueFix
v-baambati Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/react-charting/UnitTests/AreaChartUT.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { screen, fireEvent } from '@testing-library/react';
import { AreaChart } from '../src/components/AreaChart/index';
import { getById, testWithoutWait, isTimezoneSet, forEachTimezone } from '../src/utilities/TestUtility.test';
import { getById, testWithoutWait, isTimezoneSet, forEachTimezone, isTestEnv } from '../src/utilities/TestUtility.test';
import { resetIds } from '@fluentui/react';
import { DarkTheme } from '@fluentui/theme-samples';

Expand Down Expand Up @@ -605,7 +605,7 @@ runTest('_getAriaLabel', () => {
},
undefined,
undefined,
!(isTimezoneSet(tzIdentifier) && env === 'TEST'),
!(isTimezoneSet(tzIdentifier) && isTestEnv()),
);

testWithoutWait(
Expand Down Expand Up @@ -635,7 +635,7 @@ runTest('_getAriaLabel', () => {
},
undefined,
undefined,
!(isTimezoneSet(tzIdentifier) && env === 'TEST'),
!(isTimezoneSet(tzIdentifier) && isTestEnv()),
);

testWithoutWait(
Expand Down Expand Up @@ -665,7 +665,7 @@ runTest('_getAriaLabel', () => {
},
undefined,
undefined,
!(isTimezoneSet(tzIdentifier) && env === 'TEST'),
!(isTimezoneSet(tzIdentifier) && isTestEnv()),
);
});

Expand Down
26 changes: 13 additions & 13 deletions packages/react-charting/UnitTests/HeatMapChartUT.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { IHeatMapChartData, IHeatMapChartDataPoint } from '../src/HorizontalBarC
import { render } from '@testing-library/react';
import { dataToBuffer } from 'memfs/lib/volume';
import { XAxisTypes, YAxisType } from '../src/utilities/index';
import { conditionalTest, isTimezoneSet, forEachTimezone } from '../src/utilities/TestUtility.test';
import { conditionalTest, isTimezoneSet, forEachTimezone, isTestEnv } from '../src/utilities/TestUtility.test';
import { resetIds } from '@fluentui/react';

const env = require('../config/tests');
Expand Down Expand Up @@ -546,7 +546,7 @@ runTest('_createNewDataSet', () => {

runTest('Timezone related test cases', () => {
forEachTimezone((tzName, tzIdentifier) => {
conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper data set for date axis with default axis type in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -563,7 +563,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper aria-label for date xPoint and yPoint in ${tzName} timezone`,
() => {
const p1 = {
Expand All @@ -583,7 +583,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper aria-label for date xPoint and yPoint without legend in ${tzName} timezone`,
() => {
const p1 = {
Expand All @@ -603,7 +603,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper aria-label for numeric xPoint and date yPoint in ${tzName} timezone`,
() => {
const p1 = {
Expand All @@ -623,7 +623,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper X and Y values for date xPoint and yPoint in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -639,7 +639,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper xIndex for date xPoint in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -654,7 +654,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper yIndex for date xPoint in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -669,7 +669,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper string formatted date for date point in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -683,7 +683,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper string formatted date for empty point in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -697,7 +697,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper string formatted date for date point in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -711,7 +711,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper xAxis data points for date points in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand All @@ -726,7 +726,7 @@ runTest('Timezone related test cases', () => {
},
);

conditionalTest(isTimezoneSet(tzIdentifier) && env === 'TEST')(
conditionalTest(isTimezoneSet(tzIdentifier) && isTestEnv())(
`Should return proper yAxis data points for date points in ${tzName} timezone`,
() => {
const instance = new HeatMapChartBase({
Expand Down
7 changes: 3 additions & 4 deletions packages/react-charting/src/components/HeatMapChart/HeatMapChart.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import { IHeatMapChartState, HeatMapChartBase } from './HeatMapChart.base';
import { ThemeProvider } from '@fluentui/react';
import { DarkTheme } from '@fluentui/theme-samples';
import { act } from 'react-dom/test-utils';
import { conditionalDescribe, conditionalTest, isTimezoneSet } from '../../utilities/TestUtility.test';
import { conditionalDescribe, conditionalTest, isTimezoneSet, isTestEnv } from '../../utilities/TestUtility.test';
const { Timezone } = require('../../../scripts/constants');
const env = require('../../../config/tests');

// Wrapper of the HeatMapChart to be tested.
let wrapper: ReactWrapper<IHeatMapChartProps, IHeatMapChartState, HeatMapChartBase> | undefined;
Expand Down Expand Up @@ -100,7 +99,7 @@ const HeatMapStringDateData: IHeatMapChartProps['data'] = [
},
];

conditionalDescribe(isTimezoneSet(Timezone.UTC) && env === 'TEST')('HeatMapChart snapShot testing', () => {
conditionalDescribe(isTimezoneSet(Timezone.UTC) && isTestEnv())('HeatMapChart snapShot testing', () => {
beforeEach(() => {
resetIds();
});
Expand Down Expand Up @@ -333,7 +332,7 @@ describe('HeatMapChart - mouse events', () => {
beforeEach(sharedBeforeEach);
afterEach(sharedAfterEach);

conditionalTest(isTimezoneSet(Timezone.UTC) && env === 'TEST')(
conditionalTest(isTimezoneSet(Timezone.UTC) && isTestEnv())(
'Should render callout correctly on mouseover',
async () => {
await act(async () => {
Expand Down
5 changes: 2 additions & 3 deletions packages/react-charting/src/components/HeatMapChart/HeatMapChartRTL.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ import * as React from 'react';
import { act, queryAllByAttribute, render, waitFor, screen, fireEvent } from '@testing-library/react';
import { HeatMapChart, IHeatMapChartProps } from './index';
import { axe, toHaveNoViolations } from 'jest-axe';
import { conditionalTest, getByClass, isTimezoneSet } from '../../utilities/TestUtility.test';
import { conditionalTest, getByClass, isTimezoneSet, isTestEnv } from '../../utilities/TestUtility.test';
import { HeatMapChartBase } from './HeatMapChart.base';
import { resetIds } from '@fluentui/react';
const { Timezone } = require('../../../scripts/constants');
const env = require('../../../config/tests');

expect.extend(toHaveNoViolations);

Expand Down Expand Up @@ -170,7 +169,7 @@ describe('HeatMap chart rendering', () => {
beforeEach(updateChartWidthAndHeight);
afterEach(sharedAfterEach);

conditionalTest(isTimezoneSet(Timezone.UTC) && env === 'TEST')(
conditionalTest(isTimezoneSet(Timezone.UTC) && isTestEnv())(
'Should re-render the HeatMap chart with data',
async () => {
// Arrange
Expand Down
12 changes: 6 additions & 6 deletions packages/react-charting/src/components/VerticalBarChart/VerticalBarChartRTL.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import {
testScreenResolutionChanges,
testWithWait,
testWithoutWait,
isTestEnv,
} from '../../utilities/TestUtility.test';
import { IVerticalBarChartProps } from './VerticalBarChart.types';
import { IVerticalBarChartDataPoint } from '../../index';
import { chartPointsVBC } from '../../utilities/test-data';
import { axe, toHaveNoViolations } from 'jest-axe';
const { Timezone } = require('../../../scripts/constants');
const env = require('../../../config/tests');

expect.extend(toHaveNoViolations);

Expand Down Expand Up @@ -312,7 +312,7 @@ describe('Vertical bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(tzIdentifier) && env === 'TEST'),
!(isTimezoneSet(tzIdentifier) && isTestEnv()),
);
});

Expand All @@ -330,7 +330,7 @@ describe('Vertical bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(Timezone.UTC) && env === 'TEST'),
!(isTimezoneSet(Timezone.UTC) && isTestEnv()),
);

testWithoutWait(
Expand All @@ -346,7 +346,7 @@ describe('Vertical bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(Timezone.UTC) && env === 'TEST'),
!(isTimezoneSet(Timezone.UTC) && isTestEnv()),
);

testWithoutWait(
Expand All @@ -362,7 +362,7 @@ describe('Vertical bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(Timezone.UTC) && env === 'TEST'),
!(isTimezoneSet(Timezone.UTC) && isTestEnv()),
);

testWithoutWait(
Expand All @@ -377,7 +377,7 @@ describe('Vertical bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(Timezone.UTC) && env === 'TEST'),
!(isTimezoneSet(Timezone.UTC) && isTestEnv()),
);
});

Expand Down
10 changes: 5 additions & 5 deletions ...react-charting/src/components/VerticalStackedBarChart/VerticalStackedBarChartRTL.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import {
isTimezoneSet,
testWithWait,
testWithoutWait,
isTestEnv,
} from '../../utilities/TestUtility.test';
import { VerticalStackedBarChartBase } from './VerticalStackedBarChart.base';
import * as utils from '@fluentui/react/lib/Utilities';
import { chartPoints2VSBC, chartPointsVSBC } from '../../utilities/test-data';
import { axe, toHaveNoViolations } from 'jest-axe';
const { Timezone } = require('../../../scripts/constants');
const env = require('../../../config/tests');

expect.extend(toHaveNoViolations);

Expand Down Expand Up @@ -158,7 +158,7 @@ describe('Vertical stacked bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(Timezone.UTC) && env === 'TEST'),
!(isTimezoneSet(Timezone.UTC) && isTestEnv()),
);

testWithoutWait(
Expand All @@ -174,7 +174,7 @@ describe('Vertical stacked bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(Timezone.UTC) && env === 'TEST'),
!(isTimezoneSet(Timezone.UTC) && isTestEnv()),
);

testWithoutWait(
Expand All @@ -190,7 +190,7 @@ describe('Vertical stacked bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(Timezone.UTC) && env === 'TEST'),
!(isTimezoneSet(Timezone.UTC) && isTestEnv()),
);

forEachTimezone((tzName, tzIdentifier) => {
Expand All @@ -208,7 +208,7 @@ describe('Vertical stacked bar chart rendering', () => {
},
undefined,
undefined,
!(isTimezoneSet(tzIdentifier) && env === 'TEST'),
!(isTimezoneSet(tzIdentifier) && isTestEnv()),
);
});
});
Expand Down
Loading