updated tests

Author: Garret29

server/src/test/java/pl/piotrowski/remotetexteditor/controller/DocumentsControllerIntegrationTest.java

@@ -24,8 +24,8 @@
 import java.util.function.Supplier;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willDoNothing;
+import static org.mockito.BDDMockito.*;
+import static org.mockito.Mockito.verify;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -52,13 +52,16 @@ void getDocumentTest() throws Exception {
 
         Document document = testDocumentFactory.get();
 
-        given(documentsService.getDocument(document.getName())).willReturn(document);
+        String name = document.getName();
+        given(documentsService.getDocument(name)).willReturn(document);
 
-        mockMvc.perform(get("/docs/{name}", document.getName())).andExpect(status().isOk())
-                .andExpect(jsonPath("$.name").value(document.getName()))
+        mockMvc.perform(get("/docs/{name}", name)).andExpect(status().isOk())
+                .andExpect(jsonPath("$.name").value(name))
                 .andExpect(jsonPath("$.content").value(document.getContent()))
                 .andExpect(jsonPath("$.id").value(document.getId())).andReturn();
 
+        then(documentsService).should().getDocument(name);
+
     }
 
     @Test
@@ -75,26 +78,29 @@ void getAllDocumentsTest() throws Exception {
                         });
 
         assertEquals(documents, documentsFromResponse);
+        then(documentsService).should().getAllDocuments();
     }
 
     @Test
     void deleteDocumentTest() throws Exception {
 
         Document document = testDocumentFactory.get();
 
-        willDoNothing().given(documentsService).removeDocument(document.getName());
-        given(documentsService.getDocument(document.getName())).willReturn(document);
+        String name = document.getName();
+        willDoNothing().given(documentsService).removeDocument(name);
+        given(documentsService.getDocument(name)).willReturn(document);
 
-        MvcResult mvcResult = mockMvc.perform(delete("/docs/{name}/delete", document.getName()))
+        MvcResult mvcResult = mockMvc.perform(delete("/docs/{name}/delete", name))
                 .andExpect(status().isOk()).andReturn();
 
         HashMap<String, Document> response = objectMapper
                 .readValue(mvcResult.getResponse().getContentAsString(),
                         new TypeReference<HashMap<String, Document>>() {
                         });
 
-        assertEquals(response.get("deleted").getName(), document.getName());
-
+        assertEquals(response.get("deleted").getName(), name);
+        then(documentsService).should().removeDocument(name);
+        then(documentsService).should().getDocument(name);
 
     }
 
@@ -112,18 +118,23 @@ void createDocumentTest() throws Exception {
         Document addedDocument = objectMapper.readValue(mvcResult.getResponse().getContentAsString(), Document.class);
 
         assertEquals(document, addedDocument);
+
+        then(documentsService).should().addDocument(document);
     }
 
     @Test
     void renameTest() throws Exception {
         Document document = testDocumentFactory.get();
         String newName = "Foo";
 
-        given(documentsService.changeDocumentsName(document.getName(), newName)).willReturn(document);
+        String name = document.getName();
+        given(documentsService.changeDocumentsName(name, newName)).willReturn(document);
 
-        mockMvc.perform(patch("/docs/{name}", document.getName()).param("newName", newName))
+        mockMvc.perform(patch("/docs/{name}", name).param("newName", newName))
                 .andExpect(status().isOk()).andReturn();
 
+        then(documentsService).should().changeDocumentsName(name, newName);
+
     }
 
 

server/src/test/java/pl/piotrowski/remotetexteditor/dataaccess/DataAccessIntegrationTest.java

@@ -1,28 +1,19 @@
 package pl.piotrowski.remotetexteditor.dataaccess;
 
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import org.hibernate.exception.ConstraintViolationException;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.context.annotation.Profile;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import pl.piotrowski.remotetexteditor.Application;
-import pl.piotrowski.remotetexteditor.application.DocumentsService;
 import pl.piotrowski.remotetexteditor.configuration.TestContext;
 import pl.piotrowski.remotetexteditor.model.Document;
-import pl.piotrowski.remotetexteditor.service.exceptions.DocumentNotFoundException;
 
 import javax.persistence.PersistenceException;
-import javax.print.Doc;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.function.Supplier;
@@ -83,9 +74,9 @@ void deleteByNameTest() {
 
     @Test
     void saveDuplicateThrowsException() {
-        Document newDoc = new Document("Hello there!","General Kenobi!");
+        Document newDoc = new Document("Hello there!", "General Kenobi!");
         documentsRepository.save(newDoc);
         documentsRepository.save(new Document("Hello there!", "Hi!"));
-        assertThrows(PersistenceException.class, ()-> entityManager.flush());
+        assertThrows(PersistenceException.class, () -> entityManager.flush());
     }
 }

server/src/test/java/pl/piotrowski/remotetexteditor/service/DocumentsServiceTest.java

@@ -14,18 +14,15 @@
 import pl.piotrowski.remotetexteditor.dataaccess.DocumentsRepository;
 import pl.piotrowski.remotetexteditor.model.Document;
 import pl.piotrowski.remotetexteditor.model.Update;
-import pl.piotrowski.remotetexteditor.service.exceptions.DocumentNotFoundException;
 
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.function.Supplier;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
 import static org.mockito.BDDMockito.willDoNothing;
-import static org.mockito.Mockito.verify;
 
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {TestContext.class, Application.class})