Skip to content

SDK / exoplayer

Go to a project
Commit 9161fe23 by olly Committed by Ian Baker
Options

Make LongArray tests a bit more concise 

This also makes them look more like the equivalent tests for
the list / array cases.

PiperOrigin-RevId: 291890150
parent 103bd419
Inline Side-by-side
Showing with 40 additions and 68 deletions
library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
...@@ -215,130 +215,94 @@ public class UtilTest { ...@@ -215,130 +215,94 @@ public class UtilTest {
@Test @Test
public void public void
longArrayBinarySearchFloor_targetSmallerThanValuesAndStayInBoundsFalse_returnsMinus1() { longArrayBinarySearchFloor_targetSmallerThanValuesAndStayInBoundsFalse_returnsMinus1() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 0, /* inclusive= */ false, /* stayInBounds= */ false)) newLongArray(1, 3, 5),
/* value= */ 0,
/* inclusive= */ false,
/* stayInBounds= */ false))
.isEqualTo(-1); .isEqualTo(-1);
} }
@Test @Test
public void longArrayBinarySearchFloor_targetSmallerThanValuesAndStayInBoundsTrue_returns0() { public void longArrayBinarySearchFloor_targetSmallerThanValuesAndStayInBoundsTrue_returns0() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 0, /* inclusive= */ false, /* stayInBounds= */ true)) newLongArray(1, 3, 5),
/* value= */ 0,
/* inclusive= */ false,
/* stayInBounds= */ true))
.isEqualTo(0); .isEqualTo(0);
} }
@Test @Test
public void longArrayBinarySearchFloor_targetBiggerThanValues_returnsLastIndex() { public void longArrayBinarySearchFloor_targetBiggerThanValues_returnsLastIndex() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 6, /* inclusive= */ false, /* stayInBounds= */ false)) newLongArray(1, 3, 5),
/* value= */ 6,
/* inclusive= */ false,
/* stayInBounds= */ false))
.isEqualTo(2); .isEqualTo(2);
} }
@Test @Test
public void public void
longArrayBinarySearchFloor_targetEqualToFirstValueAndInclusiveFalseAndStayInBoundsFalse_returnsMinus1() { longArrayBinarySearchFloor_targetEqualToFirstValueAndInclusiveFalseAndStayInBoundsFalse_returnsMinus1() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 1, /* inclusive= */ false, /* stayInBounds= */ false)) newLongArray(1, 1, 1, 1, 1, 3, 5),
/* value= */ 1,
/* inclusive= */ false,
/* stayInBounds= */ false))
.isEqualTo(-1); .isEqualTo(-1);
} }
@Test @Test
public void public void
longArrayBinarySearchFloor_targetEqualToFirstValueAndInclusiveFalseAndStayInBoundsTrue_returns0() { longArrayBinarySearchFloor_targetEqualToFirstValueAndInclusiveFalseAndStayInBoundsTrue_returns0() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 1, /* inclusive= */ false, /* stayInBounds= */ true)) newLongArray(1, 1, 1, 1, 1, 3, 5),
/* value= */ 1,
/* inclusive= */ false,
/* stayInBounds= */ true))
.isEqualTo(0); .isEqualTo(0);
} }
@Test @Test
public void public void
longArrayBinarySearchFloor_targetInArrayAndInclusiveTrue_returnsFirstIndexWithValueEqualToTarget() { longArrayBinarySearchFloor_targetInArrayAndInclusiveTrue_returnsFirstIndexWithValueEqualToTarget() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 1, /* inclusive= */ true, /* stayInBounds= */ false)) newLongArray(1, 1, 1, 1, 1, 3, 5),
/* value= */ 1,
/* inclusive= */ true,
/* stayInBounds= */ false))
.isEqualTo(0); .isEqualTo(0);
} }
@Test @Test
public void public void
longArrayBinarySearchFloor_targetBetweenValuesAndInclusiveFalse_returnsIndexWhereTargetShouldBeInserted() { longArrayBinarySearchFloor_targetBetweenValuesAndInclusiveFalse_returnsIndexWhereTargetShouldBeInserted() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 2, /* inclusive= */ false, /* stayInBounds= */ false)) newLongArray(1, 1, 1, 1, 1, 3, 5),
/* value= */ 2,
/* inclusive= */ false,
/* stayInBounds= */ false))
.isEqualTo(4); .isEqualTo(4);
} }
@Test @Test
public void public void
longArrayBinarySearchFloor_targetBetweenValuesAndInclusiveTrue_returnsIndexWhereTargetShouldBeInserted() { longArrayBinarySearchFloor_targetBetweenValuesAndInclusiveTrue_returnsIndexWhereTargetShouldBeInserted() {
LongArray longArray = new LongArray();
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(1);
longArray.add(3);
longArray.add(5);
assertThat( assertThat(
binarySearchFloor( binarySearchFloor(
longArray, /* value= */ 2, /* inclusive= */ true, /* stayInBounds= */ false)) newLongArray(1, 1, 1, 1, 1, 3, 5),
/* value= */ 2,
/* inclusive= */ true,
/* stayInBounds= */ false))
.isEqualTo(4); .isEqualTo(4);
} }
...@@ -945,4 +909,12 @@ public class UtilTest { ...@@ -945,4 +909,12 @@ public class UtilTest {
String escapedFileName = Util.escapeFileName(fileName); String escapedFileName = Util.escapeFileName(fileName);
assertThat(unescapeFileName(escapedFileName)).isEqualTo(fileName); assertThat(unescapeFileName(escapedFileName)).isEqualTo(fileName);
} }
private static LongArray newLongArray(long... values) {
LongArray longArray = new LongArray();
for (long value : values) {
longArray.add(value);
}
return longArray;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment