Update gradle and fix test

Author: rubengees

build.gradle

@@ -62,5 +62,5 @@ allprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.5'
+    gradleVersion = '4.0'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sun Apr 16 12:32:19 CEST 2017
+#Fri Jun 16 15:36:54 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,12 +1,12 @@
-apply plugin: 'idea'
-
 apply plugin: 'java-library'
 apply plugin: 'maven-publish'
 apply plugin: 'de.fuerstenau.buildconfig'
 
 apply plugin: "jacoco"
 apply plugin: "io.freefair.javadoc-links"
 
+apply plugin: 'idea'
+
 dependencies {
     api deps.jetbrainsAnnotations
 

library/build.gradle

@@ -36,8 +36,7 @@ public void testIOError() throws IOException {
         server.enqueue(new MockResponse().setBody(fromResource("news.json")).setResponseCode(404));
 
         assertThatExceptionOfType(ProxerException.class).isThrownBy(() -> api.notifications().news().build().execute())
-                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ErrorType.IO,
-                        "IO ErrorType"));
+                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ErrorType.IO, "IO ErrorType"));
     }
 
     @Test
@@ -58,26 +57,6 @@ public void testInvalidDataError() throws IOException {
                         "PARSING ErrorType"));
     }
 
-    @Test(timeout = 1000L)
-    public void testCancelledError() throws IOException, InterruptedException {
-        final CountDownLatch lock = new CountDownLatch(1);
-
-        server.enqueue(new MockResponse().setBody(fromResource("news.json")));
-
-        final ProxerCall<List<NewsArticle>> call = api.notifications().news().build();
-
-        call.enqueue(result -> {
-            // Failed. The lock will never be counted down and timeout.
-        }, exception -> {
-            assertThat(exception.getErrorType()).isEqualTo(ErrorType.CANCELLED);
-
-            lock.countDown();
-        });
-
-        call.cancel();
-        lock.await();
-    }
-
     @Test
     public void testServerError() throws Exception {
         server.enqueue(new MockResponse().setBody(fromResource("conferences_error.json")));
@@ -147,11 +126,9 @@ public void testCancel() throws IOException, InterruptedException {
         call.enqueue(result -> {
             // Failed. The lock will never be counted down and timeout.
         }, exception -> {
-            if (exception.getErrorType() == ErrorType.IO) {
-                lock.countDown();
-            }
+            assertThat(exception.getErrorType()).isEqualTo(ErrorType.CANCELLED);
 
-            // Failed: Not the exception we want. The lock will never be counted down and timeout.
+            lock.countDown();
         });
 
         call.cancel();