sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix grade regex (#91)

Browse Source
This commit is contained in:
Mikołaj Pich
2018-04-27 01:36:40 +02:00
committed by Rafał Borcz
parent 7dde13585c
commit 3443b01b9a
7 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/test/java/io/github/wulkanowy/data/db/dao/entities/GradeTest.java
View File

@ -7,21 +7,6 @@ import io.github.wulkanowy.R;
public class GradeTest {
@Test
public void getValueColorTest() {
Assert.assertEquals(R.color.six_grade, new Grade().setValue("-6").getValueColor());
Assert.assertEquals(R.color.five_grade, new Grade().setValue("--5").getValueColor());
Assert.assertEquals(R.color.four_grade, new Grade().setValue("=4").getValueColor());
Assert.assertEquals(R.color.three_grade, new Grade().setValue("3-").getValueColor());
Assert.assertEquals(R.color.two_grade, new Grade().setValue("2--").getValueColor());
Assert.assertEquals(R.color.two_grade, new Grade().setValue("2=").getValueColor());
Assert.assertEquals(R.color.one_grade, new Grade().setValue("1+").getValueColor());
Assert.assertEquals(R.color.one_grade, new Grade().setValue("+1").getValueColor());
Assert.assertEquals(R.color.default_grade, new Grade().setValue("Np").getValueColor());
Assert.assertEquals(R.color.default_grade, new Grade().setValue("7").getValueColor());
Assert.assertEquals(R.color.default_grade, new Grade().setValue("").getValueColor());
}
@Test
public void equalsTest() {
Assert.assertTrue(new Grade().setSubject("Religia").setValue("5")

25
app/src/test/java/io/github/wulkanowy/utils/AverageCalculatorTest.java → app/src/test/java/io/github/wulkanowy/utils/GradeUtilsTest.java
View File

@ -6,9 +6,10 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
import io.github.wulkanowy.R;
import io.github.wulkanowy.data.db.dao.entities.Grade;
public class AverageCalculatorTest {
public class GradeUtilsTest {
@Test
public void averageTest() {
@ -28,8 +29,8 @@ public class AverageCalculatorTest {
gradeList1.add(new Grade().setValue("5+").setWeight("10,00"));
gradeList1.add(new Grade().setValue("5").setWeight("10,00"));
Assert.assertEquals(4.8f, AverageCalculator.calculate(gradeList), 0.0f);
Assert.assertEquals(4.8f, AverageCalculator.calculate(gradeList1), 0.0f);
Assert.assertEquals(4.8f, GradeUtils.calculate(gradeList), 0.0f);
Assert.assertEquals(4.8f, GradeUtils.calculate(gradeList1), 0.0f);
}
@Test
@ -37,6 +38,22 @@ public class AverageCalculatorTest {
List<Grade> gradeList = new ArrayList<>();
gradeList.add(new Grade().setValue("np.").setWeight("1,00"));
Assert.assertEquals(-1f, AverageCalculator.calculate(gradeList), 0.0f);
Assert.assertEquals(-1f, GradeUtils.calculate(gradeList), 0.0f);
}
@Test
public void getValueColor() {
Assert.assertEquals(R.color.six_grade, GradeUtils.getValueColor("-6"));
Assert.assertEquals(R.color.five_grade, GradeUtils.getValueColor("--5"));
Assert.assertEquals(R.color.four_grade, GradeUtils.getValueColor("=4"));
Assert.assertEquals(R.color.three_grade, GradeUtils.getValueColor("3-"));
Assert.assertEquals(R.color.two_grade, GradeUtils.getValueColor("2--"));
Assert.assertEquals(R.color.two_grade, GradeUtils.getValueColor("2="));
Assert.assertEquals(R.color.one_grade, GradeUtils.getValueColor("1+"));
Assert.assertEquals(R.color.one_grade, GradeUtils.getValueColor("+1"));
Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor("6 (.XI)"));
Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor("Np"));
Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor("7"));
Assert.assertEquals(R.color.default_grade, GradeUtils.getValueColor(""));
}
}