Skip to content

Issue #253: grade school improvements #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewmorgan merged 5 commits into from
Jan 30, 2017
Merged

Issue #253: grade school improvements #271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a5ea2e
Issue #253: Tried to improve grade school structure. Removed .db() fu…
FridaTveit Jan 21, 2017
feecb1c
Added tests for protection agains mutation of the list object
FridaTveit Jan 21, 2017
c3b7346
Issue #253: Make the sort test more generic. This to allow a broader …
Jan 23, 2017
f8d7b1e
Merge remote-tracking branch 'frida/ImproveGradeSchool' into ISSUE-25…
Jan 24, 2017
657e38b
Merge branch 'master' into ISSUE-253/grade_school_improvements
davethomas11 Jan 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added tests for protection agains mutation of the list object
  • Loading branch information
@FridaTveit
FridaTveit committed Jan 21, 2017
commit feecb1c852802ae68681b73b8d3069079e95f4ab
7 changes: 5 additions & 2 deletions exercises/grade-school/src/example/java/School.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ public int numberOfStudents() {
}

public void add(String student, int grade) {
List<String> students = grade(grade);
List<String> students = fetchGradeFromDatabase(grade);
students.add(student);
}

public List<String> grade(int grade) {
// Leaks internal storage to caller
return new ArrayList<>(fetchGradeFromDatabase(grade));
}

private List<String> fetchGradeFromDatabase(int grade) {
if (!database.containsKey(grade)) {
database.put(grade, new LinkedList<>());
}
Expand Down
29 changes: 29 additions & 0 deletions exercises/grade-school/src/test/java/SchoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import org.junit.Ignore;
import org.junit.Test;

import java.lang.Integer;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -83,4 +86,30 @@ public void sortsSchool() {
sortedStudents.put(3, Arrays.asList("Kyle"));
assertEquals(school.studentsByGradeAlphabetical(), sortedStudents);
}

@Ignore
@Test
public void modifyingFetchedGradeShouldNotModifyInternalDatabase() {
String shouldNotBeAdded = "Should not be added to school";
int grade = 1;

List<String> students = school.grade(grade);
students.add(shouldNotBeAdded);

assertThat(school.grade(grade), not(hasItem(shouldNotBeAdded)));
}

@Ignore
@Test
public void modifyingSortedStudentsShouldNotModifyInternalDatabase() {
int grade = 2;
String studentWhichShouldNotBeAdded = "Should not be added";
List<String> listWhichShouldNotBeAdded = new ArrayList<>();
listWhichShouldNotBeAdded.add(studentWhichShouldNotBeAdded);

Map<Integer, List<String>> sortedStudents = school.studentsByGradeAlphabetical();
sortedStudents.put(grade,listWhichShouldNotBeAdded);

assertThat(school.studentsByGradeAlphabetical().get(grade), not(hasItem(studentWhichShouldNotBeAdded)));
}
}