From 24f7bdfda4565a6c56dd53ea035bfa09016de5d7 Mon Sep 17 00:00:00 2001 From: deepbluecanada Date: Sat, 2 Apr 2022 22:33:48 -0400 Subject: [PATCH 1/6] cloudOperation --- src/test/cloudOperations.test.tsx | 92 +++++++++++++++++++++---------- 1 file changed, 63 insertions(+), 29 deletions(-) diff --git a/src/test/cloudOperations.test.tsx b/src/test/cloudOperations.test.tsx index c82d855..42cf74f 100644 --- a/src/test/cloudOperations.test.tsx +++ b/src/test/cloudOperations.test.tsx @@ -18,17 +18,7 @@ test("based on the apparatus id it should return the apparatus json, but can rej }); }); -test("based on the apparatus id it should return the apparatus json", () => { - global.fetch = jest.fn(() => - Promise.resolve({ - json: () => Promise.resolve(testmetadata1), - }) - ) as jest.Mock; - const apparatusId = "evil-cylinder"; - return getApparatusFromCloud(apparatusId).then((testoutput) => { - expect(testoutput).toEqual(testmetadata1); - }); -}); + test("based on the user id and exp id, it should return the experience json but can reject", () => { global.fetch = jest.fn(() => Promise.reject()) as jest.Mock; @@ -88,24 +78,68 @@ test("delete an experience form cloud", () => { }); }); -test("setup apparatus data", () => { - const experienceDataTemp: ExperienceData = { - apparatusRoot: convertPathDataToTree(testmetadata1), - experience: { - experienceId: "exp1", - apparatusId: "", - actionList: [], - skyboxId: "", - }, - }; +describe("appratus json data", () => { global.fetch = jest.fn(() => - Promise.resolve({ - json: () => Promise.resolve(testmetadata1), - }) - ) as jest.Mock; - const apparatusId = "evil-cylinder"; - setupApparatusData(apparatusId, experienceDataTemp).then(() => { - expect(experienceDataTemp.apparatusRoot).toEqual(convertPathDataToTree(testmetadata1)); + Promise.resolve({ + json: () => Promise.resolve(testmetadata1), + })) as jest.Mock; + + it("based on the apparatus id it should return the apparatus json", () => { + const apparatusId = "evil-cylinder"; + return getApparatusFromCloud(apparatusId).then((testoutput) => { + expect(testoutput).toEqual(testmetadata1); + }); }); -}); + + it("setup apparatus data", () => { + const experienceDataTemp: ExperienceData = { + apparatusRoot: convertPathDataToTree(testmetadata1), + experience: { + experienceId: "exp1", + apparatusId: "", + actionList: [], + skyboxId: "", + }, + }; + + const apparatusId = "evil-cylinder"; + setupApparatusData(apparatusId, experienceDataTemp).then(() => { + expect(experienceDataTemp.apparatusRoot).toEqual(convertPathDataToTree(testmetadata1)); + }); + }); + +}) +// test("based on the apparatus id it should return the apparatus json", () => { +// global.fetch = jest.fn(() => +// Promise.resolve({ +// json: () => Promise.resolve(testmetadata1), +// }) +// ) as jest.Mock; +// const apparatusId = "evil-cylinder"; +// return getApparatusFromCloud(apparatusId).then((testoutput) => { +// expect(testoutput).toEqual(testmetadata1); +// }); +// }); + +// test("setup apparatus data", () => { +// const experienceDataTemp: ExperienceData = { +// apparatusRoot: convertPathDataToTree(testmetadata1), +// experience: { +// experienceId: "exp1", +// apparatusId: "", +// actionList: [], +// skyboxId: "", +// }, +// }; + +// global.fetch = jest.fn(() => +// Promise.resolve({ +// json: () => Promise.resolve(testmetadata1), +// }) +// ) as jest.Mock; +// const apparatusId = "evil-cylinder"; +// setupApparatusData(apparatusId, experienceDataTemp).then(() => { +// expect(experienceDataTemp.apparatusRoot).toEqual(convertPathDataToTree(testmetadata1)); +// }); +// }); From 8c5a23c78e5e4177cc2970d9fe7f2853a9b2b8a6 Mon Sep 17 00:00:00 2001 From: Yasaman Date: Sat, 2 Apr 2022 23:33:35 -0400 Subject: [PATCH 2/6] removed hello.ts --- pages/api/hello.ts | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 pages/api/hello.ts diff --git a/pages/api/hello.ts b/pages/api/hello.ts deleted file mode 100644 index 60fe934..0000000 --- a/pages/api/hello.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { NextApiRequest, NextApiResponse } from "next"; - -export default async (req: NextApiRequest, res: NextApiResponse) => { - res.status(200).json({ - message: "Hello World!", - }); -}; From 2c5a132201804149a82f3ad4ff80a223bc429edc Mon Sep 17 00:00:00 2001 From: Yasaman Date: Sat, 2 Apr 2022 23:35:47 -0400 Subject: [PATCH 3/6] fixed code smell for error handling --- src/util/cloudOperations/readFromCloud.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/cloudOperations/readFromCloud.ts b/src/util/cloudOperations/readFromCloud.ts index 7dc8981..fecbd94 100644 --- a/src/util/cloudOperations/readFromCloud.ts +++ b/src/util/cloudOperations/readFromCloud.ts @@ -26,7 +26,7 @@ function getExperienceFromCloud( mode: "cors", }) .then((response) => response.json()) - .catch((error) => null); + .catch((error) => error); } function setupApparatusData( From 37d5194e17f3d7f223dc4d111a24b736e38dae6c Mon Sep 17 00:00:00 2001 From: Yasaman Date: Sat, 2 Apr 2022 23:36:43 -0400 Subject: [PATCH 4/6] removed unused parameter --- src/components/Editor/ActionSequence/ActionSequence.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Editor/ActionSequence/ActionSequence.tsx b/src/components/Editor/ActionSequence/ActionSequence.tsx index dbd3b5f..5354b95 100644 --- a/src/components/Editor/ActionSequence/ActionSequence.tsx +++ b/src/components/Editor/ActionSequence/ActionSequence.tsx @@ -43,12 +43,12 @@ const DragContainer = styled.div` background-color: #3f3d56; `; -const useStyles = makeStyles((theme) => ({ +const useStyles = makeStyles({ SelectedAction: { border: "3px solid white", boxShadow: "0 0 10px white", }, -})); +}); function ActionSequence(): JSX.Element { const classes = useStyles(); From 7b132a643b3663bd5fa1e678bc79f66e7d39e1b9 Mon Sep 17 00:00:00 2001 From: Yasaman Date: Sun, 3 Apr 2022 00:08:10 -0400 Subject: [PATCH 5/6] fixed code duplication on cloudoperation test --- src/test/cloudOperations.test.tsx | 98 +++++++++++-------------------- 1 file changed, 33 insertions(+), 65 deletions(-) diff --git a/src/test/cloudOperations.test.tsx b/src/test/cloudOperations.test.tsx index 42cf74f..8bcf168 100644 --- a/src/test/cloudOperations.test.tsx +++ b/src/test/cloudOperations.test.tsx @@ -10,6 +10,38 @@ import { testSerializedExperience, testmetadata1 } from "./testConstants"; import { ExperienceData } from "../util/types"; import {convertPathDataToTree} from "../util/jsonParsing"; + +describe("appratus json data", () => { + global.fetch = jest.fn(() => + Promise.resolve({ + json: () => Promise.resolve(testmetadata1), + })) as jest.Mock; + + it("based on the apparatus id it should return the apparatus json", () => { + const apparatusId = "evil-cylinder"; + return getApparatusFromCloud(apparatusId).then((testoutput) => { + expect(testoutput).toEqual(testmetadata1); + }); + }); + + it("setup apparatus data", () => { + const experienceDataTemp: ExperienceData = { + apparatusRoot: convertPathDataToTree(testmetadata1), + experience: { + experienceId: "exp1", + apparatusId: "", + actionList: [], + skyboxId: "", + }, + }; + + const apparatusId = "evil-cylinder"; + setupApparatusData(apparatusId, experienceDataTemp).then(() => { + expect(experienceDataTemp.apparatusRoot).toEqual(convertPathDataToTree(testmetadata1)); + }); + }); +}); + test("based on the apparatus id it should return the apparatus json, but can reject", () => { global.fetch = jest.fn(() => Promise.reject()) as jest.Mock; const apparatusId = "wobble-sphere"; @@ -25,7 +57,7 @@ test("based on the user id and exp id, it should return the experience json but const userId = "testuser1"; const expId = "testexp1"; return getExperienceFromCloud(userId, expId).then((testoutput) => { - expect(testoutput).toEqual(null); + expect(testoutput).toEqual(undefined); }); }); @@ -79,67 +111,3 @@ test("delete an experience form cloud", () => { }); -describe("appratus json data", () => { - global.fetch = jest.fn(() => - Promise.resolve({ - json: () => Promise.resolve(testmetadata1), - })) as jest.Mock; - - it("based on the apparatus id it should return the apparatus json", () => { - const apparatusId = "evil-cylinder"; - return getApparatusFromCloud(apparatusId).then((testoutput) => { - expect(testoutput).toEqual(testmetadata1); - }); - }); - - it("setup apparatus data", () => { - const experienceDataTemp: ExperienceData = { - apparatusRoot: convertPathDataToTree(testmetadata1), - experience: { - experienceId: "exp1", - apparatusId: "", - actionList: [], - skyboxId: "", - }, - }; - - const apparatusId = "evil-cylinder"; - setupApparatusData(apparatusId, experienceDataTemp).then(() => { - expect(experienceDataTemp.apparatusRoot).toEqual(convertPathDataToTree(testmetadata1)); - }); - }); - -}) -// test("based on the apparatus id it should return the apparatus json", () => { -// global.fetch = jest.fn(() => -// Promise.resolve({ -// json: () => Promise.resolve(testmetadata1), -// }) -// ) as jest.Mock; -// const apparatusId = "evil-cylinder"; -// return getApparatusFromCloud(apparatusId).then((testoutput) => { -// expect(testoutput).toEqual(testmetadata1); -// }); -// }); - -// test("setup apparatus data", () => { -// const experienceDataTemp: ExperienceData = { -// apparatusRoot: convertPathDataToTree(testmetadata1), -// experience: { -// experienceId: "exp1", -// apparatusId: "", -// actionList: [], -// skyboxId: "", -// }, -// }; - -// global.fetch = jest.fn(() => -// Promise.resolve({ -// json: () => Promise.resolve(testmetadata1), -// }) -// ) as jest.Mock; -// const apparatusId = "evil-cylinder"; -// setupApparatusData(apparatusId, experienceDataTemp).then(() => { -// expect(experienceDataTemp.apparatusRoot).toEqual(convertPathDataToTree(testmetadata1)); -// }); -// }); From 4fbd37cc7d0f6525d815983e8f61f7f118442dbf Mon Sep 17 00:00:00 2001 From: Yasaman Date: Sun, 3 Apr 2022 00:08:30 -0400 Subject: [PATCH 6/6] enhanced duplication in guide.test --- src/test/guide.test.tsx | 87 ++++------------------------------------- 1 file changed, 7 insertions(+), 80 deletions(-) diff --git a/src/test/guide.test.tsx b/src/test/guide.test.tsx index 42dfdfd..f73d4ff 100644 --- a/src/test/guide.test.tsx +++ b/src/test/guide.test.tsx @@ -6,9 +6,11 @@ import { SideBarContext } from "../util/customHooks/sideBarContext"; import { useActionBar } from "../util/customHooks/actionBarFunc"; describe("Guide Funcs", () => { - it("key down", () => { - const { result } = renderHook(() => useActionBar()); - const sideBarContextValuesTest = { + let sideBarContextValuesTest; + let result; + beforeEach(() => { + result = renderHook(() => useActionBar()).result; + sideBarContextValuesTest = { toggleTextBox: result.current.toggleTextBox, toggleToolDoc: result.current.toggleToolDoc, toggleApparatusInfo: result.current.toggleApparatusInfo, @@ -25,7 +27,8 @@ describe("Guide Funcs", () => { showGuide: true, guideNum: result.current.guideNum, }; - + }); + it("key down", () => { const wrapper = ({ children }) => ( {children} @@ -38,25 +41,6 @@ describe("Guide Funcs", () => { fireEvent.keyDown(window, { key: "ArrowDown", code: "ArrowDown" }); }); it("Next Page", () => { - const { result } = renderHook(() => useActionBar()); - const sideBarContextValuesTest = { - toggleTextBox: result.current.toggleTextBox, - toggleToolDoc: result.current.toggleToolDoc, - toggleApparatusInfo: result.current.toggleApparatusInfo, - toggleSkyBoxInfo: result.current.toggleSkyBoxInfo, - toggleOverlay: () => undefined, - toggleGuide: result.current.toggleGuide, - setGuideNum: result.current.setGuideNum, - toggleSavingTip: () => undefined, - toolDoc: false, - apparatusInfo: false, - skyBoxInfo: false, - showOverlay: false, - savingTip: false, - showGuide: false, - guideNum: result.current.guideNum, - }; - const wrapper = ({ children }) => ( {children} @@ -70,25 +54,6 @@ describe("Guide Funcs", () => { }); it("Prev Page", () => { - const { result } = renderHook(() => useActionBar()); - const sideBarContextValuesTest = { - toggleTextBox: result.current.toggleTextBox, - toggleToolDoc: result.current.toggleToolDoc, - toggleApparatusInfo: result.current.toggleApparatusInfo, - toggleSkyBoxInfo: result.current.toggleSkyBoxInfo, - toggleOverlay: () => undefined, - toggleGuide: result.current.toggleGuide, - setGuideNum: result.current.setGuideNum, - toggleSavingTip: () => undefined, - toolDoc: false, - apparatusInfo: false, - skyBoxInfo: false, - showOverlay: false, - savingTip: false, - showGuide: false, - guideNum: result.current.guideNum, - }; - const wrapper = ({ children, val }) => ( {children} ); @@ -130,25 +95,6 @@ describe("Guide Funcs", () => { }); it("Page = 4", () => { - const { result } = renderHook(() => useActionBar()); - const sideBarContextValuesTest = { - toggleTextBox: result.current.toggleTextBox, - toggleToolDoc: result.current.toggleToolDoc, - toggleApparatusInfo: result.current.toggleApparatusInfo, - toggleSkyBoxInfo: result.current.toggleSkyBoxInfo, - toggleOverlay: () => undefined, - toggleGuide: result.current.toggleGuide, - setGuideNum: result.current.setGuideNum, - toggleSavingTip: () => undefined, - toolDoc: false, - apparatusInfo: false, - skyBoxInfo: false, - showOverlay: false, - savingTip: false, - showGuide: false, - guideNum: result.current.guideNum, - }; - const wrapper = ({ children, val }) => ( {children} ); @@ -189,25 +135,6 @@ describe("Guide Funcs", () => { expect(result.current.guideNum).toEqual(4); }); it("Page = 5", () => { - const { result } = renderHook(() => useActionBar()); - const sideBarContextValuesTest = { - toggleTextBox: result.current.toggleTextBox, - toggleToolDoc: result.current.toggleToolDoc, - toggleApparatusInfo: result.current.toggleApparatusInfo, - toggleSkyBoxInfo: result.current.toggleSkyBoxInfo, - toggleOverlay: () => undefined, - toggleGuide: result.current.toggleGuide, - setGuideNum: result.current.setGuideNum, - toggleSavingTip: () => undefined, - toolDoc: false, - apparatusInfo: false, - skyBoxInfo: false, - showOverlay: false, - savingTip: false, - showGuide: false, - guideNum: result.current.guideNum, - }; - const wrapper = ({ children, val }) => ( {children} );