Skip to content

Commit fe2a6a6

Browse files
author
TanyaEf
committed
Resolving conflicts
2 parents 65c257c + 789d1a1 commit fe2a6a6

File tree

9 files changed

+145
-69
lines changed

9 files changed

+145
-69
lines changed

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesTypeResolverUtil.java‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,50 +42,58 @@
4242
import com.jaspersoft.jasperserver.dto.resources.ClientSemanticLayerDataSource;
4343
import com.jaspersoft.jasperserver.dto.resources.ClientVirtualDataSource;
4444
import com.jaspersoft.jasperserver.dto.resources.ClientXmlaConnection;
45-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ResourceMediaType;
45+
import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
4646
import com.jaspersoft.jasperserver.jaxrs.client.dto.resources.ClientDashboard;
4747
import com.jaspersoft.jasperserver.jaxrs.client.dto.resources.ClientDomainTopic;
48-
4948
import java.util.HashMap;
5049
import java.util.Map;
5150

5251
public class ResourcesTypeResolverUtil {
5352

5453
private static final Map<Class<? extends ClientResource>, String> classToMimeMap;
5554
private static final Map<String, Class<? extends ClientResource>> mimeToClassMap;
55+
public static final String RESOURCE_MEDIA_TYPE_PREFIX = "application/repository.";
56+
public static final String RESOURCE_MIME_TYPE = "+{mime}";
5657

5758
static {
5859
classToMimeMap = new HashMap<Class<? extends ClientResource>, String>() {{
59-
put(ClientAdhocDataView.class, ResourceMediaType.ADHOC_DATA_VIEW_MIME);
60-
put(ClientAwsDataSource.class, ResourceMediaType.AWS_DATA_SOURCE_MIME);
61-
put(ClientBeanDataSource.class, ResourceMediaType.BEAN_DATA_SOURCE_MIME);
62-
put(ClientCustomDataSource.class, ResourceMediaType.CUSTOM_DATA_SOURCE_MIME);
63-
put(ClientDataType.class, ResourceMediaType.DATA_TYPE_MIME);
64-
put(ClientFile.class, ResourceMediaType.FILE_MIME);
65-
put(ClientFolder.class, ResourceMediaType.FOLDER_MIME);
66-
put(ClientInputControl.class, ResourceMediaType.INPUT_CONTROL_MIME);
67-
put(ClientJdbcDataSource.class, ResourceMediaType.JDBC_DATA_SOURCE_MIME);
68-
put(ClientJndiJdbcDataSource.class, ResourceMediaType.JNDI_JDBC_DATA_SOURCE_MIME);
69-
put(ClientListOfValues.class, ResourceMediaType.LIST_OF_VALUES_MIME);
70-
put(ClientMondrianConnection.class, ResourceMediaType.MONDRIAN_CONNECTION_MIME);
71-
put(ClientMondrianXmlaDefinition.class, ResourceMediaType.MONDRIAN_XMLA_DEFINITION_MIME);
72-
put(ClientOlapUnit.class, ResourceMediaType.OLAP_UNIT_MIME);
73-
put(ClientQuery.class, ResourceMediaType.QUERY_MIME);
74-
put(ClientReportUnit.class, ResourceMediaType.REPORT_UNIT_MIME);
75-
put(ClientSecureMondrianConnection.class, ResourceMediaType.SECURE_MONDRIAN_CONNECTION_MIME);
76-
put(ClientSemanticLayerDataSource.class, ResourceMediaType.SEMANTIC_LAYER_DATA_SOURCE_MIME);
77-
put(ClientVirtualDataSource.class, ResourceMediaType.VIRTUAL_DATA_SOURCE_MIME);
78-
put(ClientXmlaConnection.class, ResourceMediaType.XMLA_CONNECTION_MIME);
79-
put(ClientResourceLookup.class, ResourceMediaType.RESOURCE_LOOKUP_MIME);
80-
put(ClientDashboard.class, ResourceMediaType.DASHBOARD_MIME);
81-
put(ClientDomainTopic.class, ResourceMediaType.DOMAIN_TOPIC_MIME);
60+
put(ClientAdhocDataView.class, ResourceMediaType.ADHOC_DATA_VIEW_CLIENT_TYPE);
61+
put(ClientAwsDataSource.class, ResourceMediaType.AWS_DATA_SOURCE_CLIENT_TYPE);
62+
put(ClientBeanDataSource.class, ResourceMediaType.BEAN_DATA_SOURCE_CLIENT_TYPE);
63+
put(ClientCustomDataSource.class, ResourceMediaType.CUSTOM_DATA_SOURCE_CLIENT_TYPE);
64+
put(ClientDataType.class, ResourceMediaType.DATA_TYPE_CLIENT_TYPE);
65+
put(ClientFile.class, ResourceMediaType.FILE_CLIENT_TYPE);
66+
put(ClientFolder.class, ResourceMediaType.FOLDER_CLIENT_TYPE);
67+
put(ClientInputControl.class, ResourceMediaType.INPUT_CONTROL_CLIENT_TYPE);
68+
put(ClientJdbcDataSource.class, ResourceMediaType.JDBC_DATA_SOURCE_CLIENT_TYPE);
69+
put(ClientJndiJdbcDataSource.class, ResourceMediaType.JNDI_JDBC_DATA_SOURCE_CLIENT_TYPE);
70+
put(ClientListOfValues.class, ResourceMediaType.LIST_OF_VALUES_CLIENT_TYPE);
71+
put(ClientMondrianConnection.class, ResourceMediaType.MONDRIAN_CONNECTION_CLIENT_TYPE);
72+
put(ClientMondrianXmlaDefinition.class, ResourceMediaType.MONDRIAN_XMLA_DEFINITION_CLIENT_TYPE);
73+
put(ClientOlapUnit.class, ResourceMediaType.OLAP_UNIT_CLIENT_TYPE);
74+
put(ClientQuery.class, ResourceMediaType.QUERY_CLIENT_TYPE);
75+
put(ClientReportUnit.class, ResourceMediaType.REPORT_UNIT_CLIENT_TYPE);
76+
put(ClientSecureMondrianConnection.class, ResourceMediaType.SECURE_MONDRIAN_CONNECTION_CLIENT_TYPE);
77+
put(ClientSemanticLayerDataSource.class, ResourceMediaType.SEMANTIC_LAYER_DATA_SOURCE_CLIENT_TYPE);
78+
put(ClientVirtualDataSource.class, ResourceMediaType.VIRTUAL_DATA_SOURCE_CLIENT_TYPE);
79+
put(ClientXmlaConnection.class, ResourceMediaType.XMLA_CONNECTION_CLIENT_TYPE);
80+
put(ClientResourceLookup.class, ResourceMediaType.RESOURCE_LOOKUP_CLIENT_TYPE);
81+
put(ClientDashboard.class, ResourceMediaType.DASHBOARD_CLIENT_TYPE);
82+
put(ClientDomainTopic.class, ResourceMediaType.DOMAIN_TOPIC_CLIENT_TYPE);
8283
}};
8384

85+
for (Map.Entry<Class<? extends ClientResource>, String> entry : classToMimeMap.entrySet()) {
86+
entry.setValue(typeToMime(entry.getValue()));
87+
}
88+
8489
mimeToClassMap = new HashMap<String, Class<? extends ClientResource>>();
8590
for (Map.Entry<Class<? extends ClientResource>, String> entry : classToMimeMap.entrySet()) {
8691
mimeToClassMap.put(entry.getValue(), entry.getKey());
8792
}
8893
}
94+
private static String typeToMime(String type) {
95+
return RESOURCE_MEDIA_TYPE_PREFIX + type + RESOURCE_MIME_TYPE;
96+
}
8997

9098
public static String getMimeType(Class<? extends ClientResource> clazz) {
9199
return classToMimeMap.get(clazz);

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/JasperserverRestClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package com.jaspersoft.jasperserver.jaxrs.client.core;
2222

2323
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.AuthenticationType;
24-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ResponseStatus;
24+
import javax.ws.rs.core.Response.Status;
2525
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
2626
import com.jaspersoft.jasperserver.jaxrs.client.filters.BasicAuthenticationFilter;
2727
import com.jaspersoft.jasperserver.jaxrs.client.filters.SessionOutputFilter;
@@ -73,7 +73,7 @@ protected void login(SessionStorage storage) {
7373
String sessionId = null;
7474
String location = response.getLocation().toString();
7575

76-
if (response.getStatus() == ResponseStatus.FOUND && !location.matches("[^?]+\\?([^&]*&)*error=1(&[^&]*)*$")) {
76+
if (response.getStatus() == Status.FOUND.getStatusCode() && !location.matches("[^?]+\\?([^&]*&)*error=1(&[^&]*)*$")) {
7777
sessionId = response.getCookies().get("JSESSIONID").getValue();
7878
storage.setSessionId(sessionId);
7979
} else {

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/MimeTypeUtil.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121

2222
package com.jaspersoft.jasperserver.jaxrs.client.core;
2323

24+
import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
2425
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
2526

2627
public class MimeTypeUtil {
2728

28-
private static final String JSON_SUFFIX = "json";
29-
private static final String XML_SUFFIX = "xml";
3029

3130
public static String toCorrectContentMime(RestClientConfiguration configuration, String srcMime) {
32-
if (srcMime.endsWith("+{mime}")) {
33-
return srcMime.replace("{mime}", configuration.getContentMimeType() == MimeType.JSON ? JSON_SUFFIX : XML_SUFFIX);
34-
}
35-
return srcMime;
31+
return replaceMime(configuration.getContentMimeType(), srcMime);
3632
}
3733

3834
public static String toCorrectAcceptMime(RestClientConfiguration configuration, String srcMime) {
35+
return replaceMime(configuration.getAcceptMimeType(), srcMime);
36+
}
37+
38+
private static String replaceMime(MimeType configMimeType, String srcMime) {
3939
if (srcMime.endsWith("+{mime}")) {
40-
return srcMime.replace("{mime}", configuration.getAcceptMimeType() == MimeType.JSON ? JSON_SUFFIX : XML_SUFFIX);
40+
return srcMime.replace("+{mime}", configMimeType == MimeType.JSON ? ResourceMediaType.RESOURCE_JSON_TYPE : ResourceMediaType.RESOURCE_XML_TYPE);
4141
}
4242
return srcMime;
4343
}

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ResourceMediaType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.Arrays;
2525
import java.util.List;
2626

27-
27+
@Deprecated
2828
public interface ResourceMediaType {
2929
public static final String RESOURCE_MEDIA_TYPE_PREFIX = "application/repository.";
3030
public static final String RESOURCE_MIME_TYPE = "+{mime}";

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/enums/ResponseStatus.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
package com.jaspersoft.jasperserver.jaxrs.client.core.enums;
2323

24+
@Deprecated
2425
public final class ResponseStatus {
2526

2627
/**

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/exceptions/handling/DefaultErrorHandler.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
package com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling;
2323

24-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ResponseStatus;
24+
import javax.ws.rs.core.Response.Status;
2525
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.AccessDeniedException;
2626
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.AuthenticationFailedException;
2727
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.BadRequestException;
@@ -46,17 +46,17 @@ public class DefaultErrorHandler implements ErrorHandler {
4646

4747
// private static final Log log = LogFactory.getLog(DefaultErrorHandler.class);
4848

49-
protected static final Map<Integer, Class<? extends JSClientWebException>> httpErrorCodeToTypeMap =
50-
new HashMap<Integer, Class<? extends JSClientWebException>>() {{
51-
put(ResponseStatus.BAD_REQUEST, BadRequestException.class);
52-
put(ResponseStatus.FORBIDDEN, AccessDeniedException.class);
53-
put(ResponseStatus.NOT_ALLOWED, HttpMethodNotAllowedException.class);
54-
put(ResponseStatus.SERVER_ERROR, InternalServerErrorException.class);
55-
put(ResponseStatus.NOT_ACCEPTABLE, RequestedRepresentationNotAvailableForResourceException.class);
56-
put(ResponseStatus.NOT_FOUND, ResourceNotFoundException.class);
57-
put(ResponseStatus.UNAUTHORIZED, AuthenticationFailedException.class);
58-
put(ResponseStatus.CONFLICT, ConflictException.class);
59-
put(ResponseStatus.UNSUPPORTED_TYPE, RepresentationalTypeNotSupportedForResourceException.class);
49+
protected static final Map<Response.Status, Class<? extends JSClientWebException>> httpErrorCodeToTypeMap =
50+
new HashMap<Response.Status, Class<? extends JSClientWebException>>() {{
51+
put(Status.BAD_REQUEST, BadRequestException.class);
52+
put(Status.FORBIDDEN, AccessDeniedException.class);
53+
put(Status.NOT_ACCEPTABLE, HttpMethodNotAllowedException.class);
54+
put(Status.INTERNAL_SERVER_ERROR, InternalServerErrorException.class);
55+
put(Status.NOT_ACCEPTABLE, RequestedRepresentationNotAvailableForResourceException.class);
56+
put(Status.NOT_FOUND, ResourceNotFoundException.class);
57+
put(Status.UNAUTHORIZED, AuthenticationFailedException.class);
58+
put(Status.CONFLICT, ConflictException.class);
59+
put(Status.UNSUPPORTED_MEDIA_TYPE, RepresentationalTypeNotSupportedForResourceException.class);
6060
}};
6161

6262
@Override
@@ -104,7 +104,7 @@ protected void handleBodyError(Response response) {
104104
}
105105

106106
protected void handleStatusCodeError(Response response, String overridingMessage) {
107-
Class<? extends JSClientWebException> exceptionType = httpErrorCodeToTypeMap.get(response.getStatus());
107+
Class<? extends JSClientWebException> exceptionType = httpErrorCodeToTypeMap.get(Response.Status.fromStatusCode(response.getStatus()));
108108
String reasonPhrase = response.getStatusInfo().getReasonPhrase();
109109
JSClientWebException exception = new JSClientWebException(overridingMessage != null ? overridingMessage : reasonPhrase);
110110
try {

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/resources/ClientDashboard.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package com.jaspersoft.jasperserver.jaxrs.client.dto.resources;
2222

2323
import com.jaspersoft.jasperserver.dto.resources.ClientResource;
24-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ResourceMediaType;
24+
import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
2525

2626
import javax.xml.bind.annotation.XmlRootElement;
2727

‎src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/resources/ClientDomainTopic.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package com.jaspersoft.jasperserver.jaxrs.client.dto.resources;
2222

2323
import com.jaspersoft.jasperserver.dto.resources.AbstractClientReportUnit;
24-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.ResourceMediaType;
24+
import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
2525

2626
import javax.xml.bind.annotation.XmlRootElement;
2727

‎src/test/java/com/jaspersoft/jasperserver/jaxrs/client/core/SessionStorageTest.java‎

Lines changed: 86 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.core;//package com.jaspersoft.jasperserver.jaxrs.client.core;
22

3-
import org.mockito.Mock;
4-
import org.mockito.internal.util.reflection.Whitebox;
5-
import org.powermock.api.mockito.PowerMockito;
6-
import org.powermock.core.classloader.annotations.PrepareForTest;
7-
import org.powermock.modules.testng.PowerMockTestCase;
8-
import org.testng.annotations.AfterMethod;
9-
import org.testng.annotations.BeforeMethod;
10-
import org.testng.annotations.Test;
11-
3+
import java.security.SecureRandom;
4+
import java.security.cert.CertificateException;
5+
import java.security.cert.X509Certificate;
6+
import java.util.HashMap;
127
import javax.net.ssl.SSLContext;
138
import javax.net.ssl.TrustManager;
149
import javax.net.ssl.X509TrustManager;
1510
import javax.ws.rs.client.Client;
1611
import javax.ws.rs.client.ClientBuilder;
12+
import javax.ws.rs.client.Entity;
1713
import javax.ws.rs.client.Invocation;
1814
import javax.ws.rs.client.WebTarget;
15+
import javax.ws.rs.core.Cookie;
16+
import javax.ws.rs.core.NewCookie;
1917
import javax.ws.rs.core.Response;
20-
import java.security.SecureRandom;
21-
import java.security.cert.CertificateException;
22-
import java.security.cert.X509Certificate;
18+
import org.mockito.Mock;
19+
import org.mockito.Mockito;
20+
import org.mockito.internal.util.reflection.Whitebox;
21+
import org.powermock.api.mockito.PowerMockito;
22+
import org.powermock.core.classloader.annotations.PrepareForTest;
23+
import org.powermock.modules.testng.PowerMockTestCase;
24+
import org.testng.annotations.AfterMethod;
25+
import org.testng.annotations.BeforeMethod;
26+
import org.testng.annotations.Test;
2327

28+
import static org.mockito.Matchers.any;
29+
import static org.mockito.Matchers.anyString;
30+
import static org.mockito.Matchers.eq;
2431
import static org.mockito.Mockito.doReturn;
2532
import static org.mockito.Mockito.reset;
2633
import static org.mockito.MockitoAnnotations.initMocks;
@@ -49,6 +56,12 @@ public class SessionStorageTest extends PowerMockTestCase {
4956
private Invocation.Builder invocationBuilderMock;
5057
@Mock
5158
private Response responseMock;
59+
@Mock
60+
public Response.StatusType statusTypeMock;
61+
62+
@Mock
63+
public SSLContext sslContextMock;
64+
5265

5366
@BeforeMethod
5467
public void before() {
@@ -67,6 +80,58 @@ public void should_create_new_instance_session_storage() throws Exception {
6780
assertNotNull(sessionStorage);
6881
}
6982

83+
@Test(enabled = true)
84+
public void should_init_ssl() {
85+
86+
/** - mock for static method **/
87+
PowerMockito.mockStatic(ClientBuilder.class);
88+
Mockito.when(ClientBuilder.newBuilder()).thenReturn(builderMock);
89+
90+
/** - mocks for {@link SessionStorage#init()} method (no SSL) **/
91+
Mockito.doReturn("https://54.83.98.156/jasperserver-pro").when(configurationMock).getJasperReportsServerUrl();
92+
Mockito.doReturn(10000).when(configurationMock).getConnectionTimeout();
93+
Mockito.doReturn(8000).when(configurationMock).getReadTimeout();
94+
Mockito.doReturn(clientMock).when(builderMock).build();
95+
Mockito.doReturn(targetMock).when(clientMock).target("http://54.83.98.156/jasperserver-pro");
96+
97+
/** - mocks for {@link SessionStorage#getSecurityAttributes()} method (no SSL) **/
98+
Mockito.doReturn("Alex").when(credentialsMock).getUsername();
99+
Mockito.doReturn("oh, yeah!").when(credentialsMock).getPassword();
100+
101+
PowerMockito.mockStatic(EncryptionUtils.class);
102+
PowerMockito.when(EncryptionUtils.parseEncryptionParams(responseMock)).thenReturn(null);
103+
PowerMockito.when(EncryptionUtils.encryptPassword("oh, yeah!", "n_", "e_")).thenReturn("encryptPassword");
104+
105+
Mockito.doReturn(targetMock).when(targetMock).path(anyString());
106+
Mockito.doReturn(invocationBuilderMock).when(targetMock).request();
107+
Mockito.doReturn(responseMock).when(invocationBuilderMock).get();
108+
Mockito.doReturn(new HashMap<String, NewCookie>() {{
109+
put("JSESSIONID", new NewCookie(new Cookie("JSESSIONID", "AC0C233ED7E9BE5DD0D4A286E6C8BBAE")));
110+
}}).when(responseMock).getCookies();
111+
112+
/** - mocks for {@link SessionStorage#login()} method **/
113+
Mockito.doReturn(targetMock).when(targetMock).path(anyString());
114+
Mockito.doReturn(targetMock).when(targetMock).property(anyString(), eq(Boolean.FALSE));
115+
Mockito.doReturn(invocationBuilderMock).when(targetMock).request();
116+
Mockito.doReturn(invocationBuilderMock).when(invocationBuilderMock)
117+
.cookie("JSESSIONID", "AC0C233ED7E9BE5DD0D4A286E6C8BBAE");
118+
Mockito.doReturn(responseMock).when(invocationBuilderMock).post(any(Entity.class));
119+
120+
/** - mocks for {@link SessionStorage#parseSessionId()} method **/
121+
Mockito.doReturn("JSESSIONID=AC0C233ED7E9BE5DD0D4A286E6C8BBAE;")
122+
.when(responseMock)
123+
.getHeaderString("Set-Cookie");
124+
Mockito.doReturn(302).when(responseMock).getStatus();
125+
126+
127+
try {
128+
new SessionStorage(configurationMock, credentialsMock);
129+
} catch (Exception e) {
130+
//Mockito.verify(logMock, times(1)).error(anyString(), any(NoSuchAlgorithmException.class));
131+
assertNotNull(e);
132+
}
133+
}
134+
70135
@Test(expectedExceptions = RuntimeException.class)
71136
public void should_throw_an_exception_when_unable_to_init_SSL_context() throws Exception {
72137

@@ -109,15 +174,17 @@ public void should_set_and_get_state_for_object() {
109174
// Given
110175
PowerMockito.suppress(method(SessionStorage.class, "init"));
111176
doReturn("http").when(configurationMock).getJasperReportsServerUrl();
112-
SessionStorage sessionStorageSpy = PowerMockito.spy(new SessionStorage(configurationMock, credentialsMock));
177+
178+
SessionStorage sessionStorage = new SessionStorage(configurationMock, credentialsMock);
179+
113180
// When
114-
Whitebox.setInternalState(sessionStorageSpy, "rootTarget", targetMock);
115-
Whitebox.setInternalState(sessionStorageSpy, "sessionId", "sessionId");
181+
Whitebox.setInternalState(sessionStorage, "rootTarget", targetMock);
182+
Whitebox.setInternalState(sessionStorage, "sessionId", "sessionId");
116183
// Then
117-
assertNotNull(sessionStorageSpy.getConfiguration());
118-
assertNotNull(sessionStorageSpy.getCredentials());
119-
assertNotNull(sessionStorageSpy.getRootTarget());
120-
assertNotNull(sessionStorageSpy.getSessionId());
184+
assertNotNull(sessionStorage.getConfiguration());
185+
assertNotNull(sessionStorage.getCredentials());
186+
assertNotNull(sessionStorage.getRootTarget());
187+
assertNotNull(sessionStorage.getSessionId());
121188
}
122189

123190
@AfterMethod

0 commit comments

Comments
 (0)