Merge pull request #29 from bardia-p/milestone1_issue25_integrationTests

bardia-p · Nov 11, 2023 · 61f5cb2 · 61f5cb2
2 parents 33e75f0 + dda450d
commit 61f5cb2
Show file tree

Hide file tree

Showing 14 changed files with 102 additions and 137 deletions.
diff --git a/src/main/java/com/opinionowl/opinionowl/models/Answer.java b/src/main/java/com/opinionowl/opinionowl/models/Answer.java
@@ -32,7 +32,7 @@ public class Answer {
 
     /**
      * The constructor for answer.
-     * @param response the response for which the answe belongs to.
+     * @param response the response for which the answer belongs to.
      * @param question the question id.
      * @param content the content of the reply.
      */

diff --git a/src/main/java/com/opinionowl/opinionowl/models/LongAnswerQuestion.java b/src/main/java/com/opinionowl/opinionowl/models/LongAnswerQuestion.java
@@ -51,7 +51,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         LongAnswerQuestion that = (LongAnswerQuestion) o;
-        return this.getId() == that.getId();
+        return Objects.equals(this.getId(), that.getId());
     }
 
 }
diff --git a/src/main/java/com/opinionowl/opinionowl/models/Question.java b/src/main/java/com/opinionowl/opinionowl/models/Question.java
@@ -5,6 +5,8 @@
 import lombok.Setter;
 import lombok.NoArgsConstructor;
 
+import java.util.Objects;
+
 /**
  * The Question class which keeps track of the survey questions.
  */
@@ -59,4 +61,16 @@ public boolean equals(Question comparedQuestion){
         }
         return true;
     }
+
+    /**
+     * @param o object that is being compared with
+     * @return boolean value saying whether objects are equal
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Question question = (Question) o;
+        return Objects.equals(id, question.id) && Objects.equals(prompt, question.prompt) && type == question.type && Objects.equals(survey, question.survey);
+    }
 }
diff --git a/src/main/java/com/opinionowl/opinionowl/models/RadioChoiceQuestion.java b/src/main/java/com/opinionowl/opinionowl/models/RadioChoiceQuestion.java
@@ -4,7 +4,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * The class used to describe the multiple choice questions.
@@ -50,7 +50,6 @@ public String toString(){
     }
 
     /**
-     *
      * @param o object that is being compared with
      * @return boolean value saying whether objects are equal
      */
@@ -59,7 +58,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         RadioChoiceQuestion that = (RadioChoiceQuestion) o;
-        return this.getId() == that.getId();
+        return Objects.equals(this.getId(), that.getId());
     }
 
 }
diff --git a/src/main/java/com/opinionowl/opinionowl/models/RangeQuestion.java b/src/main/java/com/opinionowl/opinionowl/models/RangeQuestion.java
@@ -71,7 +71,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         RangeQuestion that = (RangeQuestion) o;
-        return this.getId() == that.getId();
+        return Objects.equals(this.getId(), that.getId());
     }
 
 }
