Refactorization of the app (#31)

* Refactor LoadingTask
* Remove LoadingTask class
* Fix context leak in LoginTask
* Refactorisation GradesFragment
* Refactorization synchronization
* Fix leak in VulcanService
* Update mockito
* Add more tests for EntitiesCompare
* Fix Instant Run
* Add margin to grades
* Update ci android image
This commit is contained in:
Rafał Borcz
2017-11-06 17:25:38 +01:00
committed by Mikołaj Pich
parent 54112f73f1
commit e5ea6e0b41
32 changed files with 374 additions and 284 deletions

View File

@ -46,16 +46,28 @@ public class EntitiesCompareTest extends EntitiesCompare {
}
@Test
public void testCompareNewGradePositive() {
public void testCompareNewGradeEmptyOldList() {
newList.add(grade1);
List<Grade> updatedList = EntitiesCompare.compareGradeList(newList, oldList);
Assert.assertEquals(true, (updatedList.get(0)).getIsNew());
Assert.assertFalse(updatedList.get(0).getIsNew());
}
@Test
public void testCompareNewGradePositive() {
newList.add(grade1);
newList.add(grade2);
oldList.add(grade2);
List<Grade> updatedList = EntitiesCompare.compareGradeList(newList, oldList);
Assert.assertFalse(updatedList.get(0).getIsNew());
Assert.assertTrue(updatedList.get(1).getIsNew());
}
@Test
public void testCompareNewGradeNegative() {
@ -66,8 +78,8 @@ public class EntitiesCompareTest extends EntitiesCompare {
List<Grade> updatedList = EntitiesCompare.compareGradeList(newList, oldList);
Assert.assertEquals(false, (updatedList.get(0)).getIsNew());
Assert.assertEquals(false, (updatedList.get(1)).getIsNew());
Assert.assertFalse(updatedList.get(0).getIsNew());
Assert.assertFalse(updatedList.get(1).getIsNew());
}
@Test
@ -77,4 +89,18 @@ public class EntitiesCompareTest extends EntitiesCompare {
Assert.assertEquals(new ArrayList<>(), updatedList);
}
@Test
public void testCompareReadGradeTest() {
newList.add(grade1);
newList.add(grade2);
oldList.add(grade2.setRead(true));
List<Grade> updatedList = EntitiesCompare.compareGradeList(newList, oldList);
Assert.assertTrue(updatedList.get(0).getRead());
Assert.assertFalse(updatedList.get(0).getIsNew());
Assert.assertFalse(updatedList.get(1).getRead());
Assert.assertTrue(updatedList.get(1).getIsNew());
}
}