From 1fd908c72ab5227e7c9d8bfaaba7781ec1067aee Mon Sep 17 00:00:00 2001
From: pedroGitt <pedro.contreiras@amdocs.com>
Date: Tue, 8 Nov 2016 11:21:45 +0100
Subject: [PATCH] Light refactoring by using test helper methods
getFingerprintKey() and getIdentityKey()
---
.../java/org/matrix/olm/OlmAccountTest.java | 20 ++++---------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
index 7a6233d..dc47d51 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
@@ -132,24 +132,12 @@ public class OlmAccountTest {
Log.d(LOG_TAG,"## testIdentityKeys Keys="+identityKeysJson);
// is JSON_KEY_FINGER_PRINT_KEY present?
- try {
- String fingerPrintKey = identityKeysJson.getString(OlmAccount.JSON_KEY_FINGER_PRINT_KEY);
- assertTrue("fingerprint key missing",!TextUtils.isEmpty(fingerPrintKey));
- } catch (JSONException e) {
- e.printStackTrace();
- assertTrue("Exception MSg="+e.getMessage(), false);
- }
+ String fingerPrintKey = TestHelper.getFingerprintKey(identityKeysJson);
+ assertTrue("fingerprint key missing",!TextUtils.isEmpty(fingerPrintKey));
// is JSON_KEY_IDENTITY_KEY present?
- try {
- String identityKey = identityKeysJson.getString(OlmAccount.JSON_KEY_IDENTITY_KEY);
- assertTrue("identity key missing",!TextUtils.isEmpty(identityKey));
- } catch (JSONException e) {
- e.printStackTrace();
- assertTrue("Exception MSg="+e.getMessage(), false);
- }
-
-
+ String identityKey = TestHelper.getIdentityKey(identityKeysJson);
+ assertTrue("identity key missing",!TextUtils.isEmpty(identityKey));
}
//****************************************************
--
GitLab