From 593d907e3a4d8286c15d0d261256c524930c1d7d Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 7 Oct 2016 14:30:13 +0200 Subject: [PATCH] Improve tests --- .../at/bitfire/davdroid/ArrayUtilsTest.java | 11 ++++++----- .../at/bitfire/davdroid/HttpClientTest.java | 15 +++++++++++---- .../java/at/bitfire/davdroid/TestDavUtils.java | 11 ++++++----- cert4android | 2 +- dav4android | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- run-tests-connected.sh | 2 -- run-tests.sh | 18 ++++++++++++++++++ vcard4android | 2 +- 9 files changed, 45 insertions(+), 20 deletions(-) delete mode 100755 run-tests-connected.sh create mode 100755 run-tests.sh diff --git a/app/src/test/java/at/bitfire/davdroid/ArrayUtilsTest.java b/app/src/test/java/at/bitfire/davdroid/ArrayUtilsTest.java index b301dc9f..f2bf026d 100644 --- a/app/src/test/java/at/bitfire/davdroid/ArrayUtilsTest.java +++ b/app/src/test/java/at/bitfire/davdroid/ArrayUtilsTest.java @@ -7,33 +7,34 @@ */ package at.bitfire.davdroid; -import org.junit.Assert; import org.junit.Test; import java.util.Arrays; +import static org.junit.Assert.assertTrue; + public class ArrayUtilsTest { @Test public void testPartition() { // n == 0 - Assert.assertTrue(Arrays.deepEquals( + assertTrue(Arrays.deepEquals( new Long[0][0], ArrayUtils.partition(new Long[] {}, 5))); // n < max - Assert.assertTrue(Arrays.deepEquals( + assertTrue(Arrays.deepEquals( new Long[][] { { 1l, 2l } }, ArrayUtils.partition(new Long[] { 1l, 2l }, 5))); // n == max - Assert.assertTrue(Arrays.deepEquals( + assertTrue(Arrays.deepEquals( new Long[][] { { 1l, 2l }, { 3l, 4l } }, ArrayUtils.partition(new Long[] { 1l, 2l, 3l, 4l }, 2))); // n > max - Assert.assertTrue(Arrays.deepEquals( + assertTrue(Arrays.deepEquals( new Long[][] { { 1l, 2l, 3l, 4l, 5l }, { 6l, 7l, 8l, 9l, 10l }, { 11l } }, ArrayUtils.partition(new Long[] { 1l, 2l, 3l, 4l, 5l, 6l, 7l, 8l, 9l, 10l, 11l }, 5))); } diff --git a/app/src/test/java/at/bitfire/davdroid/HttpClientTest.java b/app/src/test/java/at/bitfire/davdroid/HttpClientTest.java index 1291320a..587fb7f0 100644 --- a/app/src/test/java/at/bitfire/davdroid/HttpClientTest.java +++ b/app/src/test/java/at/bitfire/davdroid/HttpClientTest.java @@ -8,7 +8,9 @@ package at.bitfire.davdroid; -import junit.framework.TestCase; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import java.io.IOException; import java.net.URISyntaxException; @@ -19,12 +21,15 @@ import okhttp3.Request; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; -public class HttpClientTest extends TestCase { +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +public class HttpClientTest { MockWebServer server; OkHttpClient httpClient; - @Override + @Before public void setUp() throws IOException { httpClient = HttpClient.create(null); @@ -32,11 +37,13 @@ public class HttpClientTest extends TestCase { server.start(30000); } - @Override + @After public void tearDown() throws IOException { server.shutdown(); } + + @Test public void testCookies() throws IOException, InterruptedException, URISyntaxException { HttpUrl url = server.url("/test"); diff --git a/app/src/test/java/at/bitfire/davdroid/TestDavUtils.java b/app/src/test/java/at/bitfire/davdroid/TestDavUtils.java index 41c38ea0..8a1d6266 100644 --- a/app/src/test/java/at/bitfire/davdroid/TestDavUtils.java +++ b/app/src/test/java/at/bitfire/davdroid/TestDavUtils.java @@ -8,19 +8,20 @@ package at.bitfire.davdroid; -import org.junit.Assert; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class TestDavUtils { private static final String exampleURL = "http://example.com/"; @Test public void testLastSegmentOfUrl() { - Assert.assertEquals("/", DavUtils.lastSegmentOfUrl(exampleURL)); - Assert.assertEquals("dir", DavUtils.lastSegmentOfUrl(exampleURL + "dir")); - Assert.assertEquals("dir", DavUtils.lastSegmentOfUrl(exampleURL + "dir/")); - Assert.assertEquals("file.html", DavUtils.lastSegmentOfUrl(exampleURL + "dir/file.html")); + assertEquals("/", DavUtils.lastSegmentOfUrl(exampleURL)); + assertEquals("dir", DavUtils.lastSegmentOfUrl(exampleURL + "dir")); + assertEquals("dir", DavUtils.lastSegmentOfUrl(exampleURL + "dir/")); + assertEquals("file.html", DavUtils.lastSegmentOfUrl(exampleURL + "dir/file.html")); } } diff --git a/cert4android b/cert4android index d5fae5d6..489056f7 160000 --- a/cert4android +++ b/cert4android @@ -1 +1 @@ -Subproject commit d5fae5d695edbaba9da230679a8313e238f34bf4 +Subproject commit 489056f740ba8d7ccddaa99d29162e11651116bb diff --git a/dav4android b/dav4android index 05065af8..4e550cdc 160000 --- a/dav4android +++ b/dav4android @@ -1 +1 @@ -Subproject commit 05065af8ef4a73f831b51bc7766af885cc4735d3 +Subproject commit 4e550cdcda7c2b3c969d20f1a99770deafafd6e8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3bdc1f0f..ead776a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip diff --git a/run-tests-connected.sh b/run-tests-connected.sh deleted file mode 100755 index 1e6b62b3..00000000 --- a/run-tests-connected.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -./gradlew -i check mergeAndroidReports --continue diff --git a/run-tests.sh b/run-tests.sh new file mode 100755 index 00000000..511c5926 --- /dev/null +++ b/run-tests.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +./gradlew -i --continue check mergeAndroidReports + +echo +echo View lint report: +echo -n file:// +realpath app/build/outputs/lint-results-gplayDebug.html + +echo +echo View local unit test reports: +echo -n file:// +realpath app/build/reports/tests/testStandardReleaseUnitTest/standardRelease/index.html + +echo +echo "View merged Android test reports (debug):" +echo -n file:// +realpath build/reports/androidTests/index.html diff --git a/vcard4android b/vcard4android index 95a27610..788eedf4 160000 --- a/vcard4android +++ b/vcard4android @@ -1 +1 @@ -Subproject commit 95a2761006f1c605ee277fa36b0d1aaa083c86bc +Subproject commit 788eedf46672b6266fabe65e42cf07e0396627bf