From 491dee7e2ee1ef90cb609149674ee0a6299c94a9 Mon Sep 17 00:00:00 2001 From: heck Date: Fri, 24 Apr 2020 02:48:01 +0200 Subject: [PATCH] little java Consumer based Test framework. To be combined with threadpool. (JNI-92) --- .../jniadapter/test/regression/TestMain.java | 383 +----------------- 1 file changed, 3 insertions(+), 380 deletions(-) diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java index 2caa7b9..61da17e 100644 --- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java +++ b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java @@ -231,9 +231,9 @@ class TestMain { }).run(); // TODO: class not found: foundation/pEp/jniadapter/Message$CipherSuite - new TestUnit("Engine.config_cipher_suite", env -> { - env.engine.config_cipher_suite(CipherSuite.pEpCipherSuiteDefault); - }).run(); +// new TestUnit("Engine.config_cipher_suite", env -> { +// env.engine.config_cipher_suite(CipherSuite.pEpCipherSuiteDefault); +// }).run(); new TestUnit("Engine.trustwords", env -> { env.engine.trustwords(env.alice); @@ -332,383 +332,6 @@ class TestMain { }).run(); } - - - public static void testRunOld() throws Exception { - TestUtils.logH1("enigne_all starting"); - - Sync.DefaultCallback cb = new Sync.DefaultCallback(); - - Identity alice = new Identity(); - alice.user_id = "23"; - alice.address = "alice@peptest.org"; - alice.me = true; - - Identity bob = new Identity(); - bob.user_id = "42"; - bob.address = "bob@peptest.org"; - - Vector vID = new Vector(); - vID.add(bob); - - Vector vStr = new Vector(); - vStr.add("StringItem"); - - byte[] key; - String fileName = "../resources/test_keys/pub/pep-test-alice-0x6FF00E97_pub.asc"; - try { - Path path = Paths.get(fileName); - key = Files.readAllBytes(path); - } catch (Exception e) { - TestUtils.log("Could not open key file:" + fileName); - throw e; - } - - Engine engine = new Engine(); - engine.setMessageToSendCallback(cb); - engine.setNotifyHandshakeCallback(cb); - engine.setNeedsFastPollCallback(cb); - - alice = engine.myself(alice); - - try { - bob = engine.myself(bob); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - // Engine.java - Message msgSrc = TestEnv.makeNewMessage(alice, bob, Message.Direction.Outgoing); - try { - engine.encrypt_message(msgSrc, null, Message.EncFormat.PEP); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - msgSrc = TestEnv.makeNewMessage(alice, alice, Message.Direction.Outgoing); - try { - engine.encrypt_message_and_add_priv_key(msgSrc, alice.fpr); - } catch (Exception e) { - TestUtils.log(e.toString()); - throw e; - } - - try { - engine.encrypt_message_for_self(alice, msgSrc, vStr); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.decrypt_message(msgSrc, vStr, 0); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.re_evaluate_message_rating(msgSrc); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.outgoing_message_rating(msgSrc); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.outgoing_message_rating_preview(msgSrc); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.get_identity(alice.address, alice.user_id); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - System.exit(0); - - try { - engine.identity_rating(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.blacklist_retrieve(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.own_message_private_key_details(msgSrc); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.OpenPGP_list_keyinfo(""); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.set_identity_flags(alice, 0); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.unset_identity_flags(alice, 0); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.own_identities_retrieve(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.get_trustwords(alice, bob, "en", false); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.get_trustwords_for_fprs(alice.fpr, bob.fpr, "en", false); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.get_message_trustwords(msgSrc, vStr, bob, "en", false); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.get_languagelist(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.key_reset_trust(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.key_reset_identity(alice, ""); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.key_reset_user("alice", alice.fpr); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.key_reset_all_own_keys(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.deliverHandshakeResult(SyncHandshakeResult.SyncHandshakeAccepted, vID); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.startSync(); - engine.leave_device_group(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.enable_identity_for_sync(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.disable_identity_for_sync(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - // TODO: class not found: foundation/pEp/jniadapter/Message$CipherSuite - try { -// engine.config_cipher_suite(CipherSuite.pEpCipherSuiteDefault); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.trustwords(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.updateIdentity(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.setOwnKey(alice, "65"); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.keyMistrusted(bob); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.keyResetTrust(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.trustPersonalKey(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.trustOwnKey(alice); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.importKey(key); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.blacklist_add("43"); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.blacklist_delete("43"); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.blacklist_is_listed("43"); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.config_passive_mode(false); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.config_unencrypted_subject(false); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.getCrashdumpLog(0); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - -// try { -// engine.getUserDirectory(); -// } catch (Exception e) { -// TestUtils.log(e.toString()); -// } -// -// try { -// engine.getMachineDirectory(); -// } catch (Exception e) { -// TestUtils.log(e.toString()); -// } - - // AbstractEngine.java - try { - engine.close(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.getVersion(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.getProtocolVersion(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.startKeyserverLookup(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.startSync(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.stopSync(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.isSyncRunning(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.isSyncRunning(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.isSyncRunning(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - - try { - engine.isSyncRunning(); - } catch (Exception e) { - TestUtils.log(e.toString()); - } - } }