From e5474178b4fc5141c3c0b44444aed9f9596de56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Perpignane?= Date: Mon, 30 Oct 2023 00:11:05 +0100 Subject: [PATCH] feat/basal adaptation screen cleaning --- src/screens/BasalAdaptationScreen.tsx | 23 ++++++++-------- .../__tests__/BasalAdaptationScreen.test.tsx | 26 ++++++++----------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/screens/BasalAdaptationScreen.tsx b/src/screens/BasalAdaptationScreen.tsx index 15db91c..14026c6 100644 --- a/src/screens/BasalAdaptationScreen.tsx +++ b/src/screens/BasalAdaptationScreen.tsx @@ -86,14 +86,14 @@ export class BasalAdaptationScreen extends React.Component<{}, BasalState> { Interval {i + 1}: { manageGlycemiaBefore(i, newtText) }} /> { manageGlycemiaAfter(i, newtText) @@ -107,18 +107,17 @@ export class BasalAdaptationScreen extends React.Component<{}, BasalState> { {glycemiaIntervalInputs} - {this.state.adaptation !== undefined && - - {this.state.adaptation} - - } + {this.state.adaptation !== undefined && ( + + + {this.state.adaptation} + + + )} ) } } - -// interface NightGlycemiaInterval { -// glycemiaBefore: number -// glycemiaAfter: number -// } diff --git a/src/screens/__tests__/BasalAdaptationScreen.test.tsx b/src/screens/__tests__/BasalAdaptationScreen.test.tsx index b053563..3fe6bb6 100644 --- a/src/screens/__tests__/BasalAdaptationScreen.test.tsx +++ b/src/screens/__tests__/BasalAdaptationScreen.test.tsx @@ -7,19 +7,18 @@ import {it, expect} from '@jest/globals' // Note: test renderer must be required after react-native. //import renderer from 'react-test-renderer'; import {fireEvent, render, screen} from '@testing-library/react-native' -import { BasalAdaptationScreen } from '../BasalAdaptationScreen' +import {BasalAdaptationScreen} from '../BasalAdaptationScreen' it('renders correctly', () => { let SampleScreen = () => render() - - for (let i = 1; i< 4 ; i++) { - expect(screen.getByTestId('glycmiaBeforeInput' + i)).toBeDefined() - expect(screen.getByTestId('glycmiaAfterInput' + i)).toBeDefined() - } - expect(() => screen.getByTestId('adaptationResult')).toThrowError(); + for (let i = 1; i < 4; i++) { + expect(screen.getByTestId('glycemiaBeforeInput' + i)).toBeDefined() + expect(screen.getByTestId('glycemiaAfterInput' + i)).toBeDefined() + } + expect(() => screen.getByTestId('adaptationResult')).toThrowError() }) it('display result when all glycemia levels are entered', () => { @@ -27,16 +26,13 @@ it('display result when all glycemia levels are entered', () => { render() - for (let i = 1; i< 4 ; i++) { - let currentBeforeInput = screen.getByTestId('glycmiaBeforeInput' + i) - let currentAfterInput = screen.getByTestId('glycmiaAfterInput' + i) + for (let i = 1; i < 4; i++) { + let currentBeforeInput = screen.getByTestId('glycemiaBeforeInput' + i) + let currentAfterInput = screen.getByTestId('glycemiaAfterInput' + i) fireEvent.changeText(currentBeforeInput, '1.2') fireEvent.changeText(currentAfterInput, '1.2') } - expect(screen.getByTestId('adaptationResult').props.children).toBeDefined(); - expect(screen.getByTestId('adaptationResult').props.children).toEqual(0); - + expect(screen.getByTestId('adaptationResult').props.children).toBeDefined() + expect(screen.getByTestId('adaptationResult').props.children).toEqual(0) }) - -