Improve crypto test: create a helper. Also improve callbacks.

matrix-sdk/src/androidTest/java/org/matrix/androidsdk/common/CommonTestHelper.java

@@ -224,7 +224,7 @@ private MXSession createAccountAndSync(Context context,
         CountDownLatch lock = new CountDownLatch(1);
 
         // get the registration session id
-        loginRestClient.register(registrationParams, new TestApiCallback<Credentials>(lock) {
+        loginRestClient.register(registrationParams, new TestApiCallback<Credentials>(lock, false) {
             @Override
             public void onMatrixError(MatrixError e) {
                 // detect if a parameter is expected
@@ -356,7 +356,7 @@ public void onSuccess(Credentials credentials) {
      * @throws InterruptedException
      */
     public void await(CountDownLatch latch) throws InterruptedException {
-        Assert.assertTrue(latch.await(TestConstants.AWAIT_TIME_OUT_MILLIS, TimeUnit.MILLISECONDS));
+        Assert.assertTrue(latch.await(TestConstants.getTimeOutMillis(), TimeUnit.MILLISECONDS));
     }
 
     /**

matrix-sdk/src/androidTest/java/org/matrix/androidsdk/common/CryptoTestData.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.androidsdk.common
+
+import android.content.Context
+import org.matrix.androidsdk.MXSession
+
+data class CryptoTestData(val firstSession: MXSession,
+                          val roomId: String,
+                          val secondSession: MXSession? = null,
+                          val thirdSession: MXSession? = null) {
+
+    fun clear(context: Context) {
+        firstSession.clear(context)
+        secondSession?.clear(context)
+        secondSession?.clear(context)
+    }
+}