CBL-3886: Remove deprecated API from MessageEndpointTests (#181)

common/test/java/com/couchbase/lite/BaseReplicatorTest.kt

@@ -207,7 +207,7 @@ abstract class BaseReplicatorTest : BaseDbTest() {
  }
 
  protected fun ReplicatorConfiguration.run(reset: Boolean = false, errDomain: String? = null, errCode: Int = 0) =
- replicatorConfiguration.testReplicator().run(reset, errDomain, errCode)
+ this.testReplicator().run(reset, errDomain, errCode)
 
  protected fun Replicator.run(reset: Boolean = false, errDomain: String? = null, errCode: Int = 0): Replicator {
  val awaiter = ReplicatorAwaiter(this, testSerialExecutor)

common/test/java/com/couchbase/lite/QueryTest.java

@@ -34,7 +34,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.couchbase.lite.internal.utils.Fn;
@@ -629,7 +628,8 @@ public void testSelectDistinct() {
  saveDocInTestCollection(doc2);
 
  verifyQuery(
- QueryBuilder.selectDistinct(SelectResult.property("number")).from(DataSource.collection(getTestCollection())),
+ QueryBuilder.selectDistinct(SelectResult.property("number"))
+ .from(DataSource.collection(getTestCollection())),
  1,
  (n, result) -> assertEquals(20, result.getInt(0)));
  }
@@ -1534,8 +1534,7 @@ public void testLiveQuery() {
  }
  };
 
- ListenerToken token = query.addChangeListener(testSerialExecutor, listener);
- try {
+ try (ListenerToken token = query.addChangeListener(testSerialExecutor, listener)) {
  assertTrue(latch1.await(STD_TIMEOUT_SEC, TimeUnit.SECONDS));
 
  // create some more docs
@@ -1555,7 +1554,6 @@ public void testLiveQuery() {
  }
  // Catch clause prevents Windows compiler error
  catch (Exception e) { throw new AssertionError("Unexpected exception", e); }
- finally { token.remove(); }
  }
 
  @SlowTest
@@ -1995,12 +1993,10 @@ public void testDeleteDatabaseWithActiveLiveQuery() throws InterruptedException
  .select(SelectResult.expression(Meta.id))
  .from(DataSource.collection(getTestCollection()));
 
- ListenerToken token = query.addChangeListener(testSerialExecutor, change -> latch1.countDown());
- try {
+ try (ListenerToken token = query.addChangeListener(testSerialExecutor, change -> latch1.countDown())) {
  assertTrue(latch1.await(STD_TIMEOUT_SEC, TimeUnit.SECONDS));
  deleteDb(getTestDatabase());
  }
- finally { token.remove(); }
  }
 
  @Test
@@ -2563,32 +2559,28 @@ public void testLiveQueryResultsCount() throws InterruptedException {
 
  final CountDownLatch latch1 = new CountDownLatch(1);
  final CountDownLatch latch2 = new CountDownLatch(1);
- ListenerToken token = query.addChangeListener(
- testSerialExecutor,
- change -> {
- int count = 0;
- ResultSet rs = change.getResults();
- while (rs.next() != null) {
- count++;
- // The first run of this query should see a result set with 25 results:
- // 50 docs in the db minus 25 with values < 25
- // When we add 50 more documents, after the first latch springs,
- // there are 100 docs in the db, 75 of which have vaules > 25
- if ((count >= 25) && (latch1.getCount() > 0)) { latch1.countDown(); }
- else if (count >= 75) { latch2.countDown(); }
- }
- });
 
- try {
+ final QueryChangeListener listener = change -> {
+ int count = 0;
+ ResultSet rs = change.getResults();
+ while (rs.next() != null) {
+ count++;
+ // The first run of this query should see a result set with 25 results:
+ // 50 docs in the db minus 25 with values < 25
+ // When we add 50 more documents, after the first latch springs,
+ // there are 100 docs in the db, 75 of which have vaules > 25
+ if ((count >= 25) && (latch1.getCount() > 0)) { latch1.countDown(); }
+ else if (count >= 75) { latch2.countDown(); }
+ }
+ };
+
+ try (ListenerToken token = query.addChangeListener(testSerialExecutor, listener)) {
  assertTrue(latch1.await(LONG_TIMEOUT_SEC, TimeUnit.SECONDS));
 
  loadDocuments(51, 50, getTestCollection());
 
  assertTrue(latch2.await(LONG_TIMEOUT_SEC, TimeUnit.SECONDS));
  }
- finally {
- token.remove();
- }
  }
 
  // https://forums.couchbase.com/t/
@@ -2607,17 +2599,18 @@ public void testLiveQueryNotification() throws CouchbaseLiteException, Interrupt
 
  final CountDownLatch latch1 = new CountDownLatch(1);
  final CountDownLatch latch2 = new CountDownLatch(1);
- ListenerToken token = query.addChangeListener(testSerialExecutor, change -> {
+
+ final QueryChangeListener listener = change -> {
  int matches = 0;
  for (Result ignored: change.getResults()) { matches++; }
 
  // match doc1 with number1 -> 5 which is less than 10
  if (matches == 1) { latch1.countDown(); }
  // Not match with doc1 because number1 -> 15 which does not match the query criteria
  else { latch2.countDown(); }
- });
+ };
 
- try {
+ try (ListenerToken token = query.addChangeListener(testSerialExecutor, listener)) {
  assertTrue(latch1.await(STD_TIMEOUT_SEC, TimeUnit.SECONDS));
 
  doc = getTestCollection().getDocument(doc.getId()).toMutable();
@@ -2626,9 +2619,6 @@ public void testLiveQueryNotification() throws CouchbaseLiteException, Interrupt
 
  assertTrue(latch2.await(STD_TIMEOUT_SEC, TimeUnit.SECONDS));
  }
- finally {
- token.remove();
- }
  }
 
  // https://github.com/couchbase/couchbase-lite-android/issues/1689
@@ -3291,8 +3281,7 @@ private void liveQueryNoUpdate(Fn.Consumer<QueryChange> test) throws Interrupted
  else { latch2.countDown(); }
  };
 
- ListenerToken token = query.addChangeListener(testSerialExecutor, listener);
- try {
+ try (ListenerToken token = query.addChangeListener(testSerialExecutor, listener)) {
  assertTrue(latch1.await(STD_TIMEOUT_SEC, TimeUnit.SECONDS));
 
  // create more docs
@@ -3304,8 +3293,5 @@ private void liveQueryNoUpdate(Fn.Consumer<QueryChange> test) throws Interrupted
  assertFalse(latch2.await(5 * 1000, TimeUnit.MILLISECONDS));
  assertEquals(1, latch2.getCount());
  }
- finally {
- token.remove();
- }
  }
 }