mutation: Improve list adapter for repeatable fields

Ensures that individual bulk operations never require more than linear
time.

Also improves the test by asserting that the underlying builder is
modified rather than just the view.

1 files changed, 38 insertions, 16 deletions

diff --git a/src/test/java/com/code_intelligence/jazzer/mutation/mutator/proto/BuilderAdaptersTest.java b/src/test/java/com/code_intelligence/jazzer/mutation/mutator/proto/BuilderAdaptersTest.java
index b89d25b6..7722a6ad 100644
--- a/src/test/java/com/code_intelligence/jazzer/mutation/mutator/proto/BuilderAdaptersTest.java
+++ b/src/test/java/com/code_intelligence/jazzer/mutation/mutator/proto/BuilderAdaptersTest.java
@@ -20,46 +20,68 @@ import static com.code_intelligence.jazzer.mutation.mutator.proto.BuilderAdapter
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import com.code_intelligence.jazzer.protobuf.Proto3.RepeatedPrimitiveField3;
+import com.code_intelligence.jazzer.protobuf.Proto3.RepeatedIntegralField3;
 import com.google.protobuf.Descriptors.FieldDescriptor;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
 class BuilderAdaptersTest {
   @Test
   void testMakeMutableRepeatedFieldView() {
-    RepeatedPrimitiveField3.Builder builder = RepeatedPrimitiveField3.newBuilder();
+    RepeatedIntegralField3.Builder builder = RepeatedIntegralField3.newBuilder();
     FieldDescriptor someField = builder.getDescriptorForType().findFieldByNumber(1);
     assertThat(someField).isNotNull();
 
-    List<Boolean> view = makeMutableRepeatedFieldView(builder, someField);
-    assertThat(view).isEmpty();
+    List<Integer> view = makeMutableRepeatedFieldView(builder, someField);
+    assertThat(builder.build().getSomeFieldList()).isEmpty();
 
-    assertThat(view.add(true)).isTrue();
-    assertThat(view.get(0)).isTrue();
+    assertThat(view.add(1)).isTrue();
+    assertThat(view.get(0)).isEqualTo(1);
     assertThat(view).hasSize(1);
-    assertThat(view).containsExactly(true).inOrder();
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1).inOrder();
     assertThrows(IndexOutOfBoundsException.class, () -> view.get(1));
 
-    assertThat(view.add(false)).isTrue();
-    assertThat(view.add(true)).isTrue();
+    assertThat(view.add(2)).isTrue();
+    assertThat(view.add(3)).isTrue();
     assertThat(view).hasSize(3);
-    assertThat(view).containsExactly(true, false, true).inOrder();
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 2, 3).inOrder();
     assertThrows(IndexOutOfBoundsException.class, () -> view.get(3));
 
-    assertThat(view.set(1, true)).isFalse();
+    assertThat(view.set(1, 4)).isEqualTo(2);
     assertThat(view).hasSize(3);
-    assertThat(view).containsExactly(true, true, true).inOrder();
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 4, 3).inOrder();
 
-    assertThat(view.set(1, false)).isTrue();
+    assertThat(view.set(1, 5)).isEqualTo(4);
     assertThat(view).hasSize(3);
-    assertThat(view).containsExactly(true, false, true).inOrder();
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 5, 3).inOrder();
 
-    assertThat(view.remove(1)).isFalse();
+    assertThat(view.remove(1)).isEqualTo(5);
     assertThat(view).hasSize(2);
-    assertThat(view).containsExactly(true, true).inOrder();
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 3).inOrder();
 
     assertThrows(IndexOutOfBoundsException.class, () -> view.remove(-1));
     assertThrows(IndexOutOfBoundsException.class, () -> view.remove(2));
+
+    assertThat(view.addAll(1, Collections.emptyList())).isFalse();
+    assertThat(view).hasSize(2);
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 3).inOrder();
+
+    assertThat(view.addAll(1, Arrays.asList(6, 7, 8))).isTrue();
+    assertThat(view).hasSize(5);
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 6, 7, 8, 3).inOrder();
+
+    view.subList(2, 4).clear();
+    assertThat(view).hasSize(3);
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 6, 3).inOrder();
+
+    assertThat(view.addAll(3, Arrays.asList(9, 10))).isTrue();
+    assertThat(view).hasSize(5);
+    assertThat(builder.build().getSomeFieldList()).containsExactly(1, 6, 3, 9, 10).inOrder();
+
+    view.clear();
+    assertThat(view).hasSize(0);
+    assertThat(builder.build().getSomeFieldList()).isEmpty();
   }
 }