Cleansing test code

Benky · Benky · commit fe02451713ef · 2016-01-20T11:09:53.000+01:00
Removed unnecessary imports and some unnecessary conditions.
diff --git a/src/test/java/com/gooddata/AbstractGoodDataAT.java b/src/test/java/com/gooddata/AbstractGoodDataAT.java
@@ -40,11 +40,9 @@ public static String getProperty(String name) {
 
     @AfterSuite
     public static void removeProjectAndLogout() {
-        if (gd != null) {
-            if (project != null) {
-                gd.getProjectService().removeProject(project);
-            }
-            gd.logout();
+        if (project != null) {
+            gd.getProjectService().removeProject(project);
         }
+        gd.logout();
     }
 }
diff --git a/src/test/java/com/gooddata/AbstractGoodDataIT.java b/src/test/java/com/gooddata/AbstractGoodDataIT.java
@@ -3,16 +3,12 @@
  */
 package com.gooddata;
 
-import com.gooddata.util.ResourceUtils;
 import org.apache.http.client.HttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 
-import java.io.InputStream;
-
-import static com.gooddata.util.Validate.notNull;
 import static net.jadler.Jadler.closeJadler;
 import static net.jadler.Jadler.initJadler;
 import static net.jadler.Jadler.port;
diff --git a/src/test/java/com/gooddata/JsonMatchers.java b/src/test/java/com/gooddata/JsonMatchers.java
@@ -1,8 +1,6 @@
 package com.gooddata;
 
-import net.javacrumbs.jsonunit.JsonAssert;
 import net.javacrumbs.jsonunit.core.Configuration;
-import net.javacrumbs.jsonunit.core.Option;
 import net.javacrumbs.jsonunit.core.internal.Diff;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.hamcrest.BaseMatcher;
diff --git a/src/test/java/com/gooddata/collections/UriPageTest.java b/src/test/java/com/gooddata/collections/UriPageTest.java
@@ -4,17 +4,12 @@
 import org.springframework.web.util.UriComponentsBuilder;
 import org.testng.annotations.Test;
 
-import java.util.Arrays;
-import java.util.Collections;
-
 import static java.util.Collections.singletonList;
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.springframework.web.util.UriComponentsBuilder.fromUriString;
-import static org.testng.Assert.fail;
 
 public class UriPageTest {
 
diff --git a/src/test/java/com/gooddata/dataload/processes/ScheduleTest.java b/src/test/java/com/gooddata/dataload/processes/ScheduleTest.java
@@ -1,7 +1,6 @@
 package com.gooddata.dataload.processes;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.hamcrest.collection.IsMapContaining;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.mockito.Matchers;
@@ -14,7 +13,6 @@
 import java.util.Collections;
 
 import static com.gooddata.JsonMatchers.serializesToJson;
-import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
diff --git a/src/test/java/com/gooddata/dataset/FailStatusTest.java b/src/test/java/com/gooddata/dataset/FailStatusTest.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
-import org.hamcrest.Matchers;
 import org.testng.annotations.Test;
 
 import java.io.InputStream;

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,9 @@ public static String getProperty(String name) {`
`40`	`40`
`41`	`41`	`@AfterSuite`
`42`	`42`	`public static void removeProjectAndLogout() {`
`43`		`- if (gd != null) {`
`44`		`- if (project != null) {`
`45`		`- gd.getProjectService().removeProject(project);`
`46`		`- }`
`47`		`- gd.logout();`
	`43`	`+ if (project != null) {`
	`44`	`+ gd.getProjectService().removeProject(project);`
`48`	`45`	`}`
	`46`	`+ gd.logout();`
`49`	`47`	`}`
`50`	`48`	`}`