Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Add support for showing auto-delete timers in minutes

Browse Source
This commit is contained in:
Torsten Grote
2021-02-22 09:57:18 -03:00
parent ee6664ce9d
commit b24f2a1818
3 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
briar-android/src/test/java/org/briarproject/briar/android/util/UiUtilsFormatDurationTest.java
View File

@@ -12,12 +12,14 @@ import org.junit.Test;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.briarproject.briar.android.util.UiUtils.formatDuration;
public class UiUtilsFormatDurationTest extends BrambleMockTestCase {
private final Context ctx;
private final Resources r;
private final int strMinutes = R.plurals.duration_minutes;
private final int strHours = R.plurals.duration_hours;
private final int strDays = R.plurals.duration_days;
@@ -27,6 +29,12 @@ public class UiUtilsFormatDurationTest extends BrambleMockTestCase {
r = context.mock(Resources.class);
}
@Test
public void testOneMinute() {
expectMinuteString(1);
formatDuration(ctx, MINUTES.toMillis(1));
}
@Test
public void testOneHour() {
expectHourString(1);
@@ -39,12 +47,44 @@ public class UiUtilsFormatDurationTest extends BrambleMockTestCase {
formatDuration(ctx, DAYS.toMillis(1));
}
@Test
public void test10Seconds() {
// capped to 1min
expectMinuteString(1);
formatDuration(ctx, SECONDS.toMillis(10));
}
@Test
public void test100Seconds() {
expectMinuteString(2);
formatDuration(ctx, SECONDS.toMillis(100));
}
@Test
public void test2Minutes() {
expectMinuteString(2);
formatDuration(ctx, MINUTES.toMillis(2));
}
@Test
public void test10Minutes() {
expectHourString(1);
expectMinuteString(10);
formatDuration(ctx, MINUTES.toMillis(10));
}
@Test
public void test130Minutes() {
expectHourString(2);
expectMinuteString(10);
formatDuration(ctx, MINUTES.toMillis(130));
}
@Test
public void test13Hours() {
expectHourString(13);
formatDuration(ctx, HOURS.toMillis(13));
}
@Test
public void testSevenDays() {
expectDayString(7);
@@ -67,7 +107,7 @@ public class UiUtilsFormatDurationTest extends BrambleMockTestCase {
@Test
public void testSevenDays40Minutes() {
expectDayString(7);
expectHourString(1);
expectMinuteString(40);
formatDuration(ctx, DAYS.toMillis(7) + MINUTES.toMillis(40));
}
@@ -92,6 +132,23 @@ public class UiUtilsFormatDurationTest extends BrambleMockTestCase {
formatDuration(ctx, DAYS.toMillis(2) + HOURS.toMillis(13));
}
@Test
public void test7Days23Hours55Minutes() {
expectDayString(7);
expectHourString(23);
expectMinuteString(55);
formatDuration(ctx,
DAYS.toMillis(7) + HOURS.toMillis(23) + MINUTES.toMillis(55));
}
private void expectMinuteString(int minutes) {
context.checking(new Expectations() {{
oneOf(ctx).getResources();
will(returnValue(r));
oneOf(r).getQuantityString(strMinutes, minutes, minutes);
}});
}
private void expectHourString(int hours) {
context.checking(new Expectations() {{
oneOf(ctx).getResources();