From 65ac2b3e182afd7900b1e7a349542913908e5ef3 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 10 Aug 2015 09:30:59 -0700 Subject: [PATCH] Revert "use new android unit test support" This reverts commit 06e137aee9688115c90c5d6431b41f0b44381764. --- build.gradle | 40 ++++++++++++++++--- .../securesms/util/BitmapUtilTest.java | 10 ++--- .../securesms/util/ListPartitionTest.java | 12 +++--- .../util/PhoneNumberFormatterTest.java | 15 +++++-- .../securesms/util/Rfc5724UriTest.java | 28 ++++++------- 5 files changed, 68 insertions(+), 37 deletions(-) rename test/{unitTest => androidTest}/java/org/thoughtcrime/securesms/util/BitmapUtilTest.java (88%) rename test/{unitTest => androidTest}/java/org/thoughtcrime/securesms/util/ListPartitionTest.java (86%) rename test/{unitTest => androidTest}/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java (70%) rename test/{unitTest => androidTest}/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java (83%) diff --git a/build.gradle b/build.gradle index e6026a44f8..516f4d3753 100644 --- a/build.gradle +++ b/build.gradle @@ -80,9 +80,8 @@ dependencies { compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' compile 'org.whispersystems:textsecure-android:1.6.2' - testCompile 'junit:junit:4.12' - testCompile 'org.assertj:assertj-core:1.7.1' - testCompile "org.mockito:mockito-core:1.9.5" + androidTestCompile 'com.google.dexmaker:dexmaker:1.2' + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' androidTestCompile ('org.assertj:assertj-core:1.7.1') { exclude group: 'org.hamcrest', module: 'hamcrest-core' @@ -91,6 +90,13 @@ dependencies { exclude group: 'org.hamcrest', module: 'hamcrest-core' exclude group: 'com.android.support', module: 'support-annotations' } + androidTestCompile ('com.android.support.test:runner:0.2') { + exclude group: 'com.android.support', module: 'support-annotations' + } + androidTestCompile ('com.android.support.test.espresso:espresso-core:2.1') { + exclude group: 'com.android.support', module: 'support-annotations' + exclude group: 'javax.inject' + } } dependencyVerification { @@ -155,6 +161,7 @@ android { minSdkVersion 9 targetSdkVersion 22 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L" buildConfigField "String", "PUSH_URL", "\"https://textsecure-service.whispersystems.org\"" buildConfigField "boolean", "DEV_BUILD", "false" @@ -219,9 +226,6 @@ android { androidTest { java.srcDirs = ['test/androidTest/java'] } - test { - java.srcDirs = ['test/unitTest/java'] - } } lintOptions { @@ -260,3 +264,27 @@ if (propFile.canRead()){ android.buildTypes.release.signingConfig = null } +if (project.hasProperty('espresso') && System.console() != null) { + println "______________________WARNING_______________________" + println "ALL YOUR CONTACTS WILL BE DELETED IN THE PROCESS" + println "OF RUNNING THESE TESTS, TYPE 'delete all my contacts'" + println "TO CONTINUE" + println "----------------------------------------------------" + + def input = System.console().readLine(':') + if (input == 'delete all my contacts') { + android.productFlavors { + base {} + espresso { + testInstrumentationRunner "org.thoughtcrime.securesms.TextSecureWakingTestRunner" + } + } + android.sourceSets.espresso { + manifest.srcFile 'test/espresso/AndroidManifest.xml' + } + android.sourceSets.androidTestEspresso { + java.srcDirs = ['test/androidTestEspresso/java'] + res.srcDirs = ['test/androidTestEspresso/res'] + } + } +} diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/BitmapUtilTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/BitmapUtilTest.java similarity index 88% rename from test/unitTest/java/org/thoughtcrime/securesms/util/BitmapUtilTest.java rename to test/androidTest/java/org/thoughtcrime/securesms/util/BitmapUtilTest.java index 80a85294a3..e190dfc8c5 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/util/BitmapUtilTest.java +++ b/test/androidTest/java/org/thoughtcrime/securesms/util/BitmapUtilTest.java @@ -1,11 +1,9 @@ package org.thoughtcrime.securesms.util; -import org.junit.Test; +import org.thoughtcrime.securesms.TextSecureTestCase; -import static org.junit.Assert.assertEquals; - -public class BitmapUtilTest { - @Test public void testScaleFactorNormal() { +public class BitmapUtilTest extends TextSecureTestCase { + public void testScaleFactorNormal() { assertEquals(1, BitmapUtil.getScaleFactor(1000, 1000, 9000, 9000, false)); assertEquals(1, BitmapUtil.getScaleFactor(1000, 1000, 750, 750, false)); @@ -20,7 +18,7 @@ public class BitmapUtilTest { assertEquals(2, BitmapUtil.getScaleFactor(1000, 2000, 499, 499, false)); } - @Test public void testScaleFactorConstrained() { + public void testScaleFactorConstrained() { assertEquals(1, BitmapUtil.getScaleFactor(1000, 1000, 9000, 9000, true)); assertEquals(2, BitmapUtil.getScaleFactor(1000, 1000, 750, 750, true)); diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java similarity index 86% rename from test/unitTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java rename to test/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java index df2320f668..9cad7f616d 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java +++ b/test/androidTest/java/org/thoughtcrime/securesms/util/ListPartitionTest.java @@ -1,15 +1,15 @@ package org.thoughtcrime.securesms.util; -import org.junit.Test; +import org.thoughtcrime.securesms.TextSecureTestCase; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static junit.framework.Assert.assertEquals; -public class ListPartitionTest { +public class ListPartitionTest extends TextSecureTestCase { - @Test public void testPartitionEven() { + public void testPartitionEven() { List list = new LinkedList<>(); for (int i=0;i<100;i++) { @@ -32,7 +32,7 @@ public class ListPartitionTest { } } - @Test public void testPartitionOdd() { + public void testPartitionOdd() { List list = new LinkedList<>(); for (int i=0;i<100;i++) { @@ -60,7 +60,7 @@ public class ListPartitionTest { assertEquals((int)partitions.get(10).get(0), 100); } - @Test public void testPathological() { + public void testPathological() { List list = new LinkedList<>(); for (int i=0;i<100;i++) { diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java similarity index 70% rename from test/unitTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java rename to test/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java index e8c6b8c2bb..c522da01a6 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java +++ b/test/androidTest/java/org/thoughtcrime/securesms/util/PhoneNumberFormatterTest.java @@ -1,23 +1,25 @@ package org.thoughtcrime.securesms.util; +import android.test.AndroidTestCase; + import junit.framework.AssertionFailedError; -import org.junit.Test; +import org.thoughtcrime.securesms.TextSecureTestCase; import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; import static org.assertj.core.api.Assertions.assertThat; -public class PhoneNumberFormatterTest { +public class PhoneNumberFormatterTest extends TextSecureTestCase { private static final String LOCAL_NUMBER = "+15555555555"; - @Test public void testFormatNumberE164() throws Exception, InvalidNumberException { + public void testFormatNumberE164() throws Exception, InvalidNumberException { assertThat(PhoneNumberFormatter.formatNumber("(555) 555-5555", LOCAL_NUMBER)).isEqualTo(LOCAL_NUMBER); assertThat(PhoneNumberFormatter.formatNumber("555-5555", LOCAL_NUMBER)).isEqualTo(LOCAL_NUMBER); assertThat(PhoneNumberFormatter.formatNumber("(123) 555-5555", LOCAL_NUMBER)).isNotEqualTo(LOCAL_NUMBER); } - @Test public void testFormatNumberEmail() throws Exception { + public void testFormatNumberEmail() throws Exception { try { PhoneNumberFormatter.formatNumber("person@domain.com", LOCAL_NUMBER); throw new AssertionFailedError("should have thrown on email"); @@ -25,4 +27,9 @@ public class PhoneNumberFormatterTest { // success } } + + @Override + public void setUp() throws Exception { + super.setUp(); + } } diff --git a/test/unitTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java b/test/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java similarity index 83% rename from test/unitTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java rename to test/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java index bfbddd0160..095dcf3e19 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java +++ b/test/androidTest/java/org/thoughtcrime/securesms/util/Rfc5724UriTest.java @@ -19,19 +19,15 @@ package org.thoughtcrime.securesms.util; import android.util.Log; -import junit.framework.AssertionFailedError; - -import org.junit.Test; +import org.thoughtcrime.securesms.TextSecureTestCase; import java.net.URISyntaxException; -import static org.junit.Assert.assertTrue; - -public class Rfc5724UriTest { +public class Rfc5724UriTest extends TextSecureTestCase { private static final String TAG = Rfc5724UriTest.class.getSimpleName(); - @Test public void testInvalidPath() throws Exception { + public void testInvalidPath() throws Exception { final String[] invalidSchemaUris = { "", ":", @@ -44,14 +40,13 @@ public class Rfc5724UriTest { for (String uri : invalidSchemaUris) { try { new Rfc5724Uri(uri); - throw new AssertionFailedError("URISyntaxException should be thrown"); - } catch (URISyntaxException e) { - // success - } + Log.e(TAG, "uri " + uri + " should have failed path check"); + assertTrue(false); + } catch (URISyntaxException e) { } } } - @Test public void testGetSchema() throws Exception { + public void testGetSchema() throws Exception { final String[][] uriTestPairs = { {"sms:+15555555555", "sms"}, {"sMs:+15555555555", "sMs"}, @@ -62,14 +57,15 @@ public class Rfc5724UriTest { for (String[] uriTestPair : uriTestPairs) { final Rfc5724Uri testUri = new Rfc5724Uri(uriTestPair[0]); + Log.d(TAG, testUri.getSchema() + " ?= " + uriTestPair[1]); assertTrue(testUri.getSchema().equals(uriTestPair[1])); } } - @Test public void testGetPath() throws Exception { + public void testGetPath() throws Exception { final String[][] uriTestPairs = { {"sms:+15555555555", "+15555555555"}, - {"sms:%2B555555555", "%2B555555555"}, + {"sms:%2B49555555555", "%2B555555555"}, {"smsto:+15555555555?", "+15555555555"}, {"mms:+15555555555?a=b", "+15555555555"}, {"mmsto:+15555555555?a=b&c=d", "+15555555555"}, @@ -81,11 +77,12 @@ public class Rfc5724UriTest { for (String[] uriTestPair : uriTestPairs) { final Rfc5724Uri testUri = new Rfc5724Uri(uriTestPair[0]); + Log.d(TAG, testUri.getPath() + " ?= " + uriTestPair[1]); assertTrue(testUri.getPath().equals(uriTestPair[1])); } } - @Test public void testGetQueryParams() throws Exception { + public void testGetQueryParams() throws Exception { final String[][] uriTestPairs = { {"sms:+15555555555", "a", null}, {"mms:+15555555555?b=", "a", null}, @@ -106,4 +103,5 @@ public class Rfc5724UriTest { else assertTrue(paramResult.equals(uriTestPair[2])); } } + }