diff --git a/src/main/java/com/opinionowl/opinionowl/models/Survey.java b/src/main/java/com/opinionowl/opinionowl/models/Survey.java
@@ -71,7 +71,7 @@ public boolean addQuestion(Question question){
      */
     public boolean removeQuestion(Long questionId){
         if (!closed) {
-            return this.questions.removeIf(q -> q.getId() == questionId);
+            return this.questions.removeIf(q -> Objects.equals(q.getId(), questionId));
         }
         return false;
     }
@@ -94,7 +94,7 @@ public boolean addResponse(Response response){
      * @return true if successfully remove, false otherwise.
      */
     public boolean removeResponse(Long responseId){
-        return this.responses.removeIf(r -> r.getId() == responseId);
+        return this.responses.removeIf(r -> Objects.equals(r.getId(), responseId));
     }
 
     /**
@@ -106,7 +106,7 @@ public List<String> getResponsesForQuestion(Long questionId){
         List<String> result = new ArrayList<>();
         for (Response r: responses){
             for (Answer a: r.getAnswers()){
-                if (a.getQuestion() == questionId){
+                if (Objects.equals(a.getQuestion(), questionId)){
                     result.add(a.getContent());
                 }
             }

diff --git a/src/test/java/com/opinionowl/opinionowl/IntegrationTest.java b/src/test/java/com/opinionowl/opinionowl/IntegrationTest.java
diff --git a/src/test/java/com/opinionowl/opinionowl/IntegrationTests/CreateSurveyIntegrationTest.java b/src/test/java/com/opinionowl/opinionowl/IntegrationTests/CreateSurveyIntegrationTest.java
@@ -0,0 +1,40 @@
+package com.opinionowl.opinionowl.IntegrationTests;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+import java.util.List;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class CreateSurveyIntegrationTest {
+    @Autowired
+    private MockMvc mockMvc;
+
+    /**
+     * Test method for POSTing a survey and doing a GET after
+     */
+    @Test
+    public void testCreateAndRetrieveSurvey() throws Exception {
+        String postData = "{\"radioQuestions\":{\"Test2\":[\"a\",\"b\"]},\"numericRanges\":{\"Test3\":[0,11]},\"title\":\"Form Title\",\"textQuestions\":[\"Test1\"]}";
+
+        // Create a survey using the POST request.
+        this.mockMvc.perform(post("/api/v1/createSurvey")
+                        .contentType(MediaType.APPLICATION_JSON).content(postData))
+                        .andExpect(status().isOk());
+
+        // Expect the survey to show up on the home page.
+        this.mockMvc.perform(get("/")).andExpect(status().isOk())
+                .andExpect(content().string(containsString("Form Title")));
+
+    }
+}
diff --git a/...pinionowl/OpinionOwlApplicationTests.java → ...tionTests/OpinionOwlApplicationTests.java b/...pinionowl/OpinionOwlApplicationTests.java → ...tionTests/OpinionOwlApplicationTests.java
@@ -1,4 +1,4 @@
-package com.opinionowl.opinionowl;
+package com.opinionowl.opinionowl.IntegrationTests;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

diff --git a/...com/opinionowl/opinionowl/AnswerTest.java → ...owl/opinionowl/ModelTests/AnswerTest.java b/...com/opinionowl/opinionowl/AnswerTest.java → ...owl/opinionowl/ModelTests/AnswerTest.java
@@ -1,10 +1,11 @@
-package com.opinionowl.opinionowl;
+package com.opinionowl.opinionowl.ModelTests;
 import com.opinionowl.opinionowl.models.*;
 import com.opinionowl.opinionowl.repos.*;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import java.util.*;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
@@ -49,7 +50,7 @@ public void testAnswer() {
     @Test
     public void testPersist() {
         AppUser u1 = new AppUser("AnswerTest", "123");
-        Survey survey = new Survey(u1, "TEST_SURVEY");
+        Survey survey = new Survey(u1, "ANSWER_TEST_SURVEY");
         u1.addSurvey(survey);
         userRepository.save(u1);
 
@@ -58,27 +59,17 @@ public void testPersist() {
         survey.addQuestion(q1);
 
         Response r1 = new Response(survey);
-        r1.addAnswer(q1.getId(), "hi");
-        r1.addAnswer(q2.getId(), "b");
+        r1.addAnswer(q1.getId(), "ANSWER1");
+        r1.addAnswer(q2.getId(), "ANSWER2");
         survey.addResponse(r1);
-        survey.setClosed(true);
-        surveyRepository.save(survey);
 
-        Answer a1 = new Answer(r1, q1.getId(), "hi");
-        Answer a2 = new Answer(r1, q1.getId(), "b");
-        answerRepository.save(a1);
-        answerRepository.save(a2);
+        Answer a1 = r1.getAnswers().get(0);
+        Answer a2 = r1.getAnswers().get(1);
 
-        List<Answer> expectedR = new ArrayList<>();
-        expectedR.add(new Answer(r1, q1.getId(), "hi"));
-        expectedR.add(new Answer(r1, q1.getId(), "b"));
+        surveyRepository.save(survey);
 
         List<Answer> results = answerRepository.findAll();
-        for (Answer a : results){
-            System.out.println(a.toString());
-            if(a.getResponse().getAnswers().containsAll(expectedR)) {
-                System.out.println(a.getResponse().getAnswers());
-            }
-        }
+        assertTrue(results.stream().anyMatch(answer -> answer.getContent().equals(a1.getContent())));
+        assertTrue(results.stream().anyMatch(answer -> answer.getContent().equals(a2.getContent())));
     }
 }
diff --git a/...om/opinionowl/opinionowl/AppUserTest.java → ...wl/opinionowl/ModelTests/AppUserTest.java b/...om/opinionowl/opinionowl/AppUserTest.java → ...wl/opinionowl/ModelTests/AppUserTest.java
@@ -1,4 +1,4 @@
-package com.opinionowl.opinionowl;
+package com.opinionowl.opinionowl.ModelTests;
 import com.opinionowl.opinionowl.models.*;
 import com.opinionowl.opinionowl.repos.*;
 import org.junit.jupiter.api.Test;
@@ -29,7 +29,7 @@ public void testAddSurvey(){
         u1.addSurvey(survey);
 
         assertEquals(1, u1.getListSurveys().size());
-        List<Survey> expected = Arrays.asList(survey);
+        List<Survey> expected = List.of(survey);
 
         assertEquals(expected, u1.getListSurveys());
     }

diff --git a/...m/opinionowl/opinionowl/QuestionTest.java → ...l/opinionowl/ModelTests/QuestionTest.java b/...m/opinionowl/opinionowl/QuestionTest.java → ...l/opinionowl/ModelTests/QuestionTest.java
@@ -1,4 +1,4 @@
-package com.opinionowl.opinionowl;
+package com.opinionowl.opinionowl.ModelTests;
 import com.opinionowl.opinionowl.models.*;
 import com.opinionowl.opinionowl.repos.*;
 import org.junit.jupiter.api.Test;
@@ -18,9 +18,6 @@ public class QuestionTest {
     @Autowired
     private UserRepository userRepository;
 
-    @Autowired
-    private SurveyRepository surveyRepository;
-
     /**
      * Method to test Long Answer Type questions added to the survey.
      */
@@ -75,28 +72,28 @@ public void testPersist() {
         survey.addQuestion(q2);
         survey.addQuestion(q3);
 
-        surveyRepository.save(survey);
         questionRepository.save(q1);
         questionRepository.save(q2);
         questionRepository.save(q3);
-        survey.setClosed(true);
 
         List<Question> results = questionRepository.findAll();
         for (Question q : results){
-            System.out.println(q.toString());
+            if (!q.getSurvey().getTitle().equals(survey.getTitle())){
+                continue;
+            }
             if(q.getType() == QuestionType.LONG_ANSWER) {
                 LongAnswerQuestion laq = (LongAnswerQuestion) q;
-                System.out.println(laq.getCharLimit());
+                assertEquals(laq.getCharLimit(), q1.getCharLimit());
             }
             else if (q.getType() == QuestionType.RADIO_CHOICE) {
                 RadioChoiceQuestion rcq = (RadioChoiceQuestion) q;
-                System.out.println(Arrays.toString(rcq.getChoices()));
+                assertArrayEquals(rcq.getChoices(), q2.getChoices());
             }
             else {
                 RangeQuestion rq = (RangeQuestion) q;
-                System.out.println(rq.getUpper());
-                System.out.println(rq.getLower());
-                System.out.println(rq.getIncrement());
+                assertEquals(rq.getUpper(), q3.getUpper());
+                assertEquals(rq.getLower(), q3.getLower());
+                assertEquals(rq.getIncrement(), q3.getIncrement());
             }
         }
     }