Resolving conflicts

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/RestClientConfiguration.java

@@ -180,7 +180,7 @@ public static RestClientConfiguration loadConfiguration(String path) {
 
         String readTimeout = properties.getProperty("readTimeout");
         if (readTimeout != null && !readTimeout.equals(""))
-            configuration.setConnectionTimeout(Integer.valueOf(readTimeout));
+            configuration.setReadTimeout(Integer.valueOf(readTimeout));
 
         try {
             configuration.setContentMimeType(MimeType.valueOf(properties.getProperty("contentMimeType")));

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

@@ -0,0 +1,71 @@
+package com.jaspersoft.jasperserver.jaxrs.client.core;
+
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.bundles.BundlesService;
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.serverInfo.ServerInfoService;
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings.SettingsService;
+import org.mockito.Mock;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static org.mockito.MockitoAnnotations.initMocks;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertSame;
+
+
+/**
+ * Unit tests for {@link com.jaspersoft.jasperserver.jaxrs.client.core.Session}
+ */
+public class AnonymousSessionTest {
+    @Mock
+    public SessionStorage storageMock;
+
+    @BeforeMethod
+    public void before() {
+        initMocks(this);
+    }
+
+    @Test(expectedExceptions = RuntimeException.class)
+    public void should_throw_exception_when_cannot_instantiate_service_class() {
+        AnonymousSession anonymousSession = new AnonymousSession(storageMock);
+        class CustomAdapter extends AbstractAdapter {
+            public CustomAdapter(SessionStorage sessionStorage) {
+                super(sessionStorage);
+            }
+        }
+        anonymousSession.getService(CustomAdapter.class);
+    }
+
+    @Test
+    public void should_return_proper_storage() {
+        AnonymousSession anonymousSession = new AnonymousSession(storageMock);
+        assertSame(anonymousSession.getStorage(), storageMock);
+    }
+
+    @Test
+    public void should_return_not_null_ServerInfoService() {
+        AnonymousSession anonymousSession = new AnonymousSession(storageMock);
+        ServerInfoService retrieved = anonymousSession.serverInfoService();
+        assertNotNull(retrieved);
+    }
+
+    @Test
+    public void should_return_not_null_settingsService() {
+        AnonymousSession anonymousSession = new AnonymousSession(storageMock);
+        SettingsService retrieved = anonymousSession.settingsService();
+        assertNotNull(retrieved);
+    }
+
+    @Test
+    public void should_return_not_null_bundlesService() {
+        AnonymousSession anonymousSession = new AnonymousSession(storageMock);
+        BundlesService retrieved = anonymousSession.bundlesService();
+        assertNotNull(retrieved);
+    }
+
+    @AfterMethod
+    public void after() {
+        storageMock = null;
+    }
+}

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

@@ -63,14 +63,52 @@ public void should_throw_an_exception_when_pass_null_param_to_the_constructor()
         new JasperserverRestClient(null);
     }
 
+    @Test(testName = "JasperserverRestClient_authenticate")
+    public void should_return_null_when_username_is_null() {
+        // Given
+        JasperserverRestClient jasperserverRestClient = new JasperserverRestClient(configurationMock);
+        // When
+        Session session = jasperserverRestClient.authenticate(null, PASSWORD);
+        // Then
+        assertEquals(session, null);
+    }
+    @Test(testName = "JasperserverRestClient_authenticate")
+    public void should_return_null_when_username_is_empty() {
+        // Given
+        JasperserverRestClient jasperserverRestClient = new JasperserverRestClient(configurationMock);
+        // When
+        Session session = jasperserverRestClient.authenticate("", PASSWORD);
+        // Then
+        assertEquals(session, null);
+    }
+
+    @Test(testName = "JasperserverRestClient_authenticate")
+    public void should_return_null_when_password_is_null() {
+        // Given
+        JasperserverRestClient jasperserverRestClient = new JasperserverRestClient(configurationMock);
+        // When
+        Session session = jasperserverRestClient.authenticate(USER_NAME, null);
+        // Then
+        assertEquals(session, null);
+    }
+    @Test(testName = "JasperserverRestClient_authenticate")
+    public void should_return_null_when_password_is_empty() {
+        // Given
+        JasperserverRestClient jasperserverRestClient = new JasperserverRestClient(configurationMock);
+        // When
+        Session session = jasperserverRestClient.authenticate(USER_NAME, "");
+        // Then
+        assertEquals(session, null);
+    }
+
+
     @Test
     public void should_return_proper_Session_object() throws Exception {
 
         // Given
         final JasperserverRestClient client = new JasperserverRestClient(configurationMock);
         final JasperserverRestClient spyClient = spy(client);
 
-
         whenNew(AuthenticationCredentials.class)
                 .withArguments(USER_NAME, PASSWORD)
                 .thenReturn(credentialsMock);