[282481] Provide an EmbeddedSessionProtocol

https://bugs.eclipse.org/bugs/show_bug.cgi?id=282481

2 files changed, 16 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java
index 784b2bb401..cc072f77f0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AuditTest.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
@@ -347,12 +347,16 @@ public class AuditTest extends AbstractCDOTest
 
       session = openSession2();
       session.openAudit(timeStampPriorToRepoCreation);
-      fail("SignalRemoteException expected");
+      fail("IllegalArgumentException expected");
     }
-    catch (RemoteException eexpected)
+    catch (IllegalArgumentException expected)
     {
       // Success
     }
+    catch (RemoteException expected)
+    {
+      assertEquals(IllegalArgumentException.class, expected.getCause().getClass());
+    }
     finally
     {
       session.close();
@@ -382,12 +386,16 @@ public class AuditTest extends AbstractCDOTest
       session = openSession2();
       CDOAudit audit = session.openAudit(commitTime1);
       audit.setTimeStamp(timeStampPriorToRepoCreation);
-      fail("SignalRemoteException expected");
+      fail("IllegalArgumentException expected");
     }
-    catch (RemoteException expected)
+    catch (IllegalArgumentException expected)
     {
       // Success
     }
+    catch (RemoteException expected)
+    {
+      assertEquals(IllegalArgumentException.class, expected.getCause().getClass());
+    }
     finally
     {
       session.close();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
index f2ec6b56c0..c7167d1ca8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
@@ -98,13 +98,13 @@ public class SessionTest extends AbstractCDOTest
       openSession("authrepo");
       fail("SecurityException expected");
     }
-    catch (SecurityException exception)
+    catch (SecurityException expected)
     {
       // Success
     }
-    catch (RemoteException exception)
+    catch (RemoteException expected)
     {
-      assertEquals(SecurityException.class, exception.getCause().getClass());
+      assertEquals(SecurityException.class, expected.getCause().getClass());
     }
   }