pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Make AndroidTest project build again 

This project was meant to test adapter + engine from Android without the app code in the middle. We gave a quick update and removed blacklist from it.
JNI-156
Hussein Kasem 4 years ago
parent
524bc4db80
commit
64e5a910de
No known key found for this signature in database GPG Key ID: 9E61B9BC790E6B02
6 changed files with 80 additions and 445 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      androidTests/app/build.gradle
  2. 391
      androidTests/app/src/main/java/com/pep/k9/MainActivity.java
  3. 9
      androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
  4. 29
      androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
  5. 84
      androidTests/app/src/main/res/layout/activity_main.xml
  6. 2
      androidTests/build.gradle

10
androidTests/app/build.gradle
View File

@ -1,13 +1,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion 30
buildToolsVersion '27.0.3' buildToolsVersion '27.0.3'
defaultConfig { defaultConfig {
applicationId "security.pEp" applicationId "security.pEp.test"
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 25 targetSdkVersion 30
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
@ -26,9 +26,9 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:23.4.0' implementation 'androidx.appcompat:appcompat:1.3.0'
implementation project(':pEpJNIAdapter') implementation project(':pEpJNIAdapter')
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.13.2'
implementation 'com.jakewharton:butterknife:8.0.1' implementation 'com.jakewharton:butterknife:8.0.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.0.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.0.1'
implementation 'com.karumi:dexter:5.0.0' implementation 'com.karumi:dexter:5.0.0'

391
androidTests/app/src/main/java/com/pep/k9/MainActivity.java
View File

@ -8,8 +8,8 @@ import android.content.res.AssetManager;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@ -31,14 +31,16 @@ import net.lingala.zip4j.core.ZipFile;
import net.lingala.zip4j.model.ZipParameters; import net.lingala.zip4j.model.ZipParameters;
import net.lingala.zip4j.util.Zip4jConstants; import net.lingala.zip4j.util.Zip4jConstants;
import org.pEp.jniadapter.AndroidHelper; import foundation.pEp.jniadapter.AndroidHelper;
import org.pEp.jniadapter.Blob; import foundation.pEp.jniadapter.Blob;
import org.pEp.jniadapter.Engine; import foundation.pEp.jniadapter.Engine;
import org.pEp.jniadapter.Identity; import foundation.pEp.jniadapter.Identity;
import org.pEp.jniadapter.Message; import foundation.pEp.jniadapter.Message;
import org.pEp.jniadapter.Pair; import foundation.pEp.jniadapter.Pair;
import org.pEp.jniadapter.Rating; import foundation.pEp.jniadapter.Rating;
import org.pEp.jniadapter.pEpException; import foundation.pEp.jniadapter.Utils;
import foundation.pEp.jniadapter.decrypt_message_Return;
import foundation.pEp.jniadapter.exceptions.pEpException;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -83,7 +85,6 @@ public class MainActivity extends AppCompatActivity {
ButterKnife.bind(this); ButterKnife.bind(this);
Context c = getApplicationContext(); Context c = getApplicationContext();
Dexter.initialize(getApplication());
PermissionListener feedbackViewPermissionListener = new PermissionListener() { PermissionListener feedbackViewPermissionListener = new PermissionListener() {
@Override @Override
public void onPermissionGranted(PermissionGrantedResponse response) { public void onPermissionGranted(PermissionGrantedResponse response) {
@ -105,7 +106,12 @@ public class MainActivity extends AppCompatActivity {
SnackbarOnDeniedPermissionListener.Builder.with(rootView, R.string.hello_world) SnackbarOnDeniedPermissionListener.Builder.with(rootView, R.string.hello_world)
.withOpenSettingsButton("SETTINGS") .withOpenSettingsButton("SETTINGS")
.build()); .build());
Dexter.checkPermission(storagePermissionListener, Manifest.permission.WRITE_EXTERNAL_STORAGE);
Dexter.withActivity(this)
.withPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
.withListener(storagePermissionListener)
.onSameThread()
.check();
generatedIdentities = new ArrayList<>(); generatedIdentities = new ArrayList<>();
text = new StringBuilder(); text = new StringBuilder();
@ -265,9 +271,6 @@ public class MainActivity extends AppCompatActivity {
@BindView(R.id.encrypt_and_decrypt) Button runEncryptAndDecrypt; @BindView(R.id.encrypt_and_decrypt) Button runEncryptAndDecrypt;
@BindView(R.id.encrypt_and_decrypt_without_key) Button runEncryptAndDecryptWithoutKey; @BindView(R.id.encrypt_and_decrypt_without_key) Button runEncryptAndDecryptWithoutKey;
@BindView(R.id.ratings) Button runRatings; @BindView(R.id.ratings) Button runRatings;
@BindView(R.id.black_list) Button runBlackList;
@BindView(R.id.black_list_and_send) Button runBlackListAndSendMessage;
@BindView(R.id.black_list_and_delete) Button runBlackListAndDelete;
@BindView(R.id.unencrypted_subject) Button runUnencryptedSubject; @BindView(R.id.unencrypted_subject) Button runUnencryptedSubject;
@BindView(R.id.passive_mode) Button runPassiveMode; @BindView(R.id.passive_mode) Button runPassiveMode;
@BindView(R.id.message_from_me_green) Button runMessageFromMeIsGreen; @BindView(R.id.message_from_me_green) Button runMessageFromMeIsGreen;
@ -275,7 +278,6 @@ public class MainActivity extends AppCompatActivity {
@BindView(R.id.times_to_test) EditText timesToTest; @BindView(R.id.times_to_test) EditText timesToTest;
@BindView(R.id.outgoing_color) Button runOutgoingColor; @BindView(R.id.outgoing_color) Button runOutgoingColor;
@BindView(R.id.identity_rating) Button runIdentityRating; @BindView(R.id.identity_rating) Button runIdentityRating;
@BindView(R.id.deblacklist) Button runDeblacklist;
@OnClick(R.id.bRunTypes) @OnClick(R.id.bRunTypes)
public void runTypes() { public void runTypes() {
@ -313,12 +315,6 @@ public class MainActivity extends AppCompatActivity {
new RunTestTask().execute(5); new RunTestTask().execute(5);
} }
@OnClick(R.id.deblacklist)
public void runDeblack() {
runDeblacklist.setText(TESTING);
new RunTestTask().execute(16);
}
@OnClick(R.id.test_everything) @OnClick(R.id.test_everything)
public void runAllTests() { public void runAllTests() {
Toast.makeText(this, "Testing started. Please, don't touch anything ò.ó", Toast.LENGTH_LONG).show(); Toast.makeText(this, "Testing started. Please, don't touch anything ò.ó", Toast.LENGTH_LONG).show();
@ -362,10 +358,6 @@ public class MainActivity extends AppCompatActivity {
encryptAndDecryptAMessage(); encryptAndDecryptAMessage();
} }
private void runDeblacklistRatingTest() throws IOException, pEpException {
deblacklistRating();
}
private void runEncryptAndDecryptAMessageFromMyselft() throws IOException, pEpException { private void runEncryptAndDecryptAMessageFromMyselft() throws IOException, pEpException {
encryptAndDecryptAMessageFromMyselfTest(); encryptAndDecryptAMessageFromMyselfTest();
} }
@ -398,18 +390,6 @@ public class MainActivity extends AppCompatActivity {
testKeyGen(); testKeyGen();
} }
private void runAddToBlacklistTest() throws pEpException, InterruptedException, IOException {
addToBlacklistTest();
}
private void runAddToBlacklistAndSendMessageTest() throws pEpException, InterruptedException, IOException {
addToBlacklistAndSendMessageTest();
}
private void runAddAndRemoveFromBlacklistTest() throws pEpException, InterruptedException, IOException {
addAndRemoveFromBlacklistTest();
}
private void runPassiveModeTest() throws pEpException, InterruptedException, IOException { private void runPassiveModeTest() throws pEpException, InterruptedException, IOException {
passiveModeTest(); passiveModeTest();
} }
@ -785,32 +765,6 @@ public class MainActivity extends AppCompatActivity {
log("TEST: ", "integration test finished"); log("TEST: ", "integration test finished");
} }
public void addToBlacklistTest() throws pEpException, IOException, AssertionError {
log("TEST: ", "blacklist test started");
long lastTime = System.currentTimeMillis();
Engine engine;
engine = new Engine();
log("engine.new Engine()", String.valueOf(System.currentTimeMillis() - lastTime));
// trustwords
testTrustwords(engine);
Identity alice = loadFromAliceFromEngine(engine);
String fingerprint = alice.fpr;
addToBlacklistInEngine(engine, fingerprint);
alice = myselfInEngine(engine, alice);
//if (!fingerprint.equals(PEP_OWN_USER_ID)) {
// throw new AssertionError("fingerprint was " + fingerprint + " instead of PEP_OWN_USER_ID");
//}
removeFromBlacklistOnEngine(engine, alice.fpr);
engine.close();
log("TEST: ", "blacklist test finished");
}
public void testOutgoingColor() throws pEpException, IOException, AssertionError { public void testOutgoingColor() throws pEpException, IOException, AssertionError {
log("TEST: ", "testOutgoingColor start"); log("TEST: ", "testOutgoingColor start");
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
@ -868,105 +822,6 @@ public class MainActivity extends AppCompatActivity {
log("TEST: ", "testIdetntityRating finished"); log("TEST: ", "testIdetntityRating finished");
} }
public void addToBlacklistAndSendMessageTest() throws pEpException, IOException, AssertionError {
log("TEST: ", "blacklist + send message test started");
long lastTime = System.currentTimeMillis();
Engine engine;
engine = new Engine();
log("engine.new Engine()", String.valueOf(System.currentTimeMillis() - lastTime));
// trustwords
testTrustwords(engine);
Identity aliceFrom = loadFromAliceFromEngine(engine);
Identity bobTo = loadToBobFromEngine(engine);
String fingerprint = bobTo.fpr;
addToBlacklistInEngine(engine, fingerprint);
// myselfInEngine(engine, aliceFrom);
// updateIdentityOnEngine(engine, bobTo);
// message
Message msg = setupMessage(aliceFrom, bobTo);
ArrayList<Pair<String, String>> pairs = new ArrayList<>();
pairs.add(new Pair<>("Received", "in time"));
pairs.add(new Pair<>("X-Foobaz", "of course"));
msg.setOptFields(pairs);
byte[] gif = LoadAssetAsBuffer("spinner.gif");
byte[] png = LoadAssetAsBuffer("pep.png");
byte[] tbz = LoadAssetAsBuffer("yml2.tar.bz2");
attachToMessage(msg, gif, png, tbz);
Message encriptedMessage;
encriptedMessage = encryptMessageOnEngine(engine, msg);
if (encriptedMessage != null) throw new AssertionError();
//if (!(encriptedMessage.getShortmsg().equals("pEp"))) throw new AssertionError();
//if (!(encriptedMessage.getLongmsg().contains("pEp-project.org")))
// throw new AssertionError();
removeFromBlacklistOnEngine(engine, fingerprint);
engine.close();
log("TEST: ", "blacklist + send message test finished");
}
public void addAndRemoveFromBlacklistTest() throws pEpException, IOException, AssertionError {
log("TEST: ", "blacklist + delete from blacklist test started");
long lastTime = System.currentTimeMillis();
Engine engine;
engine = new Engine();
log("engine.new Engine()", String.valueOf(System.currentTimeMillis() - lastTime));
// trustwords
testTrustwords(engine);
Identity bob = loadToBobFromEngine(engine);
String fingerprint = bob.fpr;
addToBlacklistInEngine(engine, fingerprint);
removeFromBlacklistOnEngine(engine, fingerprint);
Boolean isBlacklisted = isBlacklistedOnEngine(engine, bob);
if (isBlacklisted) {
throw new AssertionError();
}
// message
getBlackList(engine);
engine.close();
log("TEST: ", "blacklist + delete from blacklist finished");
}
private Vector<String> getBlackList(Engine engine) throws pEpException {
long lastTime = System.currentTimeMillis();
logStart("blacklist_retrieve", String.valueOf(lastTime));
Vector<String> blacklist = engine.blacklist_retrieve();
logEnd("blacklist_retrieve", String.valueOf(System.currentTimeMillis() - lastTime));
return blacklist;
}
private Boolean isBlacklistedOnEngine(Engine engine, Identity bob) {
long lastTime = System.currentTimeMillis();
logStart("blacklist_is_listed", String.valueOf(lastTime));
Boolean isBlacklisted = engine.blacklist_is_listed(bob.fpr);
logEnd("blacklist_is_listed", String.valueOf(System.currentTimeMillis() - lastTime));
return isBlacklisted;
}
private void removeFromBlacklistOnEngine(Engine engine, String fingerprint) {
long lastTime = System.currentTimeMillis();
logStart("blacklist_delete", String.valueOf(lastTime));
engine.blacklist_delete(fingerprint);
logEnd("backlist_delete", String.valueOf(System.currentTimeMillis() - lastTime));
}
private Identity myselfInEngine(Engine engine, Identity identity) { private Identity myselfInEngine(Engine engine, Identity identity) {
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
logStart("engine.addToBlacklist", String.valueOf(lastTime)); logStart("engine.addToBlacklist", String.valueOf(lastTime));
@ -975,13 +830,6 @@ public class MainActivity extends AppCompatActivity {
return myself; return myself;
} }
private void addToBlacklistInEngine(Engine engine, String fingerprint) {
long lastTime = System.currentTimeMillis();
logStart("engine.addToBlacklist", String.valueOf(lastTime));
engine.blacklist_add(fingerprint);
logEnd("engine.addToBlacklist", String.valueOf(System.currentTimeMillis() - lastTime));
}
private void ratingsTest() throws pEpException, IOException, AssertionError { private void ratingsTest() throws pEpException, IOException, AssertionError {
log("TEST: ", "Test ratings loaded"); log("TEST: ", "Test ratings loaded");
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
@ -1032,50 +880,6 @@ public class MainActivity extends AppCompatActivity {
log("TEST: ", "Test encrypt and decrypt finished"); log("TEST: ", "Test encrypt and decrypt finished");
} }
public void deblacklistRating() throws pEpException, IOException, AssertionError {
log("TEST: ", "Test deblacklistRating loaded");
long lastTime = System.currentTimeMillis();
Engine engine;
engine = new Engine();
log("engine.new Engine()", String.valueOf(System.currentTimeMillis() - lastTime));
Identity alice = loadFromAliceFromEngine(engine);
Identity bob = loadToBobFromEngine(engine);
removeFromBlacklistOnEngine(engine, bob.fpr);
// message
Message msg = setupMessage(alice, bob);
log("Test deblacklistRating after remove blacklist", getOutgoingMessageRatingFromEngine(engine, msg).name());
if (!(getOutgoingMessageRatingFromEngine(engine, msg).value >= Rating.pEpRatingReliable.value)) {
throw new AssertionError();
}
String fingerprint = bob.fpr;
addToBlacklistInEngine(engine, fingerprint);
Message msgBlacklisted = setupMessage(alice, bob);
log("Test deblacklistRating after blacklist", getOutgoingMessageRatingFromEngine(engine, msgBlacklisted).name());
if (getOutgoingMessageRatingFromEngine(engine, msgBlacklisted).value > 4) {
throw new AssertionError();
}
removeFromBlacklistOnEngine(engine, fingerprint);
Message msgDeBlacklisted = setupMessage(alice, bob);
log("Test deblacklistRating after remove blacklist", getOutgoingMessageRatingFromEngine(engine, msg).name());
if (!(getOutgoingMessageRatingFromEngine(engine, msgDeBlacklisted).equals(Rating.pEpRatingReliable))) {
throw new AssertionError();
}
engine.close();
log("TEST: ", "Test deblacklistRating finished");
}
public void encryptAndDecryptAMessageFromMyselfTest() throws pEpException, IOException, AssertionError { public void encryptAndDecryptAMessageFromMyselfTest() throws pEpException, IOException, AssertionError {
log("TEST: ", "Test encrypt and decrypt from myself loaded"); log("TEST: ", "Test encrypt and decrypt from myself loaded");
@ -1104,10 +908,10 @@ public class MainActivity extends AppCompatActivity {
throw new AssertionError(); throw new AssertionError();
Vector<Blob> attachments = encryptedMessage.getAttachments(); Vector<Blob> attachments = encryptedMessage.getAttachments();
if (!(Engine.toUTF16(attachments.get(1).data).startsWith("-----BEGIN PGP MESSAGE-----"))) if (!(Utils.toUTF16(attachments.get(1).data).startsWith("-----BEGIN PGP MESSAGE-----")))
throw new AssertionError(); throw new AssertionError();
Engine.decrypt_message_Return result = null; decrypt_message_Return result = null;
decryptMessageOnEngine(engine, encryptedMessage); decryptMessageOnEngine(engine, encryptedMessage);
engine.close(); engine.close();
@ -1131,7 +935,7 @@ public class MainActivity extends AppCompatActivity {
pairs.add(new Pair<>("X-Foobaz", "of course")); pairs.add(new Pair<>("X-Foobaz", "of course"));
msg.setOptFields(pairs); msg.setOptFields(pairs);
Engine.decrypt_message_Return decrypt_message_return = encrypAndDecryptMessage(engine, msg); decrypt_message_Return decrypt_message_return = encrypAndDecryptMessage(engine, msg);
if(decrypt_message_return.rating.value < 6) { if(decrypt_message_return.rating.value < 6) {
throw new AssertionError(); throw new AssertionError();
@ -1304,7 +1108,7 @@ public class MainActivity extends AppCompatActivity {
private void importKeyFromEngine(Engine engine, String filename) throws IOException { private void importKeyFromEngine(Engine engine, String filename) throws IOException {
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
logStart("engine.importKey", String.valueOf(lastTime)); logStart("engine.importKey", String.valueOf(lastTime));
engine.importKey(LoadAssetAsString(filename)); engine.importKey(LoadAssetAsBuffer(filename));
logEnd("engine.importKey", String.valueOf(System.currentTimeMillis() - lastTime)); logEnd("engine.importKey", String.valueOf(System.currentTimeMillis() - lastTime));
} }
@ -1404,7 +1208,7 @@ public class MainActivity extends AppCompatActivity {
} }
@NonNull @NonNull
private Engine.decrypt_message_Return encrypAndDecryptMessage(Engine engine, Message msg) throws pEpException { private decrypt_message_Return encrypAndDecryptMessage(Engine engine, Message msg) throws pEpException {
Message encryptedMessage; Message encryptedMessage;
encryptedMessage = encryptMessageOnEngine(engine, msg); encryptedMessage = encryptMessageOnEngine(engine, msg);
@ -1415,10 +1219,10 @@ public class MainActivity extends AppCompatActivity {
throw new AssertionError(); throw new AssertionError();
Vector<Blob> attachments = encryptedMessage.getAttachments(); Vector<Blob> attachments = encryptedMessage.getAttachments();
if (!(Engine.toUTF16(attachments.get(1).data).startsWith("-----BEGIN PGP MESSAGE-----"))) if (!(Utils.toUTF16(attachments.get(1).data).startsWith("-----BEGIN PGP MESSAGE-----")))
throw new AssertionError(); throw new AssertionError();
Engine.decrypt_message_Return result; decrypt_message_Return result;
result = decryptMessageOnEngine(engine, encryptedMessage); result = decryptMessageOnEngine(engine, encryptedMessage);
if (!(result.dst.getShortmsg().equals("hello, world"))) throw new AssertionError(); if (!(result.dst.getShortmsg().equals("hello, world"))) throw new AssertionError();
@ -1426,10 +1230,10 @@ public class MainActivity extends AppCompatActivity {
return result; return result;
} }
private Engine.decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException { private decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException {
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
logStart("engine.decrypt_message", String.valueOf(lastTime)); logStart("engine.decrypt_message", String.valueOf(lastTime));
Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, 0); decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, new Vector<>(), 0);
logEnd("engine.decrypt_message", String.valueOf(System.currentTimeMillis() - lastTime)); logEnd("engine.decrypt_message", String.valueOf(System.currentTimeMillis() - lastTime));
return decrypt_message_return; return decrypt_message_return;
} }
@ -1643,7 +1447,7 @@ public class MainActivity extends AppCompatActivity {
case 7: case 7:
if (!executedTasks.contains(7)) { if (!executedTasks.contains(7)) {
for (int i = 0; i< testingTimes; i++) { for (int i = 0; i< testingTimes; i++) {
runAddToBlacklistTest(); runUnencryptedSubjectTest();
} }
executedTasks.add(7); executedTasks.add(7);
return 7; return 7;
@ -1652,7 +1456,7 @@ public class MainActivity extends AppCompatActivity {
case 8: case 8:
if (!executedTasks.contains(8)) { if (!executedTasks.contains(8)) {
for (int i = 0; i< testingTimes; i++) { for (int i = 0; i< testingTimes; i++) {
runAddToBlacklistAndSendMessageTest(); runPassiveModeTest();
} }
executedTasks.add(8); executedTasks.add(8);
return 8; return 8;
@ -1661,7 +1465,7 @@ public class MainActivity extends AppCompatActivity {
case 9: case 9:
if (!executedTasks.contains(9)) { if (!executedTasks.contains(9)) {
for (int i = 0; i< testingTimes; i++) { for (int i = 0; i< testingTimes; i++) {
runAddAndRemoveFromBlacklistTest(); runEncryptAndDecryptAMessageFromMyselft();
} }
executedTasks.add(9); executedTasks.add(9);
return 9; return 9;
@ -1670,7 +1474,7 @@ public class MainActivity extends AppCompatActivity {
case 10: case 10:
if (!executedTasks.contains(10)) { if (!executedTasks.contains(10)) {
for (int i = 0; i< testingTimes; i++) { for (int i = 0; i< testingTimes; i++) {
runUnencryptedSubjectTest(); runMessageForMeIsAlwaysGreenTest();
} }
executedTasks.add(10); executedTasks.add(10);
return 10; return 10;
@ -1679,8 +1483,9 @@ public class MainActivity extends AppCompatActivity {
case 11: case 11:
if (!executedTasks.contains(11)) { if (!executedTasks.contains(11)) {
for (int i = 0; i< testingTimes; i++) { for (int i = 0; i< testingTimes; i++) {
runPassiveModeTest(); runOutgoingColorTest();
} }
log("outgoing average", String.valueOf(outgoingColorAccumulative /testingTimes));
executedTasks.add(11); executedTasks.add(11);
return 11; return 11;
} }
@ -1688,49 +1493,12 @@ public class MainActivity extends AppCompatActivity {
case 12: case 12:
if (!executedTasks.contains(12)) { if (!executedTasks.contains(12)) {
for (int i = 0; i< testingTimes; i++) { for (int i = 0; i< testingTimes; i++) {
runEncryptAndDecryptAMessageFromMyselft(); runIdetntityRatingTest();
} }
executedTasks.add(12); executedTasks.add(12);
return 12; return 12;
} }
break; break;
case 13:
if (!executedTasks.contains(13)) {
for (int i = 0; i< testingTimes; i++) {
runMessageForMeIsAlwaysGreenTest();
}
executedTasks.add(13);
return 13;
}
break;
case 14:
if (!executedTasks.contains(14)) {
for (int i = 0; i< testingTimes; i++) {
runOutgoingColorTest();
}
log("outgoing average", String.valueOf(outgoingColorAccumulative /testingTimes));
executedTasks.add(14);
return 14;
}
break;
case 15:
if (!executedTasks.contains(15)) {
for (int i = 0; i< testingTimes; i++) {
runIdetntityRatingTest();
}
executedTasks.add(15);
return 15;
}
break;
case 16:
if (!executedTasks.contains(16)) {
for (int i = 0; i< testingTimes; i++) {
runDeblacklistRatingTest();
}
executedTasks.add(16);
return 16;
}
break;
} }
} catch (AssertionError | Exception ex) { } catch (AssertionError | Exception ex) {
Log.e("PEPTEST", "##################### TEST Exception ####################", ex); Log.e("PEPTEST", "##################### TEST Exception ####################", ex);
@ -1780,58 +1548,29 @@ public class MainActivity extends AppCompatActivity {
new RunAllTestsTask().execute(6); new RunAllTestsTask().execute(6);
break; break;
case 6: case 6:
runIntegration.setText(PASSED);
runBlackList.setText(TESTING);
new RunAllTestsTask().execute(7);
break;
case 7:
runBlackList.setText(PASSED);
runBlackListAndSendMessage.setText(TESTING);
new RunAllTestsTask().execute(8);
break;
case 8:
runBlackListAndSendMessage.setText(PASSED);
runBlackListAndDelete.setText(TESTING);
new RunAllTestsTask().execute(9);
break;
case 9:
runBlackListAndDelete.setText(PASSED);
runUnencryptedSubject.setText(TESTING);
new RunAllTestsTask().execute(10);
break;
case 10:
runUnencryptedSubject.setText(PASSED); runUnencryptedSubject.setText(PASSED);
runPassiveMode.setText(TESTING); runPassiveMode.setText(TESTING);
new RunAllTestsTask().execute(11); new RunAllTestsTask().execute(7);
break; break;
case 11: case 7:
runPassiveMode.setText(PASSED); runPassiveMode.setText(PASSED);
runMessageMe.setText(TESTING); runMessageMe.setText(TESTING);
new RunAllTestsTask().execute(12); new RunAllTestsTask().execute(8);
break; break;
case 12: case 8:
runMessageMe.setText(PASSED); runMessageMe.setText(PASSED);
runMessageFromMeIsGreen.setText(TESTING); runMessageFromMeIsGreen.setText(TESTING);
new RunAllTestsTask().execute(13); new RunAllTestsTask().execute(9);
break; break;
case 13: case 9:
runMessageFromMeIsGreen.setText(PASSED); runMessageFromMeIsGreen.setText(PASSED);
runOutgoingColor.setText(TESTING); runOutgoingColor.setText(TESTING);
new RunAllTestsTask().execute(14); new RunAllTestsTask().execute(10);
break; break;
case 14: case 10:
runOutgoingColor.setText(PASSED); runOutgoingColor.setText(PASSED);
runIdentityRating.setText(TESTING); runIdentityRating.setText(TESTING);
new RunAllTestsTask().execute(15); new RunAllTestsTask().execute(11);
break;
case 15:
runIdentityRating.setText(PASSED);
runDeblacklist.setText(TESTING);
new RunAllTestsTask().execute(16);
break;
case 16:
runDeblacklist.setText(PASSED);
generateNoteOnSD("dump_test_engine");
break; break;
} }
Log.i("RunAllTestsTask", "onPostExecute " + "Ended test"); Log.i("RunAllTestsTask", "onPostExecute " + "Ended test");
@ -1869,44 +1608,28 @@ public class MainActivity extends AppCompatActivity {
new RunAllTestsTask().execute(7); new RunAllTestsTask().execute(7);
break; break;
case 7: case 7:
runBlackList.setText(FAILED);
new RunAllTestsTask().execute(8);
break;
case 8:
runBlackListAndSendMessage.setText(FAILED);
new RunAllTestsTask().execute(9);
break;
case 9:
runBlackListAndDelete.setText(FAILED);
new RunAllTestsTask().execute(10);
break;
case 10:
runUnencryptedSubject.setText(FAILED); runUnencryptedSubject.setText(FAILED);
new RunAllTestsTask().execute(11); new RunAllTestsTask().execute(7);
break; break;
case 11: case 8:
runMessageMe.setText(FAILED); runMessageMe.setText(FAILED);
new RunAllTestsTask().execute(12); new RunAllTestsTask().execute(8);
break; break;
case 12: case 9:
runMessageMe.setText(FAILED); runMessageMe.setText(FAILED);
new RunAllTestsTask().execute(13); new RunAllTestsTask().execute(9);
break; break;
case 13: case 10:
runMessageFromMeIsGreen.setText(FAILED); runMessageFromMeIsGreen.setText(FAILED);
new RunAllTestsTask().execute(14); new RunAllTestsTask().execute(10);
break; break;
case 14: case 11:
runMessageFromMeIsGreen.setText(FAILED); runMessageFromMeIsGreen.setText(FAILED);
new RunAllTestsTask().execute(14); new RunAllTestsTask().execute(11);
break; break;
case 15: case 12:
runIdentityRating.setText(FAILED); runIdentityRating.setText(FAILED);
new RunAllTestsTask().execute(15); new RunAllTestsTask().execute(12);
break;
case 16:
runDeblacklist.setText(FAILED);
generateNoteOnSD("dump_test_engine");
break; break;
} }
} }
@ -1941,9 +1664,6 @@ public class MainActivity extends AppCompatActivity {
case 6: case 6:
runIntegrationTest(); runIntegrationTest();
return 6; return 6;
case 16:
runDeblacklistRatingTest();
return 6;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -1982,9 +1702,6 @@ public class MainActivity extends AppCompatActivity {
case 6: case 6:
runIntegration.setText(TESTED); runIntegration.setText(TESTED);
break; break;
case 16:
runDeblacklist.setText(TESTED);
break;
} }
Log.i("RunAllTestsTask", "onPostExecute " + "Ended test"); Log.i("RunAllTestsTask", "onPostExecute " + "Ended test");
} }

9
androidTests/app/src/main/java/com/pep/k9/PEpUnitaryStuff.java
View File

@ -1,8 +1,9 @@
package com.pep.k9; package com.pep.k9;
import org.pEp.jniadapter.Engine; import foundation.pEp.jniadapter.Engine;
import org.pEp.jniadapter.Identity; import foundation.pEp.jniadapter.Identity;
import org.pEp.jniadapter.Message; import foundation.pEp.jniadapter.Message;
import foundation.pEp.jniadapter.decrypt_message_Return;
import java.util.Vector; import java.util.Vector;
@ -37,7 +38,7 @@ public class PEpUnitaryStuff {
msg.setCc(cc); msg.setCc(cc);
Message encriptedMessage = engine.encrypt_message(msg, null, Message.EncFormat.PEP); Message encriptedMessage = engine.encrypt_message(msg, null, Message.EncFormat.PEP);
Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, 0); decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, new Vector<>(), 0);
if (!decrypt_message_return.dst.getLongmsg().equals(message)) { if (!decrypt_message_return.dst.getLongmsg().equals(message)) {
throw new RuntimeException("FAILED"); throw new RuntimeException("FAILED");

29
androidTests/app/src/main/java/com/pep/k9/UnitActivity.java
View File

@ -1,17 +1,18 @@
package com.pep.k9; package com.pep.k9;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import org.pEp.jniadapter.Blob; import foundation.pEp.jniadapter.Blob;
import org.pEp.jniadapter.Engine; import foundation.pEp.jniadapter.Engine;
import org.pEp.jniadapter.Identity; import foundation.pEp.jniadapter.Identity;
import org.pEp.jniadapter.Message; import foundation.pEp.jniadapter.Message;
import org.pEp.jniadapter.Pair; import foundation.pEp.jniadapter.Pair;
import org.pEp.jniadapter.pEpException; import foundation.pEp.jniadapter.decrypt_message_Return;
import foundation.pEp.jniadapter.exceptions.pEpException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -69,7 +70,7 @@ public class UnitActivity extends AppCompatActivity {
Vector<Blob> attachments = encryptedMessage.getAttachments(); Vector<Blob> attachments = encryptedMessage.getAttachments();
Engine.decrypt_message_Return result; decrypt_message_Return result;
result = decryptMessageOnEngine(engine, encryptedMessage); result = decryptMessageOnEngine(engine, encryptedMessage);
engine.close(); engine.close();
@ -107,7 +108,7 @@ public class UnitActivity extends AppCompatActivity {
Vector<Blob> attachments = encryptedMessage.getAttachments(); Vector<Blob> attachments = encryptedMessage.getAttachments();
Engine.decrypt_message_Return result; decrypt_message_Return result;
result = decryptMessageOnEngine(engine, encryptedMessage); result = decryptMessageOnEngine(engine, encryptedMessage);
engine.close(); engine.close();
@ -145,7 +146,7 @@ public class UnitActivity extends AppCompatActivity {
Vector<Blob> attachments = encryptedMessage.getAttachments(); Vector<Blob> attachments = encryptedMessage.getAttachments();
Engine.decrypt_message_Return result; decrypt_message_Return result;
result = decryptMessageOnEngine(engine, encryptedMessage); result = decryptMessageOnEngine(engine, encryptedMessage);
engine.close(); engine.close();
@ -175,9 +176,9 @@ public class UnitActivity extends AppCompatActivity {
return msg; return msg;
} }
private Engine.decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException { private decrypt_message_Return decryptMessageOnEngine(Engine engine, Message encriptedMessage) throws pEpException {
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
Engine.decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, 0); decrypt_message_Return decrypt_message_return = engine.decrypt_message(encriptedMessage, new Vector<>(), 0x0);
long time = System.currentTimeMillis() - lastTime; long time = System.currentTimeMillis() - lastTime;
Log.d("time", " " + time); Log.d("time", " " + time);
return decrypt_message_return; return decrypt_message_return;
@ -256,7 +257,7 @@ public class UnitActivity extends AppCompatActivity {
private void importKeyFromEngine(Engine engine, String filename) throws IOException { private void importKeyFromEngine(Engine engine, String filename) throws IOException {
long lastTime = System.currentTimeMillis(); long lastTime = System.currentTimeMillis();
engine.importKey(LoadAssetAsString(filename)); engine.importKey(LoadAssetAsBuffer(filename));
long time = System.currentTimeMillis() - lastTime; long time = System.currentTimeMillis() - lastTime;
Log.d("time", " " + time); Log.d("time", " " + time);
} }

84
androidTests/app/src/main/res/layout/activity_main.xml
View File

@ -162,69 +162,6 @@
android:text="Run" /> android:text="Run" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Add to blacklist + new key"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Button
android:id="@+id/black_list"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Run" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Blacklist + send"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Button
android:id="@+id/black_list_and_send"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Run" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Blacklist + delete"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Button
android:id="@+id/black_list_and_delete"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Run" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -351,27 +288,6 @@
android:text="Run" /> android:text="Run" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Deblacklist rating"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Button
android:id="@+id/deblacklist"
style="?android:attr/buttonStyleSmall"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Run" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
androidTests/build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:4.2.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

Write Preview
Loading…
Cancel
Save