@hedia/recommendation-screen 1.8.2 → 2.0.2

package/src/__tests__/components/RecommendedInsulin.test.tsx

@@ -1,23 +1,29 @@
-import { SAFETY_INSULIN_LIMIT } from "@hedia/recommendation-calculator";
+import { BolusCalculator, UserSettings } from "@hedia/types";
 import React from "react";
 import { Platform } from "react-native";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
-import InvisibleNumberInput from "../../components/InvisibleNumberInput";
 import RecommendedInsulin from "../../components/RecommendedInsulin";
-import { InjectionMethod } from "../../types/enum";
+import { RecommendedInsulinTestIds } from "../../types/enum";
 import { expectTextExists, expectTextNotExists } from "../utils";
 
+const SAFETY_INSULIN_LIMIT = BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
+const InjectionMethod = UserSettings.Enums.InjectionMethod;
+
+const { PenHalf, PenWhole, Pump } = InjectionMethod;
+
 describe(`RecommendedInsulin - Component`, (): void => {
 	afterEach(cleanup);
 
 	test(`Component is rendered`, (): void => {
 		const updateMock = jest.fn();
-		const method: InjectionMethod = InjectionMethod.Pump;
+		const method: UserSettings.Enums.InjectionMethod = Pump;
 		const wrapper = render(
 			<RecommendedInsulin
 				insulinRecommendation={2.3}
 				updateRecommendedInsulin={updateMock}
 				injectionMethod={method}
+				activityReduction={null}
+				enteredInsulin={null}
 			/>,
 		);
 
@@ -28,7 +34,9 @@ describe(`RecommendedInsulin - Component`, (): void => {
 
 	test(`Insulin props defaults to 0`, (): void => {
 		const updateMock = jest.fn();
-		const method: InjectionMethod = InjectionMethod.PenHalf;
+		const method: UserSettings.Enums.InjectionMethod = PenHalf;
+
+		// @ts-ignore
 		const wrapper = render(<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={method} />);
 
 		expectTextExists(wrapper, `Recommended amount of insulin`);
@@ -37,27 +45,36 @@ describe(`RecommendedInsulin - Component`, (): void => {
 	});
 
 	test.each`
-		method                      | amount   | result
-		${InjectionMethod.PenWhole} | ${1}     | ${1}
-		${InjectionMethod.PenWhole} | ${1.49}  | ${1}
-		${InjectionMethod.PenWhole} | ${1.5}   | ${2}
-		${InjectionMethod.PenHalf}  | ${1.24}  | ${1}
-		${InjectionMethod.PenHalf}  | ${1.25}  | ${1.5}
-		${InjectionMethod.PenHalf}  | ${1.74}  | ${1.5}
-		${InjectionMethod.Pump}     | ${1.14}  | ${1.1}
-		${InjectionMethod.Pump}     | ${1.15}  | ${1.2}
-		${InjectionMethod.Pump}     | ${12.35} | ${12.4}
+		method      | amount   | result
+		${PenWhole} | ${1}     | ${1}
+		${PenWhole} | ${1.49}  | ${1}
+		${PenWhole} | ${1.5}   | ${2}
+		${PenHalf}  | ${1.24}  | ${1}
+		${PenHalf}  | ${1.25}  | ${1.5}
+		${PenHalf}  | ${1.74}  | ${1.5}
+		${Pump}     | ${1.14}  | ${1.1}
+		${Pump}     | ${1.15}  | ${1.2}
+		${Pump}     | ${12.35} | ${12.4}
 	`(
 		`Rounding $amount using $method to $result`,
-		({ amount, method, result }: { method: InjectionMethod; amount: number; result: number }): void => {
+		({
+			amount,
+			method,
+			result,
+		}: {
+			method: UserSettings.Enums.InjectionMethod;
+			amount: number;
+			result: number;
+		}): void => {
 			const updateMock = jest.fn();
 			const wrapper = render(
+				// @ts-ignore
 				<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={method} />,
 			);
 
 			expectTextExists(wrapper, `Recommended amount of insulin`);
 
-			const input = wrapper.queryByA11yLabel(`InvisibleNumberInput`);
+			const input = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
 
 			fireEvent(input, `onEnd`, amount);
 			expectTextExists(wrapper, `${result}`);
@@ -69,12 +86,16 @@ describe(`RecommendedInsulin - Component`, (): void => {
 		const updateMock = jest.fn();
 
 		const wrapper = render(
-			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={`Error` as InjectionMethod} />,
+			// @ts-ignore
+			<RecommendedInsulin
+				updateRecommendedInsulin={updateMock}
+				injectionMethod={`Error` as UserSettings.Enums.InjectionMethod}
+			/>,
 		);
 
 		expectTextExists(wrapper, `Recommended amount of insulin`);
 
-		const input = wrapper.queryByA11yLabel(`InvisibleNumberInput`);
+		const input = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
 
 		expect((): void => fireEvent(input, `onEnd`)).toThrowError(`Unsupported InjectionMethod: Error`);
 	});
@@ -86,12 +107,13 @@ describe(`RecommendedInsulin - Component`, (): void => {
 	`(`Will not remove leading zero from $value`, ({ result, value }: { value: number; result: number }): void => {
 		const updateMock = jest.fn();
 		const wrapper = render(
-			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={InjectionMethod.Pump} />,
+			// @ts-ignore
+			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={Pump} />,
 		);
 
 		expectTextExists(wrapper, `Recommended amount of insulin`);
 
-		const input = wrapper.queryByA11yLabel(`InvisibleNumberInput`);
+		const input = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
 		fireEvent(input, `onEnd`, value);
 		expectTextExists(wrapper, `${result}`);
 	});
@@ -103,12 +125,13 @@ describe(`RecommendedInsulin - Component`, (): void => {
 	`(`Will remove leading zero from $value`, ({ result, value }: { value: string; result: number }): void => {
 		const updateMock = jest.fn();
 		const wrapper = render(
-			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={InjectionMethod.Pump} />,
+			// @ts-ignore
+			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={Pump} />,
 		);
 
 		expectTextExists(wrapper, `Recommended amount of insulin`);
 
-		const input = wrapper.queryByA11yLabel(`InvisibleNumberInput`);
+		const input = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
 		fireEvent(input, `partialInput`, value);
 		expectTextExists(wrapper, `${result}`);
 	});
@@ -116,13 +139,13 @@ describe(`RecommendedInsulin - Component`, (): void => {
 	test(`Pressing on TouchableOpacity will callback on the invisible text input`, (): void => {
 		const updateMock = jest.fn();
 		const wrapper = render(
-			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={InjectionMethod.Pump} />,
+			// @ts-ignore
+			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={Pump} />,
 		);
 
 		expectTextExists(wrapper, `Recommended amount of insulin`);
 
-		const button = wrapper.queryByA11yLabel(`editRecommendedInsulin`);
-		expect(button).not.toBeNull();
+		const button = wrapper.getByTestId(RecommendedInsulinTestIds.EditRecommendedInsulin);
 
 		fireEvent(button, `onPress`);
 	});
@@ -140,16 +163,17 @@ describe(`RecommendedInsulin - Component`, (): void => {
 		({ reduction, isCorrect, value }: { value: string; reduction: number; isCorrect: boolean }): void => {
 			const updateMock = jest.fn();
 			const wrapper = render(
+				// @ts-ignore
 				<RecommendedInsulin
 					activityReduction={reduction}
 					updateRecommendedInsulin={updateMock}
-					injectionMethod={InjectionMethod.Pump}
+					injectionMethod={Pump}
 				/>,
 			);
 
 			expectTextExists(wrapper, `Recommended amount of insulin`);
 
-			const input = wrapper.UNSAFE_queryByType(InvisibleNumberInput);
+			const input = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
 			fireEvent(input, `onEnd`, value);
 
 			if (isCorrect) {
@@ -180,12 +204,13 @@ describe(`RecommendedInsulin - Component`, (): void => {
 				<RecommendedInsulin
 					insulinRecommendation={expected}
 					updateRecommendedInsulin={updateMock}
-					injectionMethod={InjectionMethod.Pump}
+					injectionMethod={Pump}
 					activityReduction={reduction}
+					enteredInsulin={null}
 				/>,
 			);
 
-			const input = wrapper.UNSAFE_queryByType(InvisibleNumberInput);
+			const input = wrapper.getByTestId(RecommendedInsulinTestIds.InvisibleInsulinInput);
 			const INVALID_INSULIN = SAFETY_INSULIN_LIMIT + 1;
 
 			fireEvent(input, `onEnd`, INVALID_INSULIN);
@@ -208,7 +233,8 @@ describe(`RecommendedInsulin - Component`, (): void => {
 
 		const updateMock = jest.fn();
 		const wrapper = render(
-			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={InjectionMethod.Pump} />,
+			// @ts-ignore
+			<RecommendedInsulin updateRecommendedInsulin={updateMock} injectionMethod={Pump} />,
 		);
 		expect(!!new RegExp(`"paddingBottom":"${padding}"`).exec(JSON.stringify(wrapper.toJSON()))).toBeTruthy();
 	});

package/src/__tests__/components/Remeasure.test.jsx

@@ -7,6 +7,7 @@ const react_1 = __importDefault(require("react"));
 const react_native_1 = require("react-native");
 const react_native_testing_library_1 = require("react-native-testing-library");
 const Remeasure_1 = __importDefault(require("../../components/Remeasure"));
+const enum_1 = require("../../types/enum");
 const utils_1 = require("../utils");
 describe(`Remeasure Component`, () => {
     afterEach(react_native_testing_library_1.cleanup);
@@ -21,7 +22,8 @@ describe(`Remeasure Component`, () => {
         const onChange = jest.fn();
         const wrapper = react_native_testing_library_1.render(<Remeasure_1.default remeasureTime={1.5} onSliderChange={onChange}/>);
         utils_1.expectTextExists(wrapper, `1.5`);
-        react_native_testing_library_1.fireEvent(wrapper.queryByA11yLabel(`remeasureSlider`), `onValueChange`, value);
+        const slider = wrapper.getByTestId(enum_1.RemeasureTestIds.RemeasureSlider);
+        react_native_testing_library_1.fireEvent(slider, `onValueChange`, value);
         wrapper.rerender(<Remeasure_1.default remeasureTime={value} onSliderChange={onChange}/>);
         utils_1.expectTextExists(wrapper, `Remind me to remeasure in`);
         utils_1.expectTextNotExists(wrapper, `1.5`);
@@ -42,7 +44,8 @@ describe(`Remeasure Component`, () => {
         const onChange = jest.fn();
         const wrapper = react_native_testing_library_1.render(<Remeasure_1.default remeasureTime={1.5} onSliderChange={onChange}/>);
         utils_1.expectTextExists(wrapper, `1.5`);
-        react_native_testing_library_1.fireEvent(wrapper.queryByA11yLabel(`remeasureSlider`), `onValueChange`, value);
+        const slider = wrapper.getByTestId(enum_1.RemeasureTestIds.RemeasureSlider);
+        react_native_testing_library_1.fireEvent(slider, `onValueChange`, value);
         wrapper.rerender(<Remeasure_1.default remeasureTime={value} onSliderChange={onChange}/>);
         utils_1.expectTextNotExists(wrapper, `1.5`);
         utils_1.expectTextExists(wrapper, expected);
@@ -60,7 +63,8 @@ describe(`Remeasure Component`, () => {
         const onChange = jest.fn();
         const wrapper = react_native_testing_library_1.render(<Remeasure_1.default remeasureTime={1.5} onSliderChange={onChange}/>);
         utils_1.expectTextExists(wrapper, `1.5`);
-        react_native_testing_library_1.fireEvent(wrapper.queryByA11yLabel(`remeasureSlider`), `onValueChange`, value);
+        const slider = wrapper.getByTestId(enum_1.RemeasureTestIds.RemeasureSlider);
+        react_native_testing_library_1.fireEvent(slider, `onValueChange`, value);
         wrapper.rerender(<Remeasure_1.default remeasureTime={value} onSliderChange={onChange}/>);
         utils_1.expectTextExists(wrapper, expected);
         expect(onChange).toBeCalledWith(value);

package/src/__tests__/components/Remeasure.test.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import { Platform } from "react-native";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import Remeasure from "../../components/Remeasure";
+import { RemeasureTestIds } from "../../types/enum";
 import { expectTextExists, expectTextNotExists } from "../utils";
 
 describe(`Remeasure Component`, (): void => {
@@ -20,7 +21,9 @@ describe(`Remeasure Component`, (): void => {
 			const onChange = jest.fn();
 			const wrapper = render(<Remeasure remeasureTime={1.5} onSliderChange={onChange} />);
 			expectTextExists(wrapper, `1.5`);
-			fireEvent(wrapper.queryByA11yLabel(`remeasureSlider`), `onValueChange`, value);
+			const slider = wrapper.getByTestId(RemeasureTestIds.RemeasureSlider);
+
+			fireEvent(slider, `onValueChange`, value);
 			wrapper.rerender(<Remeasure remeasureTime={value} onSliderChange={onChange} />);
 			expectTextExists(wrapper, `Remind me to remeasure in`);
 			expectTextNotExists(wrapper, `1.5`);
@@ -45,7 +48,9 @@ describe(`Remeasure Component`, (): void => {
 			const onChange = jest.fn();
 			const wrapper = render(<Remeasure remeasureTime={1.5} onSliderChange={onChange} />);
 			expectTextExists(wrapper, `1.5`);
-			fireEvent(wrapper.queryByA11yLabel(`remeasureSlider`), `onValueChange`, value);
+			const slider = wrapper.getByTestId(RemeasureTestIds.RemeasureSlider);
+
+			fireEvent(slider, `onValueChange`, value);
 			wrapper.rerender(<Remeasure remeasureTime={value} onSliderChange={onChange} />);
 			expectTextNotExists(wrapper, `1.5`);
 			expectTextExists(wrapper, expected);
@@ -64,7 +69,10 @@ describe(`Remeasure Component`, (): void => {
 		const onChange = jest.fn();
 		const wrapper = render(<Remeasure remeasureTime={1.5} onSliderChange={onChange} />);
 		expectTextExists(wrapper, `1.5`);
-		fireEvent(wrapper.queryByA11yLabel(`remeasureSlider`), `onValueChange`, value);
+
+		const slider = wrapper.getByTestId(RemeasureTestIds.RemeasureSlider);
+
+		fireEvent(slider, `onValueChange`, value);
 		wrapper.rerender(<Remeasure remeasureTime={value} onSliderChange={onChange} />);
 
 		expectTextExists(wrapper, expected);

package/src/__tests__/components/TransferToLogbook.test.jsx

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const react_native_testing_library_1 = require("react-native-testing-library");
 const TransferToLogbook_1 = __importDefault(require("../../components/TransferToLogbook"));
+const enum_1 = require("../../types/enum");
 const utils_1 = require("../utils");
 describe(`TransferToLogbook - Component`, () => {
     test(`Is null when visible not visible`, () => {
@@ -24,8 +25,7 @@ describe(`TransferToLogbook - Component`, () => {
         const transferMock = jest.fn();
         const wrapper = react_native_testing_library_1.render(<TransferToLogbook_1.default visible={true} transfer={transferMock}/>);
         utils_1.expectTextExists(wrapper, `Transfer to logbook`);
-        const button = wrapper.queryByA11yLabel(`transferToLogbook`);
-        expect(button).not.toBeNull();
+        const button = wrapper.getByTestId(enum_1.TransferToLogbookTestIds.TransferButton);
         expect(transferMock).not.toBeCalled();
         react_native_testing_library_1.fireEvent(button, `onPress`);
         utils_1.expectTextNotExists(wrapper, `Transfer to logbook`);

package/src/__tests__/components/TransferToLogbook.test.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { fireEvent, render } from "react-native-testing-library";
 import TransferToLogbook from "../../components/TransferToLogbook";
+import { TransferToLogbookTestIds } from "../../types/enum";
 import { expectTextExists, expectTextNotExists } from "../utils";
 
 describe(`TransferToLogbook - Component`, (): void => {
@@ -23,8 +24,7 @@ describe(`TransferToLogbook - Component`, (): void => {
 		const wrapper = render(<TransferToLogbook visible={true} transfer={transferMock} />);
 		expectTextExists(wrapper, `Transfer to logbook`);
 
-		const button = wrapper.queryByA11yLabel(`transferToLogbook`);
-		expect(button).not.toBeNull();
+		const button = wrapper.getByTestId(TransferToLogbookTestIds.TransferButton);
 
 		expect(transferMock).not.toBeCalled();
 

package/src/__tests__/components/TwoOptionModal.test.jsx

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const react_native_testing_library_1 = require("react-native-testing-library");
 const TwoOptionModal_1 = __importDefault(require("../../components/TwoOptionModal"));
+const enum_1 = require("../../types/enum");
 const utils_1 = require("../utils");
 describe(`TwoOptionModal Component`, () => {
     afterEach(react_native_testing_library_1.cleanup);
@@ -40,13 +41,13 @@ describe(`TwoOptionModal Component`, () => {
         };
         const wrapper = react_native_testing_library_1.render(<TwoOptionModal_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `Luk beregning`);
-        const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+        const modalExitIcon = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.ExitButton);
         react_native_testing_library_1.fireEvent(modalExitIcon, `onPress`);
         expect(props.onClose).toBeCalled();
-        const closeCalculation = wrapper.queryByA11yLabel(`secondOptionButton`);
+        const closeCalculation = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.SecondOption);
         react_native_testing_library_1.fireEvent(closeCalculation, `onPress`);
         expect(props.secondOption).toBeCalled();
-        const firstOptionButton = wrapper.queryByA11yLabel(`firstOptionButton`);
+        const firstOptionButton = wrapper.getByTestId(enum_1.TwoOptionModalTestIds.FirstOption);
         react_native_testing_library_1.fireEvent(firstOptionButton, `onPress`);
         expect(props.firstOption).toBeCalled();
     });
@@ -62,7 +63,7 @@ describe(`TwoOptionModal Component`, () => {
         };
         const wrapper = react_native_testing_library_1.render(<TwoOptionModal_1.default {...props}/>);
         utils_1.expectTextExists(wrapper, `Luk beregning`);
-        const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+        const modalExitIcon = wrapper.queryByTestId(enum_1.TwoOptionModalTestIds.ExitButton);
         expect(modalExitIcon).toBeNull();
     });
 });

package/src/__tests__/components/TwoOptionModal.test.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import { cleanup, fireEvent, render } from "react-native-testing-library";
 import TwoOptionModal, { ITwoOptionModalProps } from "../../components/TwoOptionModal";
+import { TwoOptionModalTestIds } from "../../types/enum";
 import { expectTextExists } from "../utils";
 
 describe(`TwoOptionModal Component`, (): void => {
@@ -39,18 +40,19 @@ describe(`TwoOptionModal Component`, (): void => {
 		const wrapper = render(<TwoOptionModal {...props} />);
 		expectTextExists(wrapper, `Luk beregning`);
 
-		const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+		const modalExitIcon = wrapper.getByTestId(TwoOptionModalTestIds.ExitButton);
 		fireEvent(modalExitIcon, `onPress`);
 		expect(props.onClose).toBeCalled();
 
-		const closeCalculation = wrapper.queryByA11yLabel(`secondOptionButton`);
+		const closeCalculation = wrapper.getByTestId(TwoOptionModalTestIds.SecondOption);
 		fireEvent(closeCalculation, `onPress`);
 		expect(props.secondOption).toBeCalled();
 
-		const firstOptionButton = wrapper.queryByA11yLabel(`firstOptionButton`);
+		const firstOptionButton = wrapper.getByTestId(TwoOptionModalTestIds.FirstOption);
 		fireEvent(firstOptionButton, `onPress`);
 		expect(props.firstOption).toBeCalled();
 	});
+
 	test(`Test it is not cancelable`, (): void => {
 		const props: ITwoOptionModalProps = {
 			firstOption: jest.fn(),
@@ -64,7 +66,7 @@ describe(`TwoOptionModal Component`, (): void => {
 		const wrapper = render(<TwoOptionModal {...props} />);
 		expectTextExists(wrapper, `Luk beregning`);
 
-		const modalExitIcon = wrapper.queryByA11yLabel(`ModalExitIcon`);
+		const modalExitIcon = wrapper.queryByTestId(TwoOptionModalTestIds.ExitButton);
 		expect(modalExitIcon).toBeNull();
 	});
 });

package/src/__tests__/utils.d.ts

@@ -1,11 +1,16 @@
 /// <reference types="react" />
-import { IRecommendationParams } from "@hedia/recommendation-calculator";
-import { IActivityParams } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
 import { RenderAPI } from "react-native-testing-library";
+import { ReactTestInstance } from "react-test-renderer";
 import { IRecommendationProps } from "../RecommendationScreen";
+import { TestIdEnum } from "../types/enum";
+import { IActivityParams, IRecommendationParams, logbookEntry } from "../types/types";
 export declare function getRecommendationProps(partials?: Partial<IRecommendationProps>): IRecommendationProps;
 export declare function generateDefaultCalculatorParams(): IRecommendationParams;
 export declare function generateActivityProps(): IActivityParams;
+export declare function generateDefaultActivitySettings(): IActivityParams["activitySettings"];
+export declare function generateDefaultLogbook(): logbookEntry;
 export declare function expectTextExists(component: RenderAPI, text: string | RegExp): void;
+export declare function queryTextFromComponent(wrapper: RenderAPI, testID: TestIdEnum): string;
 export declare function expectTextNotExists(component: RenderAPI, text: string | RegExp): void;
 export declare function i18nProvided(element: JSX.Element): JSX.Element;
+export declare function getIcon(wrapper: RenderAPI, name: string, active: boolean): ReactTestInstance | null;

package/src/__tests__/utils.jsx

@@ -3,23 +3,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.i18nProvided = exports.expectTextNotExists = exports.expectTextExists = exports.generateActivityProps = exports.generateDefaultCalculatorParams = exports.getRecommendationProps = void 0;
-const RecommendationCalculator_1 = require("@hedia/recommendation-calculator/src/RecommendationCalculator");
+exports.getIcon = exports.i18nProvided = exports.expectTextNotExists = exports.queryTextFromComponent = exports.expectTextExists = exports.generateDefaultLogbook = exports.generateDefaultActivitySettings = exports.generateActivityProps = exports.generateDefaultCalculatorParams = exports.getRecommendationProps = void 0;
 const types_1 = require("@hedia/types");
 const react_1 = require("@lingui/react");
 const react_2 = __importDefault(require("react"));
 const i18nUtils_1 = require("../locale/i18nUtils");
-const enum_1 = require("../types/enum");
+const ActivityEnum = types_1.Activity.Enums.ActivityEnum;
+const ActivityIntensity = types_1.Activity.Enums.ActivityIntensity;
+const InjectionMethod = types_1.UserSettings.Enums.InjectionMethod;
+const { Run } = ActivityEnum;
+const { moderate } = ActivityIntensity;
+const { PenHalf } = InjectionMethod;
 function getRecommendationProps(partials) {
     return {
         currentBKL: partials?.currentBKL ?? 0.1,
         bloodKetoneUnit: partials?.bloodKetoneUnit ?? types_1.BloodKetonesUnit.MMOL_L,
         bloodGlucoseUnit: partials?.bloodGlucoseUnit ?? types_1.BloodGlucoseUnit.MMOL_L,
-        language: partials?.language ?? enum_1.Language.en,
+        language: partials?.language ?? types_1.Languages.en,
         userReminder: partials?.userReminder ?? 1.5,
-        latestLogbookFrom6Hours: partials?.latestLogbookFrom6Hours,
+        latestLogbookFrom6Hours: partials?.latestLogbookFrom6Hours ?? generateDefaultLogbook(),
         calculatorParams: partials?.calculatorParams ?? generateDefaultCalculatorParams(),
-        injectionMethod: partials?.injectionMethod ?? enum_1.InjectionMethod.PenHalf,
+        injectionMethod: partials?.injectionMethod ?? PenHalf,
         transferToLogbook: partials?.transferToLogbook ?? jest.fn(),
         onError: partials?.onError ?? jest.fn(),
         onRecentInsulinYes: partials?.onRecentInsulinYes ?? jest.fn(),
@@ -30,7 +34,7 @@ function getRecommendationProps(partials) {
         restartCalculation: partials?.restartCalculation ?? jest.fn(),
         activityDisplayProps: partials?.activityDisplayProps ?? {
             activityTitle: `Activity Title Test`,
-            activityType: enum_1.ActivityEnum.Run,
+            activityType: Run,
         },
     };
 }
@@ -52,6 +56,7 @@ function generateDefaultCalculatorParams() {
                 secondsPassed: 10000,
             },
         ],
+        activity: null,
     };
 }
 exports.generateDefaultCalculatorParams = generateDefaultCalculatorParams;
@@ -59,17 +64,46 @@ function generateActivityProps() {
     return {
         activityDate: new Date(),
         activityDuration: 30,
-        activityIntensity: RecommendationCalculator_1.ActivityIntensity.Moderate,
-        activitySettings: {
-            hard: { fromFortysix: null, fromThirty: 0.25, fromZero: 1 },
-            light: { fromFortysix: 0.5, fromThirty: 0.75, fromZero: 1 },
-            moderate: { fromFortysix: 0.25, fromThirty: 0.5, fromZero: 1 },
-            post: { fromFortysix: 0.5, fromThirty: 0.5, fromZero: 1 },
-            target: 9,
-        },
+        activityIntensity: moderate,
+        activitySettings: generateDefaultActivitySettings(),
     };
 }
 exports.generateActivityProps = generateActivityProps;
+function generateDefaultActivitySettings() {
+    return {
+        hard: { fromFortysix: null, fromThirty: 0.25, fromZero: 1 },
+        light: { fromFortysix: 0.5, fromThirty: 0.75, fromZero: 1 },
+        moderate: { fromFortysix: 0.25, fromThirty: 0.5, fromZero: 1 },
+        post: { fromFortysix: 0.5, fromThirty: 0.5, fromZero: 1 },
+        target: 9,
+    };
+}
+exports.generateDefaultActivitySettings = generateDefaultActivitySettings;
+function generateDefaultLogbook() {
+    return {
+        blood_glucose_millimolar: 6,
+        carbohydrates_entered_grams: 25,
+        carbohydrates_suggested_grams: 25,
+        client_timestamp: `25`,
+        client_version: `25`,
+        entry_timestamp: `25`,
+        event_uuid: null,
+        insulin_entered_units: 25,
+        insulin_suggested_units: 25,
+        is_deleted: null,
+        mood: 2,
+        settings_uuid: `25`,
+        uuid: `aaa`,
+        device_and_os: `ios 12.1.2`,
+        overwritten_by_id: null,
+        server_timestamp: null,
+        server_version: null,
+        utc_timezone_offset: null,
+        blood_ketones_millimolar: null,
+        carbohydrates_modified_suggested_grams: null,
+    };
+}
+exports.generateDefaultLogbook = generateDefaultLogbook;
 function expectTextExists(component, text) {
     const element = component.queryByText(text);
     /*
@@ -80,6 +114,12 @@ function expectTextExists(component, text) {
     return expect(element).not.toBeNull();
 }
 exports.expectTextExists = expectTextExists;
+function queryTextFromComponent(wrapper, testID) {
+    const component = wrapper.getByTestId(testID);
+    const values = component.children;
+    return values.join(``);
+}
+exports.queryTextFromComponent = queryTextFromComponent;
 function expectTextNotExists(component, text) {
     const element = component.queryByText(text);
     /*
@@ -96,3 +136,7 @@ function i18nProvided(element) {
 		</react_1.I18nProvider>);
 }
 exports.i18nProvided = i18nProvided;
+function getIcon(wrapper, name, active) {
+    return wrapper.queryByA11yLabel(`${name}_${active}`);
+}
+exports.getIcon = getIcon;