Updated tests to handle new Service model

Author: jcreel

src/test/java/controller/ServiceControllerTest.java

@@ -41,10 +41,10 @@ public class ServiceControllerTest {
     protected static final Boolean TEST_ON_SHORT_LIST = true;
     protected static final Boolean TEST_NOT_ON_SHORT_LIST = false;
 
-    protected static Service TEST_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, "");
-    protected static Service TEST_SERVICE2 = new Service(TEST_SERVICE2_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_ON_SHORT_LIST, "");
-    protected static Service TEST_SERVICE3 = new Service(TEST_SERVICE3_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_NOT_ON_SHORT_LIST, "");
-    protected static Service TEST_MODIFIED_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_NOT_ON_SHORT_LIST, "");
+    protected static Service TEST_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, "", "");
+    protected static Service TEST_SERVICE2 = new Service(TEST_SERVICE2_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_ON_SHORT_LIST, "", "");
+    protected static Service TEST_SERVICE3 = new Service(TEST_SERVICE3_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_NOT_ON_SHORT_LIST, "", "");
+    protected static Service TEST_MODIFIED_SERVICE1 = new Service(TEST_SERVICE1_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_NOT_PUBLIC, TEST_NOT_ON_SHORT_LIST, "", "");
     protected static List<Service> mockServiceList = new ArrayList<Service>(Arrays.asList(new Service[] { TEST_SERVICE1, TEST_SERVICE2,TEST_SERVICE3 }));
     protected static List<Service> mockPublicServiceList = new ArrayList<Service>(Arrays.asList(new Service[] { TEST_SERVICE1, TEST_SERVICE3 }));
 
@@ -65,7 +65,7 @@ public void setUp() {
         when(serviceRepo.findAll()).thenReturn(mockServiceList);
         when(serviceRepo.findByIsPublic(true)).thenReturn(mockPublicServiceList);
         when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE1);
-        when(serviceRepo.create(any(String.class), any(Status.class), any(Boolean.class), any(Boolean.class), any(Boolean.class), any(String.class))).thenReturn(TEST_SERVICE1);
+        when(serviceRepo.create(any(String.class), any(Status.class), any(Boolean.class), any(Boolean.class), any(Boolean.class), any(String.class), any(String.class))).thenReturn(TEST_SERVICE1);
         when(serviceRepo.save(any(Service.class))).thenReturn(TEST_MODIFIED_SERVICE1);
         doNothing().when(serviceRepo).delete(any(Service.class));
     }

src/test/java/edu/tamu/app/model/NoteTest.java

@@ -34,6 +34,8 @@
 public class NoteTest {
 
     protected static final String TEST_NOTE_TITLE = "Note Title";
+    protected static final String TEST_SERVICE_URL = "https://library.tamu.edu";
+    protected static final String TEST_DESCRIPTION = "Test Service Description";
     protected static final String TEST_ALTERNATIVE_NOTE_TITLE = "Alternative Note Title";
     protected static final String TEST_SERVICE_NAME = "Test Service Name";
     protected static final String TEST_ALTERNATIVE_SERVICE_NAME = "Different Service Name";
@@ -70,8 +72,8 @@ public class NoteTest {
     @Before
     public void setUp() {
         testUser = appUserRepo.create(TEST_CREDENTIALS.getUin());
-        service1 = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
-        service2 = serviceRepo.create(TEST_ALTERNATIVE_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        service1 = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
+        service2 = serviceRepo.create(TEST_ALTERNATIVE_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
         testNote = noteRepo.create(new Note(TEST_NOTE_TITLE, testUser, TEST_NOTE_TYPE, TEST_NOTE_BODY, service1), TEST_CREDENTIALS);
     }
 

src/test/java/edu/tamu/app/model/ServiceTest.java

@@ -30,6 +30,7 @@ public class ServiceTest {
 
     protected static final String TEST_SERVICE_NAME = "Test Service Name";
     protected static final String TEST_SERVICE_URL = "https://library.tamu.edu";
+    protected static final String TEST_DESCRIPTION = "Test Service Description";
     protected static final Status TEST_SERVICE_STATUS = Status.UP;
     protected static final List<String> TEST_SERVICE_ALIASES = Arrays.asList("Alias 1", "Alias 2", "Alias 3");
     protected static final String TEST_NOTE_TITLE1 = "Note 1";
@@ -59,28 +60,28 @@ public void setUp() {
     @Test
     public void testCreate() {
         long initalCount = serviceRepo.count();
-        serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
         assertEquals("The number of Services did not increase by one", initalCount + 1, serviceRepo.count());
     }
 
     @Test(expected = DataIntegrityViolationException.class)
     public void testNameNotNull() {
-        serviceRepo.create(null, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        serviceRepo.create(null, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
     }
 
     @Test(expected = DataIntegrityViolationException.class)
     public void testStatusNotNull() {
-        serviceRepo.create(TEST_SERVICE_NAME, null, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        serviceRepo.create(TEST_SERVICE_NAME, null, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
     }
 
     @Test(expected = ConstraintViolationException.class)
     public void testNameNotEmpty() {
-        serviceRepo.create("", TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        serviceRepo.create("", TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
     }
 
     @Test
     public void testUpdateName() {
-        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
         service.setName(TEST_ALTERNATIVE_SERVICE_NAME);
         service = refreshService(service);
         assertEquals("Service name was not changed", TEST_ALTERNATIVE_SERVICE_NAME, service.getName());
@@ -93,7 +94,7 @@ private Service refreshService(Service service) {
 
     @Test
     public void testUpdateAliases() {
-        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
         service.setAliases(TEST_SERVICE_ALIASES);
         service = refreshService(service);
         assertEquals("Service aliases not set", true, service.getAliases().contains("Alias 1"));
@@ -104,15 +105,15 @@ public void testUpdateAliases() {
 
     @Test
     public void testUpdateStatus() {
-        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
         service.setStatus(TEST_ALTERNATIVE_SERVICE_STATUS);
         service = refreshService(service);
         assertEquals("Service status was not changed", TEST_ALTERNATIVE_SERVICE_STATUS, service.getStatus());
     }
 
     @Test
     public void testUpdateServiceUrl() {
-        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
         service.setServiceUrl(TEST_SERVICE_URL);
         service = refreshService(service);
         assertEquals("Service status url was not changed", TEST_SERVICE_URL, service.getServiceUrl());
@@ -138,7 +139,7 @@ public void testUpdateServiceUrl() {
     @Test
     public void testDelete() {
         long initialCount = serviceRepo.count();
-        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_ALTERNATIVE_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, null);
+        Service service = serviceRepo.create(TEST_SERVICE_NAME, TEST_ALTERNATIVE_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION);
         assertEquals("The service was not created", initialCount + 1, serviceRepo.count());
         serviceRepo.delete(service);
         assertEquals("The service was not deleted", initialCount, serviceRepo.count());