Person

Learner
Student
Teacher
Instructor
People
Students
Instructors
Classroom
StudentConfig - noParam Constructors Used
- Added toString to People to run SpringBootApp
InstructorsConfig
ClassroomConfig
-- Test --
 StudentConfig
 InstructorsConfig
 ClassroomConfig

demo/src/main/java/com/example/demo/ClassroomConfig.java

@@ -1,8 +1,11 @@
 package com.example.demo;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
+@Configuration
+@DependsOn({"students", "previousStudents", "tcUsaInstructors", "tcUkInstructors", "instructors"})
 public class ClassroomConfig {
 
     @Bean(name = "currentCohort")
@@ -12,7 +15,7 @@ public class ClassroomConfig {
     }
 
     @Bean(name = "previousCohort")
-    @DependsOn({"previousInstructors", "previousStudents"})
+    @DependsOn({"instructors", "previousStudents"})
     public Classroom previousCohort(Instructors previousInstructors, Students previousStudents){
         return new Classroom(previousInstructors, previousStudents);
     }

demo/src/main/java/com/example/demo/DemoApplication.java

@@ -4,6 +4,7 @@ import org.apache.catalina.core.ApplicationContext;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 
@@ -13,9 +14,8 @@ public class DemoApplication {
 	public static void main(String[] args) {
 		ConfigurableApplicationContext context = SpringApplication.run(DemoApplication.class, args);
 		// SpringApplication.run(DemoApplication.class, args);
-
-//        Students students = new Students();
-//        System.out.println(students.toString());
+        //        Students students = new Students();
+        //        System.out.println(students.toString());
 
 
 

demo/src/main/java/com/example/demo/InstructorsConfig.java

@@ -3,6 +3,7 @@ package com.example.demo;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 import java.util.ArrayList;
@@ -35,14 +36,10 @@ public class InstructorsConfig {
     }
 
     @Bean(name = "instructors")
+    @DependsOn({"tcUsaInstructors", "tcUkInstructors"})
     @Primary
     public Instructors instructors(){
-        Instructors allInstructors = new Instructors();
-
-        allInstructors.addAll(tcUsaInstructors());
-        allInstructors.addAll(tcUkInstructors());
-
-        return allInstructors;
+        return new Instructors();
     }
 
 

demo/src/main/java/com/example/demo/StudentConfig.java → demo/src/main/java/com/example/demo/StudentsConfig.java

@@ -9,11 +9,11 @@ import org.springframework.stereotype.Component;
 import java.util.ArrayList;
 
 @Configuration
-public class StudentConfig {
+public class StudentsConfig {
 
     @Bean(name = "students")
-    //@Qualifier("currentStudents")
-    public Students currentStudents(){
+    //@Qualifier("tudents")
+    public Students students(){
         ArrayList<Student> currentStudents = new ArrayList<>();
         
         currentStudents.add(new Student(1, "Ned Redmond"));

demo/src/test/java/com/example/demo/TestClassroomConfig.java

@@ -0,0 +1,56 @@
+package com.example.demo;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class TestClassroomConfig {
+    private Classroom currentCohort;
+    private Classroom previousCohort;
+
+    @Autowired
+    private ClassroomConfig classroomConfig;
+    @Autowired
+    private StudentsConfig studentsConfig;
+    @Autowired
+    private InstructorsConfig instructorsConfig;
+
+    @Before
+    public void setUp() {
+        currentCohort = classroomConfig.currentCohort(
+                    instructorsConfig.instructors(),
+                    studentsConfig.students()
+        );
+        previousCohort = classroomConfig.previousCohort(
+                instructorsConfig.instructors(),
+                studentsConfig.previousStudents()
+        );
+    }
+
+    @Test
+    public void testCurrentCohort() {
+        Assert.assertEquals(currentCohort, classroomConfig.currentCohort(
+                instructorsConfig.instructors(), studentsConfig.students()
+        ));
+        Assert.assertNotEquals(currentCohort, classroomConfig.previousCohort(
+                instructorsConfig.instructors(), studentsConfig.previousStudents()
+        ));
+    }
+
+    @Test
+    public void testPreviousCohort() {
+        Assert.assertEquals(previousCohort, classroomConfig.previousCohort(
+                instructorsConfig.instructors(), studentsConfig.previousStudents()
+        ));
+        Assert.assertNotEquals(previousCohort, classroomConfig.currentCohort(
+                instructorsConfig.instructors(), studentsConfig.students()
+        ));
+    }
+
+}

demo/src/test/java/com/example/demo/TestInstructorConfig.java

@@ -0,0 +1,48 @@
+package com.example.demo;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class TestInstructorConfig {
+    private Instructors tcUsaInstructors;
+    private Instructors tcUkInstructors;
+    private Instructors instructors;
+
+    @Autowired
+    private InstructorsConfig instructorsConfig;
+
+    @Before
+    public void setUp(){
+        tcUsaInstructors = instructorsConfig.tcUsaInstructors();
+        tcUkInstructors = instructorsConfig.tcUkInstructors();
+        instructors = instructorsConfig.instructors();
+    }
+
+    @Test
+    public void testGetTcUsaInstructors() {
+        Assert.assertEquals(tcUsaInstructors, instructorsConfig.tcUsaInstructors());
+        Assert.assertNotEquals(tcUsaInstructors, instructorsConfig.tcUkInstructors());
+        Assert.assertNotEquals(tcUsaInstructors, instructorsConfig.instructors());
+    }
+
+    @Test
+    public void testGetTcUkInstructors() {
+        Assert.assertEquals(tcUkInstructors, instructorsConfig.tcUkInstructors());
+        Assert.assertNotEquals(tcUkInstructors, instructorsConfig.tcUsaInstructors());
+        Assert.assertNotEquals(tcUkInstructors, instructorsConfig.instructors());
+    }
+
+    @Test
+    public void testGetInstructors() {
+        Assert.assertEquals(instructors, instructorsConfig.instructors());
+        Assert.assertNotEquals(instructors, instructorsConfig.tcUsaInstructors());
+        Assert.assertNotEquals(instructors, instructorsConfig.tcUkInstructors());
+    }
+}

demo/src/test/java/com/example/demo/TestStudentsConfig.java

@@ -0,0 +1,38 @@
+package com.example.demo;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class TestStudentsConfig {
+    private Students students;
+    private Students previousStudents;
+
+    @Autowired
+    private StudentsConfig studentsConfig;
+
+    @Before
+    public void setUp() {
+      students = studentsConfig.students();
+      previousStudents = studentsConfig.previousStudents();
+    }
+
+    @Test
+    public void testStudents(){
+        Assert.assertEquals(students, studentsConfig.students());
+        Assert.assertNotEquals(students, studentsConfig.previousStudents());
+    }
+
+    @Test
+    public void testPreviousStudents(){
+        Assert.assertEquals(previousStudents, studentsConfig.previousStudents());
+        Assert.assertNotEquals(previousStudents, studentsConfig.students());
+    }
+
+}