From 250b56762857f2e52626236d3716459786ce126d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 15 Jan 2015 15:24:52 +0100 Subject: More tests, sometimes they don't pass sometimes do testIsValid depends on the speed of Runtime's exec: sometimes it's quick and passes (because it changes the date correctly) and sometimes is not. A waitFor doesn't fix the issue, it waits forever. --- .../test/testVpnCertificateValidator.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'app/src/androidTest/java/se/leap/bitmaskclient/test/testVpnCertificateValidator.java') diff --git a/app/src/androidTest/java/se/leap/bitmaskclient/test/testVpnCertificateValidator.java b/app/src/androidTest/java/se/leap/bitmaskclient/test/testVpnCertificateValidator.java index 87154956..cd1d6c3b 100644 --- a/app/src/androidTest/java/se/leap/bitmaskclient/test/testVpnCertificateValidator.java +++ b/app/src/androidTest/java/se/leap/bitmaskclient/test/testVpnCertificateValidator.java @@ -16,17 +16,17 @@ */ package se.leap.bitmaskclient.test; -import android.content.Context; -import android.os.SystemClock; -import android.test.InstrumentationTestCase; +import android.content.*; +import android.os.*; +import android.test.*; -import org.json.JSONObject; +import org.json.*; -import java.io.IOException; -import java.util.Calendar; +import java.io.*; +import java.util.*; -import se.leap.bitmaskclient.Provider; -import se.leap.bitmaskclient.eip.VpnCertificateValidator; +import se.leap.bitmaskclient.*; +import se.leap.bitmaskclient.eip.*; /** * @author parmegv @@ -64,11 +64,9 @@ public class testVpnCertificateValidator extends InstrumentationTestCase { } private int shellCommand(String command) { - int result = -1; + int result = 0; try { - result = Runtime.getRuntime().exec(command).waitFor(); - } catch (InterruptedException e) { - e.printStackTrace(); + Runtime.getRuntime().exec(command); } catch (IOException e) { e.printStackTrace(); } -- cgit v1.2.3