hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made combined recurrence ringsAt tests cleaner

Browse Source
This commit is contained in:
Phillip Hsu 2016-06-10 15:46:17 -07:00
parent 468641a49b
commit 8d23d8f0b2
1 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/test/java/com/philliphsu/clock2/AlarmTest.java
View File

@ -109,33 +109,7 @@ public class AlarmTest {
int hours = 0; int hours = 0;
int minutes = 0; int minutes = 0;
if (h <= hC) { if (h > hC || (h == hC && m > mC)) {
if (m <= mC) {
// Subtract 1 from the days because the hours and minutes
// calculation will already count to the next day.
if (D < D_C) {
days = Calendar.SATURDAY - D_C + D - 1;
} else if (D == D_C) {
days = 6;
} else {
days = D - D_C - 1;
}
// Subtract 1 from the hours because the minutes calculation
// will already count to the next hour.
hours = 23 - hC + h;
minutes = 60 - mC + m;
} else {
minutes = m - mC;
if (h < hC) {
if (D < D_C) {
days = Calendar.SATURDAY - D_C + D - 1;
} else if (D == D_C) {
days = 6;
} else {
days = D - D_C - 1;
}
hours = 24 - hC + h;
} else /*if (h == hC)*/ {
if (D < D_C) { if (D < D_C) {
days = Calendar.SATURDAY - D_C + D; days = Calendar.SATURDAY - D_C + D;
} else if (D == D_C) { } else if (D == D_C) {
@ -143,17 +117,27 @@ public class AlarmTest {
} else { } else {
days = D - D_C; days = D - D_C;
} }
} } else if (h <= hC) {
}
} else {
if (D < D_C) { if (D < D_C) {
days = Calendar.SATURDAY - D_C + D; days = Calendar.SATURDAY - D_C + D - 1;
} else if (D == D_C) { } else if (D == D_C) {
days = 0; days = 6;
} else { } else {
days = D - D_C; days = D - D_C - 1;
}
} }
if (h <= hC) {
if (m <= mC) {
hours = 23 - hC + h;
minutes = 60 - mC + m;
} else {
minutes = m - mC;
if (h < hC) {
hours = 24 - hC + h;
}
}
} else {
if (m <= mC) { if (m <= mC) {
hours = h - hC - 1; hours = h - hC - 1;
minutes = 60 - mC + m; minutes = 60 - mC + m;