From a0d9f0d076fcf1439d5e341027dc21741f467a10 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Sun, 2 May 2021 14:39:32 +0200
Subject: [PATCH] Tests: Make tests work without setting .user_id or .me (on
 any Role)

---
 .../pEp/jniadapter/test/jni150/TestAlice.java          |  1 +
 .../pEp/jniadapter/test/regression/TestMain.java       | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/java/foundation/pEp/jniadapter/test/jni150/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni150/TestAlice.java
index 7611a70..5ef57b8 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni150/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni150/TestAlice.java
@@ -30,6 +30,7 @@ class TestAlice {
         CTXBase ctxBase = new CTXBase();
 
         new TestUnit<CTXBase>("user_id after first myself() ever", ctxBase, ctx -> {
+            ctx.alice.user_id = "23";
             Identity result = ctx.engine.myself(ctx.alice);
             log(AdapterTestUtils.identityToString(result, true));
             assert result.user_id.equals(ctx.alice.user_id): result.address + ": user_id is expected to be "+ctx.alice.user_id+", but is: " + result.user_id;
diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
index d5f3bf2..acf87a0 100644
--- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
@@ -126,11 +126,11 @@ class TestMain {
             ctx.engine.OpenPGP_list_keyinfo("");
         });
 
-        new TestUnit<CTXBase>("Engine.set_identity_flags", new CTXBase(), ctx -> {
+        new TestUnit<CTXAlice>("Engine.set_identity_flags", new CTXAlice(), ctx -> {
             ctx.engine.set_identity_flags(ctx.alice, 0);
         });
 
-        new TestUnit<CTXBase>("Engine.unset_identity_flags", new CTXBase(), ctx -> {
+        new TestUnit<CTXAlice>("Engine.unset_identity_flags", new CTXAlice(), ctx -> {
             ctx.engine.unset_identity_flags(ctx.alice, 0);
         });
 
@@ -199,7 +199,7 @@ class TestMain {
             ctx.engine.config_cipher_suite(CipherSuite.pEpCipherSuiteDefault);
         });
 
-        new TestUnit<CTXBase>("Engine.trustwords", new CTXBase(), ctx -> {
+        new TestUnit<CTXAlice>("Engine.trustwords", new CTXAlice(), ctx -> {
             ctx.engine.trustwords(ctx.alice);
         });
 
@@ -215,11 +215,11 @@ class TestMain {
             ctx.engine.keyMistrusted(ctx.alice);
         });
 
-        new TestUnit<CTXBase>("Engine.keyResetTrust", new CTXBase(), ctx -> {
+        new TestUnit<CTXAlice>("Engine.keyResetTrust", new CTXAlice(), ctx -> {
             ctx.engine.keyResetTrust(ctx.alice);
         });
 
-        new TestUnit<CTXBase>("Engine.trustPersonalKey", new CTXBase(), ctx -> {
+        new TestUnit<CTXAlice>("Engine.trustPersonalKey", new CTXAlice(), ctx -> {
             ctx.engine.trustPersonalKey(ctx.alice);
         });