Solved conficts with master

.travis.yml

@@ -2,11 +2,15 @@ sudo: false
 
 language: java
 
+services:
+  - docker
+
 cache:
   directories:
   - $HOME/.m2
 
-install: true
+install:
+  - docker pull mongo
 
 script:
  - mvn -f com.examples.exercise/pom.xml clean verify coveralls:report

com.examples.exercise/src/main/java/com/examples/exercise/Database.java

@@ -12,4 +12,5 @@ public interface Database {
 
 	public void add(Student student);
 
+	public Student takeStudentsById(String id);
 }

com.examples.exercise/src/main/java/com/examples/exercise/SchoolController.java

@@ -22,4 +22,7 @@ public boolean addToDB(Student student) {
 		return true;
 	}
 
+	public Student getStudentById(String id) {
+		return database.takeStudentsById(id);
+	}
 }

com.examples.exercise/src/test/java/com/examples/exercise/SchoolControllerTest.java

@@ -34,7 +34,19 @@ public void testGetAllStudentsWhenThereIsOneStudent() {
 		students.add(new Student());
 		List<Student> allStudents = schoolController.getAllStudents();
 		verify(database, times(1)).getAllStudentsList();
-		assertEquals(1, allStudents.size());	
+		assertEquals(1, allStudents.size());
+	}
+
+	@Test
+	public void testGetStudentByIdIterationWithDB() {
+		schoolController.getStudentById("0000");
+		verify(database, times(1)).takeStudentsById("0000");
+	}
+
+	@Test
+	public void testGetStudentByIdWithBadIndex() {
+		when(database.takeStudentsById("0000")).thenReturn(null);
+		schoolController.getAllStudents();
 	}
 
 	@Test
@@ -54,13 +66,21 @@ public void testAddStudentWhenIsDuplicate(){
 		verify(database, times(1)).exists(student.getId());
 
 	}
+
 
+	@Test
+	public void testGetStudentByIdWithCorrectedIndex() {
+		Student student = factoryStudent("0000", "matteo");
+		when(database.takeStudentsById("0000")).thenReturn(student);
+
+		Student result = schoolController.getStudentById("0000");
+		assertSame(student, result);
+	}
 
 	private Student factoryStudent(String id, String name) {
 		Student student = new Student();
 		student.setId(id);
 		student.setName(name);
 		return student;
 	}
-
 }