From 97d3811198f3645350ddff50d3e3d23a1b48991a Mon Sep 17 00:00:00 2001 From: Neo Wei Qing Date: Sun, 25 Feb 2024 13:48:14 +0800 Subject: [PATCH 1/3] shift accounts json --- .../cases/FeedbackConstSumOptionQuestionE2ETest.java | 2 ++ .../data/FeedbackConstSumOptionQuestionE2ETest.json | 8 -------- ...dbackConstSumOptionQuestionE2ETest_SqlEntities.json | 10 ++++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json diff --git a/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java b/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java index 9e8dab1d3a1..1420e4ae584 100644 --- a/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java @@ -23,6 +23,8 @@ protected void prepareTestData() { testData = loadDataBundle("/FeedbackConstSumOptionQuestionE2ETest.json"); removeAndRestoreDataBundle(testData); + sqlTestData = removeAndRestoreSqlDataBundle(loadSqlDataBundle("/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json")); + instructor = testData.instructors.get("instructor"); course = testData.courses.get("course"); feedbackSession = testData.feedbackSessions.get("openSession"); diff --git a/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest.json b/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest.json index d39e29afddf..06c7e17f93b 100644 --- a/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest.json +++ b/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest.json @@ -1,12 +1,4 @@ { - "accounts": { - "instructorWithSessions": { - "googleId": "tm.e2e.FCSumOptQn.instructor", - "name": "Teammates Test", - "email": "tmms.test@gmail.tmt", - "readNotifications": {} - } - }, "courses": { "course": { "id": "tm.e2e.FCSumOptQn.CS2104", diff --git a/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json b/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json new file mode 100644 index 00000000000..a19c694845a --- /dev/null +++ b/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json @@ -0,0 +1,10 @@ +{ + "accounts": { + "instructorWithSessions": { + "googleId": "tm.e2e.FCSumOptQn.instructor", + "name": "Teammates Test", + "email": "tmms.test@gmail.tmt", + "readNotifications": {} + } + } +} From 5683263da0e7d4cd6df678792ef23db7af028737 Mon Sep 17 00:00:00 2001 From: Neo Wei Qing Date: Sun, 25 Feb 2024 14:40:20 +0800 Subject: [PATCH 2/3] update json --- .../FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json b/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json index a19c694845a..5c05cb2acbe 100644 --- a/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json +++ b/src/e2e/resources/data/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json @@ -1,10 +1,10 @@ { "accounts": { "instructorWithSessions": { + "id": "00000000-0000-4000-8000-000000000001", "googleId": "tm.e2e.FCSumOptQn.instructor", "name": "Teammates Test", - "email": "tmms.test@gmail.tmt", - "readNotifications": {} + "email": "tmms.test@gmail.tmt" } } } From de97705c7fabed1b2a9c08b06b4781d192c881f1 Mon Sep 17 00:00:00 2001 From: Neo Wei Qing Date: Sun, 25 Feb 2024 18:01:19 +0800 Subject: [PATCH 3/3] lint --- .../e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java b/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java index 1420e4ae584..c841d47bb0d 100644 --- a/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java +++ b/src/e2e/java/teammates/e2e/cases/FeedbackConstSumOptionQuestionE2ETest.java @@ -23,7 +23,8 @@ protected void prepareTestData() { testData = loadDataBundle("/FeedbackConstSumOptionQuestionE2ETest.json"); removeAndRestoreDataBundle(testData); - sqlTestData = removeAndRestoreSqlDataBundle(loadSqlDataBundle("/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json")); + sqlTestData = removeAndRestoreSqlDataBundle( + loadSqlDataBundle("/FeedbackConstSumOptionQuestionE2ETest_SqlEntities.json")); instructor = testData.instructors.get("instructor"); course = testData.courses.get("course");