Merge branch 'master' into migrate-delete-account-request-action-test

src/main/java/teammates/common/util/StringHelper.java

@@ -1,6 +1,7 @@
 package teammates.common.util;
 
 import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -179,7 +180,9 @@ public static <T> String toString(List<T> list, String delimiter) {
      * Converts a double value between 0 and 1 to 3dp-string.
      */
     public static String toDecimalFormatString(double doubleVal) {
-        DecimalFormat df = new DecimalFormat("0.###");
+        DecimalFormatSymbols syms = new DecimalFormatSymbols();
+        syms.setDecimalSeparator('.');
+        DecimalFormat df = new DecimalFormat("0.###", syms);
         return df.format(doubleVal);
     }
 

src/main/java/teammates/common/util/TimeHelper.java

@@ -7,6 +7,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.util.Locale;
 
 /**
  * A helper class to hold time-related functions (e.g., converting dates to strings etc.).
@@ -105,7 +106,9 @@ public static String formatInstant(Instant instant, String timeZone, String patt
         if (zonedDateTime.getHour() == 12 && zonedDateTime.getMinute() == 0) {
             processedPattern = pattern.replace("a", "'NOON'");
         }
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(processedPattern);
+        DateTimeFormatter formatter = DateTimeFormatter
+                .ofPattern(processedPattern)
+                .withLocale(Locale.US);
         return zonedDateTime.format(formatter);
     }
 

src/main/java/teammates/ui/webapi/DeleteAccountAction.java

@@ -5,7 +5,7 @@
 /**
  * Action: deletes an existing account (either student or instructor).
  */
-class DeleteAccountAction extends AdminOnlyAction {
+public class DeleteAccountAction extends AdminOnlyAction {
 
     @Override
     public JsonResult execute() {

src/test/java/teammates/common/datatransfer/questions/FeedbackNumericalScaleQuestionDetailsTest.java

@@ -19,7 +19,7 @@ public void testIsInstructorCommentsOnResponsesAllowed_shouldReturnTrue() {
     }
 
     @Test
-    public void tesValidateResponseDetails() {
+    public void testValidateResponseDetails() {
         FeedbackNumericalScaleQuestionDetails numScaleQuestion = new FeedbackNumericalScaleQuestionDetails();
         numScaleQuestion.setStep(0.1);
 

src/test/java/teammates/sqlui/webapi/DeleteAccountActionTest.java

@@ -0,0 +1,55 @@
+package teammates.sqlui.webapi;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import org.testng.annotations.Test;
+
+import teammates.common.datatransfer.InstructorPrivileges;
+import teammates.common.util.Const;
+import teammates.storage.sqlentity.Account;
+import teammates.storage.sqlentity.Course;
+import teammates.storage.sqlentity.Instructor;
+import teammates.ui.output.MessageOutput;
+import teammates.ui.webapi.DeleteAccountAction;
+
+/**
+ * SUT: {@link DeleteAccountAction}.
+ */
+public class DeleteAccountActionTest extends BaseActionTest<DeleteAccountAction> {
+    String googleId = "user-googleId";
+
+    @Override
+    protected String getActionUri() {
+        return Const.ResourceURIs.ACCOUNT;
+    }
+
+    @Override
+    protected String getRequestMethod() {
+        return DELETE;
+    }
+
+    @Test
+    protected void textExecute_nullParams_throwsInvalidHttpParameterException() {
+        String[] params = {
+                Const.ParamsNames.INSTRUCTOR_ID, null,
+        };
+        verifyHttpParameterFailure(params);
+    }
+
+    @Test
+    protected void testExecute_nonNullParams_success() {
+        Course stubCourse = new Course("course-id", "name", Const.DEFAULT_TIME_ZONE, "institute");
+        Account stubAccount = new Account(googleId, "name", "[email protected]");
+        Instructor instructor = new Instructor(stubCourse, "name", "[email protected]",
+                false, "", null, new InstructorPrivileges());
+        instructor.setAccount(stubAccount);
+        String[] params = {
+                Const.ParamsNames.INSTRUCTOR_ID, instructor.getGoogleId(),
+        };
+        DeleteAccountAction action = getAction(params);
+        MessageOutput actionOutput = (MessageOutput) getJsonResult(action).getOutput();
+        assertEquals("Account is successfully deleted.", actionOutput.getMessage());
+        verify(mockLogic, times(1)).deleteAccountCascade(googleId);
+    }
+}

src/test/java/teammates/sqlui/webapi/DeleteFeedbackQuestionActionTest.java

@@ -0,0 +1,124 @@
+package teammates.sqlui.webapi;
+
+import static org.mockito.Mockito.when;
+import static teammates.common.util.Const.InstructorPermissionRoleNames.INSTRUCTOR_PERMISSION_ROLE_OBSERVER;
+
+import java.util.UUID;
+
+import org.testng.annotations.Test;
+
+import teammates.common.datatransfer.InstructorPrivileges;
+import teammates.common.util.Const;
+import teammates.storage.sqlentity.Course;
+import teammates.storage.sqlentity.FeedbackQuestion;
+import teammates.storage.sqlentity.FeedbackSession;
+import teammates.storage.sqlentity.Instructor;
+import teammates.ui.output.MessageOutput;
+import teammates.ui.webapi.DeleteFeedbackQuestionAction;
+
+/**
+ * SUT: {@link DeleteFeedbackQuestionAction}.
+ */
+public class DeleteFeedbackQuestionActionTest extends BaseActionTest<DeleteFeedbackQuestionAction> {
+
+    private final Instructor typicalInstructor = getTypicalInstructor();
+    private final Course typicalCourse = typicalInstructor.getCourse();
+    private final FeedbackSession typicalFeedbackSession = getTypicalFeedbackSessionForCourse(typicalCourse);
+    private final FeedbackQuestion typicalFeedbackQuestion =
+            getTypicalFeedbackQuestionForSession(typicalFeedbackSession);
+
+    @Override
+    protected String getActionUri() {
+        return Const.ResourceURIs.QUESTION;
+    }
+
+    @Override
+    protected String getRequestMethod() {
+        return DELETE;
+    }
+
+    @Test
+    void testExecute_feedbackQuestionExists_success() {
+        when(mockLogic.getFeedbackQuestion(typicalFeedbackQuestion.getId())).thenReturn(typicalFeedbackQuestion);
+
+        String[] params = {
+                Const.ParamsNames.FEEDBACK_QUESTION_ID, typicalFeedbackQuestion.getId().toString(),
+        };
+
+        DeleteFeedbackQuestionAction action = getAction(params);
+        MessageOutput actionOutput = (MessageOutput) getJsonResult(action).getOutput();
+
+        assertEquals("Feedback question deleted!", actionOutput.getMessage());
+    }
+
+    @Test
+    void testExecute_feedbackQuestionDoesNotExist_failSilently() {
+        UUID nonexistentQuestionId = UUID.fromString("11110000-0000-0000-0000-000000000000");
+        when(mockLogic.getFeedbackQuestion(nonexistentQuestionId)).thenReturn(null);
+
+        String[] params = {
+                Const.ParamsNames.FEEDBACK_QUESTION_ID, nonexistentQuestionId.toString(),
+        };
+
+        DeleteFeedbackQuestionAction action = getAction(params);
+        MessageOutput actionOutput = (MessageOutput) getJsonResult(action).getOutput();
+
+        assertEquals("Feedback question deleted!", actionOutput.getMessage());
+    }
+
+    @Test
+    void testExecute_missingFeedbackQuestionId_throwsInvalidHttpParameterException() {
+        String[] params = {
+                Const.ParamsNames.FEEDBACK_QUESTION_ID, null,
+        };
+
+        verifyHttpParameterFailure(params);
+    }
+
+    @Test
+    void testSpecificAccessControl_nonExistentFeedbackQuestion_cannotAccess() {
+        when(mockLogic.getFeedbackQuestion(typicalFeedbackQuestion.getId())).thenReturn(null);
+        String[] submissionParams = {
+                Const.ParamsNames.FEEDBACK_QUESTION_ID, typicalFeedbackQuestion.getId().toString(),
+        };
+
+        verifyCannotAccess(submissionParams);
+    }
+
+    @Test
+    void testSpecificAccessControl_withModifySessionPrivilege_canAccess() {
+        when(mockLogic.getFeedbackQuestion(typicalFeedbackQuestion.getId())).thenReturn(typicalFeedbackQuestion);
+        when(mockLogic.getFeedbackSession(typicalFeedbackQuestion.getFeedbackSession().getName(),
+                typicalFeedbackQuestion.getCourseId())).thenReturn(typicalFeedbackSession);
+        when(mockLogic.getInstructorByGoogleId(typicalCourse.getId(), typicalInstructor.getGoogleId()))
+                .thenReturn(typicalInstructor);
+
+        String[] submissionParams = {
+                Const.ParamsNames.FEEDBACK_QUESTION_ID, typicalFeedbackQuestion.getId().toString(),
+        };
+
+        loginAsInstructor(typicalInstructor.getGoogleId());
+        verifyCanAccess(submissionParams);
+    }
+
+    @Test
+    void testSpecificAccessControl_withoutModifySessionPrivilege_cannotAccess() {
+        // create instructor without modify session privilege
+        Instructor instructorWithoutAccess = getTypicalInstructor();
+        instructorWithoutAccess.setPrivileges(new InstructorPrivileges(INSTRUCTOR_PERMISSION_ROLE_OBSERVER));
+
+        when(mockLogic.getFeedbackQuestion(typicalFeedbackQuestion.getId())).thenReturn(typicalFeedbackQuestion);
+        when(mockLogic.getFeedbackSession(typicalFeedbackQuestion.getFeedbackSession().getName(),
+                typicalFeedbackQuestion.getCourseId())).thenReturn(typicalFeedbackSession);
+        when(mockLogic.getInstructorByGoogleId(typicalCourse.getId(), instructorWithoutAccess.getGoogleId()))
+                .thenReturn(instructorWithoutAccess);
+
+        String[] submissionParams = {
+                Const.ParamsNames.FEEDBACK_QUESTION_ID, typicalFeedbackQuestion.getId().toString(),
+        };
+
+        loginAsInstructor(instructorWithoutAccess.getGoogleId());
+        verifyCannotAccess(submissionParams);
+    }
+
+}

src/test/java/teammates/sqlui/webapi/DeleteNotificationActionTest.java

@@ -0,0 +1,112 @@
+package teammates.sqlui.webapi;
+
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.when;
+
+import java.time.Instant;
+import java.util.UUID;
+
+import org.testng.annotations.Test;
+
+import teammates.common.datatransfer.NotificationStyle;
+import teammates.common.datatransfer.NotificationTargetUser;
+import teammates.common.util.Const;
+import teammates.storage.sqlentity.Notification;
+import teammates.ui.output.MessageOutput;
+import teammates.ui.webapi.DeleteNotificationAction;
+
+/**
+ * SUT: {@link DeleteNotificationAction}.
+ */
+public class DeleteNotificationActionTest extends BaseActionTest<DeleteNotificationAction> {
+    private static final String GOOGLE_ID = "user-googleId";
+
+    @Override
+    String getActionUri() {
+        return Const.ResourceURIs.NOTIFICATION;
+    }
+
+    @Override
+    String getRequestMethod() {
+        return DELETE;
+    }
+
+    @Test
+    void testSpecificAccessControl_admin_canAccess() {
+        loginAsAdmin();
+        verifyCanAccess();
+    }
+
+    @Test
+    void testSpecificAccessControl_instructor_cannotAccess() {
+        loginAsInstructor(GOOGLE_ID);
+        verifyCannotAccess();
+    }
+
+    @Test
+    void testSpecificAccessControl_student_cannotAccess() {
+        loginAsStudent(GOOGLE_ID);
+        verifyCannotAccess();
+    }
+
+    @Test
+    void testSpecificAccessControl_loggedOut_cannotAccess() {
+        logoutUser();
+        verifyCannotAccess();
+    }
+
+    @Test
+    void testExecute_notificationExists_success() {
+        Notification testNotification = new Notification(
+                Instant.now(),
+                Instant.ofEpochMilli(Instant.now().toEpochMilli() + 10000),
+                NotificationStyle.INFO,
+                NotificationTargetUser.GENERAL,
+                "title",
+                "message");
+
+        when(mockLogic.getNotification(testNotification.getId())).thenReturn(testNotification);
+
+        String[] params = {
+                Const.ParamsNames.NOTIFICATION_ID, testNotification.getId().toString(),
+        };
+
+        DeleteNotificationAction action = getAction(params);
+        MessageOutput actionOutput = (MessageOutput) getJsonResult(action).getOutput();
+
+        assertEquals("Notification has been deleted.", actionOutput.getMessage());
+        reset(mockLogic);
+    }
+
+    @Test
+    void testExecute_notificationDoesNotExist_failSilently() {
+        UUID invalidUuid = UUID.randomUUID();
+        when(mockLogic.getNotification(invalidUuid)).thenReturn(null);
+
+        String[] params = {
+                Const.ParamsNames.NOTIFICATION_ID, invalidUuid.toString(),
+        };
+
+        DeleteNotificationAction action = getAction(params);
+        MessageOutput actionOutput = (MessageOutput) getJsonResult(action).getOutput();
+
+        assertEquals("Notification has been deleted.", actionOutput.getMessage());
+        reset(mockLogic);
+    }
+
+    @Test
+    void testExecute_missingNotificationUuid_throwsInvalidHttpParameterException() {
+        String[] params = {
+                Const.ParamsNames.NOTIFICATION_ID, null,
+        };
+
+        verifyHttpParameterFailure(params);
+    }
+
+    @Test
+    void testExecute_missingParameters_throwsInvalidHttpParameterException() {
+        String[] params = {};
+
+        verifyHttpParameterFailure(params);
+    }
+}