1. Organized imports in JasperserverRestClientTest

 2. Polished SettingsServiceTest

Author: TanyaEf

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SettingsServiceTest.java

@@ -2,43 +2,20 @@
 
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
-import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
-import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.*;
-import org.mockito.Mock;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.GenericType;
-import java.util.List;
-import java.util.Map;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.MockitoAnnotations.initMocks;
-import static org.powermock.api.mockito.PowerMockito.verifyStatic;
+import static org.mockito.Mockito.mock;
 import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertSame;
 
 /**
  * @author Tetiana Iefimenko
  */
 @PrepareForTest({JerseyRequest.class})
 public class SettingsServiceTest extends PowerMockTestCase {
 
-    @Mock
-    private SessionStorage sessionStorageMock;
-    private SettingsService service;
-
-    @BeforeMethod
-    public void before() {
-        initMocks(this);
-        service = new SettingsService(sessionStorageMock);
-    }
+    private SettingsService service =  new SettingsService(mock(SessionStorage.class));
 
     @Test
     public void should_return_proper_settings_adapter() throws Exception {

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClientTest.java

@@ -1,22 +1,22 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
+import java.lang.reflect.Field;
 import org.mockito.Mock;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.lang.reflect.Field;
-
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.whenNew;
 import static org.powermock.api.support.membermodification.MemberMatcher.field;
 import static org.powermock.api.support.membermodification.MemberMatcher.method;
 import static org.powermock.api.support.membermodification.MemberModifier.suppress;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
 
 /**
  * Unit tests for {@link JasperserverRestClient}