passing tests

Author: tamu-sad-iii

src/test/java/controller/NoteControllerTest.java

@@ -83,7 +83,7 @@ public void setUp() {
         when(noteRepo.findOne(any(Long.class))).thenReturn(TEST_NOTE1);
         when(noteRepo.create(any(Note.class), any(Credentials.class))).thenReturn(TEST_NOTE1);
         when(noteRepo.update(any(Note.class))).thenReturn(TEST_MODIFIED_NOTE);
-        when(serviceRepo.getOne(any(Long.class))).thenReturn(TEST_SERVICE);
+        when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE);
         doNothing().when(noteRepo).delete(any(Note.class));
         doNothing().when(noteRepo).delete(any(Note.class));
     }

src/test/java/controller/NotificationControllerTest.java

@@ -68,8 +68,7 @@ public class NotificationControllerTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-
-        when(notificationRepo.findAll()).thenReturn(mockNotificationList);
+        when(notificationRepo.findAllByOrderByIdDesc()).thenReturn(mockNotificationList);
         when(notificationRepo.findOne(any(Long.class))).thenReturn(TEST_NOTIFICATION1);
         when(notificationRepo.create(any(Notification.class))).thenReturn(TEST_NOTIFICATION1);
         when(notificationRepo.update(any(Notification.class))).thenReturn(TEST_MODIFIED_NOTIFICATION);

src/test/java/controller/ServiceControllerTest.java

@@ -81,7 +81,7 @@ public void setUp() {
         when(credentials.getUin()).thenReturn("123456789");
         when(userRepo.findByUin(any(String.class))).thenReturn(user);
         when(systemMonitorService.getOverallStatus()).thenReturn(new OverallStatus(edu.tamu.app.enums.OverallMessageType.SUCCESS, "Success"));
-        when(serviceRepo.findAll()).thenReturn(mockServiceList);
+        when(serviceRepo.findAllByOrderByIdDesc()).thenReturn(mockServiceList);
         when(serviceRepo.findByIsPublicOrderByIdDesc(true)).thenReturn(mockPublicServiceList);
         when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE1);
         when(serviceRepo.create(any(Service.class))).thenReturn(TEST_SERVICE1);