updated class names, wrote tests for topiccreatorservice, added more spring annotations

pom.xml

@@ -52,6 +52,19 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+            <version>1.4.194</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.anthavio.disquo</groupId>
+            <artifactId>disquo-api</artifactId>
+            <version>1.0.2</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/tyler/motivateme/MainTopicsPage.java

@@ -1,12 +1,19 @@
 package com.tyler.motivateme;
 
+import com.tyler.motivateme.model.Topic;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Service;
+
 import java.util.ArrayList;
 import java.util.List;
 
+@Service
 public class MainTopicsPage {
-    List<String> topicsList;
+    List<Topic> topicsList;
 
     public MainTopicsPage(){
         this.topicsList = new ArrayList<>();
     }
+
+
 }

src/main/java/com/tyler/motivateme/TopicInfoPage.java

@@ -1,7 +1,12 @@
 package com.tyler.motivateme;
 
+import org.springframework.stereotype.Service;
+
+@Service
 public class TopicInfoPage{
 
+    public String getTopicName() {return null;}
+
     public String getDescription() {
         return null;
     }

src/main/java/com/tyler/motivateme/controller/MainTopicsPageController.java

@@ -0,0 +1,13 @@
+package com.tyler.motivateme.controller;
+
+import com.tyler.motivateme.MainTopicsPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/MainTopics")
+public class MainTopicsPageController {
+    @Autowired
+    MainTopicsPage mainTopicsPage;
+}

src/main/java/com/tyler/motivateme/controller/NewTopicCreatorController.java

@@ -1,24 +0,0 @@
-package com.tyler.motivateme.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class NewTopicCreatorController {
-
-//    @Autowired
-//    private NewTopicCreatorService newTopicCreatorService;
-//
-//    @RequestMapping(path="/topics")
-//    public List<Topic> allTopics() {
-//
-//        return newTopicCreatorService.allTopics();
-//    }
-
-    @RequestMapping(value="/api/topics")
-    public String what(){
-        return "topic";
-    }
-
-
-}

src/main/java/com/tyler/motivateme/controller/TestController1.java

@@ -1,13 +0,0 @@
-package com.tyler.motivateme.controller;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class TestController1 {
-
-    @GetMapping(value = "/hello")
-    public String hello(){
-        return "world";
-    }
-}

src/main/java/com/tyler/motivateme/controller/TopicCreatorController.java

@@ -0,0 +1,23 @@
+package com.tyler.motivateme.controller;
+
+import com.tyler.motivateme.model.TopicCreatorService;
+import com.tyler.motivateme.model.Topic;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/topics")
+public class TopicCreatorController {
+
+    @Autowired
+    private TopicCreatorService topicCreatorService;
+
+    public List<Topic> allTopics() {
+
+        return topicCreatorService.allTopics();
+    }
+
+}

src/main/java/com/tyler/motivateme/controller/TopicsController.java → src/main/java/com/tyler/motivateme/controller/TopicInfoPageController.java

@@ -1,11 +1,16 @@
 package com.tyler.motivateme.controller;
 
+import com.tyler.motivateme.MainTopicsPage;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/mytopics")
-public class TopicsController {
+@RequestMapping("/TopicInfo")
+public class TopicInfoPageController {
+
+    @Autowired
+    private MainTopicsPage mainTopicsPage;
 
     public String getDescription() {return null;}
     public String getAdviceAndStrategies() {return null;}

src/main/java/com/tyler/motivateme/model/NewTopicCreator.java

@@ -1,14 +0,0 @@
-package com.tyler.motivateme.model;
-
-
-public class NewTopicCreator{
-
-    public String getDescription() {
-
-        return null;
-    }
-
-    public String getAdviceAndStrategies() {
-        return null;
-    }
-}

src/main/java/com/tyler/motivateme/model/NewTopicCreatorService.java

@@ -1,18 +0,0 @@
-package com.tyler.motivateme.model;
-
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@Service
-public class NewTopicCreatorService {
-
-    private List<Topic> topics = new ArrayList<Topic>(Arrays.asList(new Topic(1, "Quit drinking"), new Topic(2, "Quit Smoking"), new Topic(3, "Eat healthier")));
-
-    public List<Topic> allTopics() {
-
-        return topics;
-    }
-}

src/main/java/com/tyler/motivateme/model/Topic.java

@@ -1,18 +1,27 @@
 package com.tyler.motivateme.model;
 
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import java.util.Objects;
 
+@Entity
 public class Topic {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
     private String name;
+    private String description;
+    private String adviceAndStrategies;
+
 
     public Topic(int id, String name) {
         this.id = id;
         this.name = name;
+        this.description = description;
+
+        this.adviceAndStrategies = adviceAndStrategies;
     }
 
     public Topic(){};
@@ -32,4 +41,29 @@ public class Topic {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getDescription() { return description; }
+
+    public void setDescription(String description) { this.description = description; }
+
+    public String getAdviceAndStrategies() { return adviceAndStrategies; }
+
+    public void setAdviceAndStrategies(String adviceAndStrategies) { this.adviceAndStrategies = adviceAndStrategies; }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Topic topic = (Topic) o;
+        return id == topic.id &&
+                Objects.equals(name, topic.name) &&
+                Objects.equals(description, topic.description) &&
+                Objects.equals(adviceAndStrategies, topic.adviceAndStrategies);
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(id, name, description, adviceAndStrategies);
+    }
 }

src/main/java/com/tyler/motivateme/model/TopicCreatorService.java

@@ -0,0 +1,47 @@
+package com.tyler.motivateme.model;
+
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Service
+public class TopicCreatorService {
+
+    private List<Topic> topics;
+    private String description;
+    private String adviceAndStrategies;
+
+    public TopicCreatorService(){
+        this.topics = topics = new ArrayList<Topic>(Arrays.asList(new Topic(1, "Quit drinking"), new Topic(2, "Quit Smoking"), new Topic(3, "Eat healthier")));
+        this.description = description;
+        this.adviceAndStrategies = adviceAndStrategies;
+    }
+
+    public List<Topic> allTopics() {
+
+        return topics;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setAdviceAndStrategies(String adviceAndStrategies) {
+        this.adviceAndStrategies = adviceAndStrategies;
+    }
+
+    public String getDescription() {
+
+        return description;
+    }
+
+    public String getAdviceAndStrategies() {
+        return adviceAndStrategies;
+    }
+
+    public void add(Topic topic) {
+        topics.add(topic);
+    }
+}

src/main/java/com/tyler/motivateme/repository/TopicRepository.java

@@ -0,0 +1,9 @@
+package com.tyler.motivateme.repository;
+
+import com.tyler.motivateme.model.Topic;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TopicRepository extends CrudRepository<Topic, Integer> {
+}

src/test/java/Model/NewAccountCreatorTest.java

@@ -1,17 +0,0 @@
-package Model;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class NewAccountCreatorTest {
-
-    @Test
-    public void testCreateUser() {
-
-    }
-
-}

src/test/java/Model/NewTopicCreatorTest.java

@@ -1,19 +0,0 @@
-package Model;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class NewTopicCreatorTest {
-
-    @Test
-    public void getDescription() {
-    }
-
-    @Test
-    public void getAdviceAndStrategies() {
-    }
-}

src/test/java/View/ForumTest.java

@@ -3,10 +3,11 @@ package View;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration
 public class ForumTest {
 
     @Test

src/test/java/View/InboxTest.java

@@ -3,10 +3,11 @@ package View;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration
 public class InboxTest {
 
     @Test

src/test/java/View/MainTopicsPageTest.java

@@ -3,10 +3,11 @@ package View;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration
 public class MainTopicsPageTest {
 
     @Test

src/test/java/View/TopicInfoPageTest.java

@@ -3,10 +3,11 @@ package View;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration
 public class TopicInfoPageTest {
 
     @Test

src/test/java/Controllers/CommentControllerTest.java → src/test/java/controller/CommentControllerTest.java

@@ -1,12 +1,13 @@
-package Controllers;
+package controller;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration
 public class CommentControllerTest {
 
     @Test

src/test/java/Controllers/MessageControllerTest.java → src/test/java/controller/MessageControllerTest.java

@@ -1,13 +1,14 @@
-package Controllers;
+package controller;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration
 public class MessageControllerTest {
 
     @Test

src/test/java/Model/ConsoleTest.java → src/test/java/model/ConsoleTest.java

@@ -1,13 +1,14 @@
-package Model;
+package model;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@ContextConfiguration
 public class ConsoleTest {
 
     @Test

src/test/java/model/TopicCreatorServiceTest.java

@@ -0,0 +1,64 @@
+package model;
+
+import com.tyler.motivateme.model.Topic;
+import com.tyler.motivateme.model.TopicCreatorService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration
+public class TopicCreatorServiceTest {
+
+    TopicCreatorService tcs = new TopicCreatorService();
+
+    @Test
+    public void testGetDescription() {
+        String expected = "This is a description of the topic";
+        tcs.setDescription(expected);
+        String actual = tcs.getDescription();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testGetAdviceAndStrategies() {
+        String expected = "This is the advice and strategies section of the topic";
+        tcs.setAdviceAndStrategies(expected);
+        String actual = tcs.getAdviceAndStrategies();
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testAllTopics_AreInList(){
+        List expected = new ArrayList<>(Arrays.asList(new Topic(1, "Quit drinking"), new Topic(2, "Quit Smoking"), new Topic(3, "Eat healthier")));
+        List actual = tcs.allTopics();
+        assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void testConstruction(){
+        List<Topic> topics = tcs.allTopics();
+
+        assertEquals(topics.size(), 3);
+        assertTrue(topics.contains(new Topic(1, "Quit drinking")));
+    }
+
+    @Test
+    public void testAddTopics_toAllTopics(){
+        Topic topic = new Topic(4, "working out");
+        tcs.add(topic);
+
+        List<Topic> topics = tcs.allTopics();
+
+        assertTrue(topics.contains(topic));
+    }
+}

src/test/java/repository/TopicRepositoryTest.java

@@ -0,0 +1,12 @@
+package repository;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@ContextConfiguration
+public class TopicRepositoryTest {
+
+}

src/test/java/repository/UserRepositoryTest.java

@@ -0,0 +1,4 @@
+package repository;
+
+public class UserRepositoryTest {
+}