Merge pull request #53 from labens-ufrn/fix/unit_tests_team

Fix/unit tests team

Author: joaoeudes7

pom.xml

@@ -100,7 +100,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>[8.0.16,)</version>
+            <version>[8.0.22,)</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>

src/main/java/br/ufrn/dct/apf/configuration/WebMvcConfig.java

@@ -22,7 +22,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Value("${spring.datasource.url}")
     private String jdbcURl;
 
-    @Value("${spring.datasource.driverclassname}")
+    @Value("${spring.datasource.driverClassName}")
     private String driverDB;
 
     @Value("${spring.datasource.username}")

src/main/java/br/ufrn/dct/apf/model/Member.java

@@ -113,6 +113,4 @@ public boolean equals(Object obj) {
             return other.user == null;
         } else return user.equals(other.user);
     }
-
-
 }

src/main/java/br/ufrn/dct/apf/service/MemberService.java

@@ -24,22 +24,28 @@ public Member findOne(Long id) {
         return repository.findById(id).orElse(null);
     }
 
+    /**
+     * Checks whether the member object is already part of the team, if not, the object is saved. 
+     * If the member is already linked to the project, it returns the member instance.
+     * @param member A member instance with no id.
+     * @return the member instance.
+     * @throws BusinessRuleException If the parameter is null.
+     */
     public Member save(Member member) throws BusinessRuleException {
         checkMemberNull(member);
-
-        if (isMember(member.getProject().getId(), member.getUser().getId())) {
+        Member memberDB = getMember(member.getProject().getId(), member.getUser().getId());
+        if (isNull(memberDB)) {
             return repository.saveAndFlush(member);
         }
-
-        return member;
+        return memberDB;
     }
 
-    public Member getMember(Long projectId, Long memberId) {
-        return repository.findByProjectIdAndUserId(projectId, memberId);
+    public Member getMember(Long projectId, Long userId) {
+        return repository.findByProjectIdAndUserId(projectId, userId);
     }
 
-    public Boolean isMember(Long projectId, Long memberId) {
-        return getMember(projectId, memberId) != null;
+    public Boolean isMember(Long projectId, Long userId) {
+        return getMember(projectId, userId) != null;
     }
 
     public List<Member> getMembersByProject(Long projectId) {

src/main/resources/application.properties

@@ -6,7 +6,7 @@ spring.datasource.username = apf_user
 spring.datasource.password = 12345
 spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
-spring.datasource.driverclassname = com.mysql.cj.jdbc.Driver
+spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
 
 # ===============================
 # = JPA / HIBERNATE
@@ -34,7 +34,7 @@ spring.thymeleaf.cache=false
 # Context path of the application.
 server.servlet.context-path=/apf
 # Display name of the application.
-server.display-name=Analisador de Pontos de Função
+server.servlet.application-display-name=Analisador de Pontos de Função
 # Define server port.
 server.port=8080
 

src/test/java/br/ufrn/dct/apf/controller/LoginControllerTest.java

@@ -0,0 +1,61 @@
+package br.ufrn.dct.apf.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.web.servlet.MockMvc;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+
+import br.ufrn.dct.apf.service.ProjectService;
+import br.ufrn.dct.apf.service.UserService;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.hamcrest.Matchers.containsString;
+
+@WebMvcTest(LoginController.class)
+public class LoginControllerTest extends AbstractControllerTest {
+
+    private SoftAssert softAssert;
+
+    @BeforeMethod
+    public void startTest() {
+        softAssert = new SoftAssert();
+    }
+
+    @AfterMethod
+    public void endTest() {
+        softAssert = null;
+    }
+
+    @Autowired
+    private MockMvc mockMvc;
+    
+    @MockBean
+    private UserService userService;
+
+    @MockBean
+    private ProjectService projectService;
+
+    @Test
+	public void getRootURL() throws Exception {
+        softAssert.assertNotNull(mockMvc);
+        mockMvc.perform(get("/"))
+               .andDo(print())
+               .andExpect(status().isOk())
+               .andExpect(content().string(containsString("action=\"/login\"")));
+	}
+
+    @Test
+	public void getRegistrationURL() throws Exception {
+        softAssert.assertNotNull(mockMvc);
+        mockMvc.perform(get("/registration"))
+               .andDo(print())
+               .andExpect(status().isOk());
+	}
+}

src/test/java/br/ufrn/dct/apf/controller/UserStoryControllerTest.java

@@ -25,23 +25,19 @@ public class UserStoryControllerTest extends AbstractControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @Autowired
+    @MockBean
     private UserStoryService userStoryService;
 
     @MockBean
-    private UserStoryService service;
+    private ProjectService projectService;
 
     @MockBean
     private UserService userService;
-    
-    @MockBean
-    private ProjectService projectService;
-    
+
     @Test
     public void listFromService() throws Exception {
-       List<UserStory> value = new ArrayList<>();
-       System.err.println(userStoryService);
-       when(userStoryService.findAll()).thenReturn(value);
+       //List<UserStory> value = new ArrayList<>();
+       //when(userStoryService.findAll()).thenReturn(value);
 
         mockMvc.perform(get("/us/list"))
         .andDo(print())

src/test/java/br/ufrn/dct/apf/service/TeamServiceTest.java

@@ -37,7 +37,6 @@ public class TeamServiceTest extends AbstractTestNGSpringContextTests {
     private Project p1;
     private User analista, desenvolvedor, dev2;
     private Member m1, m2;
-    private Attribution projectOwner, projectDev;
 
     @BeforeMethod
     public void startTest() throws BusinessRuleException {
@@ -61,15 +60,6 @@ public void startTest() throws BusinessRuleException {
         dev2.setEmail("dev2@gmai.com");
         dev2.setPassword("12345");
 
-        projectOwner = new Attribution();
-        projectOwner.setName(Attribution.PROJECT_MANAGER);
-
-        projectDev = new Attribution();
-        projectDev.setName(Attribution.PROJECT_DEV);
-
-        attribRepository.save(projectOwner);
-        attribRepository.save(projectDev);
-
         userService.save(analista);
         userService.save(desenvolvedor);
 
@@ -89,8 +79,6 @@ public void endTest() {
         projectService.delete(p1.getId());
         userService.delete(analista.getId());
         userService.delete(desenvolvedor.getId());
-        attribRepository.deleteById(projectOwner.getId());
-        attribRepository.deleteById(projectDev.getId());
         p1 = null;
     }
 
@@ -129,20 +117,19 @@ public void findOne() {
         softAssert.assertEquals(found.getAttribution().getName(), Attribution.PROJECT_MANAGER, "T07 - Equals:");
 
         Attribution attribManager = attribRepository.findById(1).orElse(null);
-        Attribution attribOwner = attribRepository.findByName(Attribution.PROJECT_MANAGER);
+        Attribution attribMember = attribRepository.findByName(Attribution.PROJECT_MEMBER);
 
         softAssert.assertTrue(found.getAttribution().equals(attribManager), "T08 - Equals:");
-        softAssert.assertFalse(found.getAttribution().equals(attribOwner), "T09 - Equals:");
+        softAssert.assertFalse(found.getAttribution().equals(attribMember), "T09 - Equals:");
         softAssert.assertFalse(found.getAttribution().equals(null), "T10 - Equals:");
-        softAssert.assertTrue(projectOwner.equals(projectOwner), "T11 - Equals:");
-        softAssert.assertTrue(projectOwner.equals(attribOwner), "T12 - Equals:");
+        //softAssert.assertTrue(attribMember.equals(attribManager), "T11 - Equals:");
 
         List<Attribution> atts = attribRepository.findAll();
 
         softAssert.assertNotNull(atts, "T13 - NotNull:");
-        softAssert.assertEquals(atts.size(), 4, "T14 - Equals:");
+        softAssert.assertEquals(atts.size(), 2, "T14 - Equals:");
 
-        softAssert.assertNotNull(attribOwner.hashCode(), "T15 - Equals:");
+        softAssert.assertNotNull(attribMember.hashCode(), "T15 - Equals:");
 
         softAssert.assertAll();
     }
@@ -231,6 +218,13 @@ public void save() throws BusinessRuleException {
         softAssert.assertAll();
     }
 
+    @Test(expectedExceptions = BusinessRuleException.class, 
+          expectedExceptionsMessageRegExp = "error.member.service.member.is.null")
+    public void saveMemberNull() throws BusinessRuleException {
+        Member isNull = null;
+        memberService.save(isNull);
+    }
+
     @Test
     public void saveMember() throws BusinessRuleException {
 
@@ -287,6 +281,8 @@ public void saveMember() throws BusinessRuleException {
         softAssert.assertTrue(team2.contains(t02), "T05.4 - True:");
         softAssert.assertTrue(team2.contains(m1), "T05.5 - True:");
         softAssert.assertTrue(team2.contains(m2), "T05.6 - True:");
+        softAssert.assertTrue(memberService.isMember(p1.getId(), m1.getUser().getId()), "T05.7 - True:");
+        softAssert.assertTrue(memberService.isMember(p1.getId(), m2.getUser().getId()), "T05.8 - True:");
 
         List<Project> projectByDev = projectService.findByUserId(desenvolvedor.getId());
         softAssert.assertEquals(projectByDev.size(), 1, "T06 - Equals:");
@@ -298,6 +294,9 @@ public void saveMember() throws BusinessRuleException {
         Project project = projectByDev.get(0);
         softAssert.assertEquals(project.getId(), p1.getId(), "T07 - Equals:");
 
+        List<Member> listMembers = memberService.getMembersByProject(p1.getId());
+        softAssert.assertEquals(listMembers.size(), 2, "T08 - Equals:");
+
         memberService.delete(m1.getId());
         memberService.delete(m2.getId());