From 846ea49a9839862868ff94dec2eeea0b7d52221b Mon Sep 17 00:00:00 2001
From: ylecollen <ylecollen@amdocs.com>
Date: Wed, 4 Jan 2017 13:13:13 +0100
Subject: the OlmOutboundGroupSession methods trigger an exception when they
 fail

---
 .../java/org/matrix/olm/OlmGroupSessionTest.java   | 28 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'java/android/OlmLibSdk/olm-sdk/src/androidTest')

diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
index 9526410..c532179 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
+++ b/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
@@ -90,7 +90,14 @@ public class OlmGroupSessionTest {
     @Test
     public void test02GetOutboundGroupSessionIdentifier() {
         // test session ID
-        mAliceSessionIdentifier = mAliceOutboundGroupSession.sessionIdentifier();
+        mAliceSessionIdentifier = null;
+
+        try {
+            mAliceSessionIdentifier = mAliceOutboundGroupSession.sessionIdentifier();
+        } catch (Exception e) {
+            assertTrue(e.getMessage(), false);
+        }
+
         assertNotNull(mAliceSessionIdentifier);
         assertTrue(mAliceSessionIdentifier.length() > 0);
     }
@@ -98,7 +105,13 @@ public class OlmGroupSessionTest {
     @Test
     public void test03GetOutboundGroupSessionKey() {
         // test session Key
-        mAliceOutboundSessionKey = mAliceOutboundGroupSession.sessionKey();
+        mAliceOutboundSessionKey = null;
+
+        try {
+            mAliceOutboundSessionKey = mAliceOutboundGroupSession.sessionKey();
+        } catch (Exception e) {
+            assertTrue(e.getMessage(), false);
+        }
         assertNotNull(mAliceOutboundSessionKey);
         assertTrue(mAliceOutboundSessionKey.length() > 0);
     }
@@ -115,7 +128,7 @@ public class OlmGroupSessionTest {
         // alice encrypts a message to bob
         try {
             mAliceToBobMessage = mAliceOutboundGroupSession.encryptMessage(CLEAR_MESSAGE1);
-        } catch (OlmOutboundGroupSession.EncryptMessageException e) {
+        } catch (Exception e) {
             assertTrue("Exception in bob encryptMessage, Exception code=" + e.getMessage(), false);
         }
         assertFalse(TextUtils.isEmpty(mAliceToBobMessage));
@@ -275,7 +288,13 @@ public class OlmGroupSessionTest {
         assertNotNull(aliceOutboundGroupSession);
 
         // get the session key from the outbound group session
-        String sessionKeyRef = aliceOutboundGroupSession.sessionKey();
+        String sessionKeyRef = null;
+
+        try {
+            sessionKeyRef = aliceOutboundGroupSession.sessionKey();
+        } catch (Exception e) {
+            assertTrue(e.getMessage(), false);
+        }
         assertNotNull(sessionKeyRef);
 
         // bob creates INBOUND GROUP SESSION
@@ -286,7 +305,6 @@ public class OlmGroupSessionTest {
         }
         assertNotNull(bobInboundGroupSessionRef);
 
-
         // serialize alice session
         Context context = getInstrumentation().getContext();
         try {
-- 
cgit v1.2.3