Skip to content
Snippets Groups Projects
Commit 595474b9 authored by Adam Laskowski's avatar Adam Laskowski
Browse files

SSDM-13251: Added forgotten change to dss java client. Removed debug prints from tests

parent bf9caed6
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -276,7 +276,9 @@ public final class AfsClient implements PublicAPI ...@@ -276,7 +276,9 @@ public final class AfsClient implements PublicAPI
} }
} else if (statusCode >= 400 && statusCode < 500) } else if (statusCode >= 400 && statusCode < 500)
{ {
throw ClientExceptions.CLIENT_ERROR.getInstance(statusCode); // jsonObjectMapper can't deserialize immutable lists sent in the error message.
String res = new String(httpResponse.body(), StandardCharsets.UTF_8);
throw ClientExceptions.API_ERROR.getInstance(res);
} else if (statusCode >= 500 && statusCode < 600) } else if (statusCode >= 500 && statusCode < 600)
{ {
throw ClientExceptions.SERVER_ERROR.getInstance(statusCode); throw ClientExceptions.SERVER_ERROR.getInstance(statusCode);
......
...@@ -91,7 +91,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest ...@@ -91,7 +91,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{ {
ThrowableReason reason = (ThrowableReason) e.getCause(); ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage(); String message = ((ExceptionReason) reason.getReason()).getMessage();
System.out.println(message);
assertTrue(message.matches( assertTrue(message.matches(
"(?s).*Session .* don't have rights \\[Read\\] over .*to perform the operation List(?s).*")); "(?s).*Session .* don't have rights \\[Read\\] over .*to perform the operation List(?s).*"));
} }
...@@ -111,7 +110,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest ...@@ -111,7 +110,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{ {
ThrowableReason reason = (ThrowableReason) e.getCause(); ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage(); String message = ((ExceptionReason) reason.getReason()).getMessage();
System.out.println(message);
assertTrue(message.matches("(?s).*Session .* doesn't exist(?s).*")); assertTrue(message.matches("(?s).*Session .* doesn't exist(?s).*"));
} }
} }
...@@ -131,7 +129,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest ...@@ -131,7 +129,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{ {
ThrowableReason reason = (ThrowableReason) e.getCause(); ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage(); String message = ((ExceptionReason) reason.getReason()).getMessage();
System.out.println(message);
assertTrue(message.matches( assertTrue(message.matches(
"(?s).*Session .* don't have rights \\[Write\\] over .* to perform the operation Write(?s).*")); "(?s).*Session .* don't have rights \\[Write\\] over .* to perform the operation Write(?s).*"));
} }
...@@ -155,7 +152,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest ...@@ -155,7 +152,6 @@ public class OpenBisAuthApiClientTest extends BaseApiClientTest
{ {
ThrowableReason reason = (ThrowableReason) e.getCause(); ThrowableReason reason = (ThrowableReason) e.getCause();
String message = ((ExceptionReason) reason.getReason()).getMessage(); String message = ((ExceptionReason) reason.getReason()).getMessage();
System.out.println(message);
assertTrue(message.matches( assertTrue(message.matches(
"(?s).*Session .* don't have rights \\[(Write|Read), (Write|Read)\\] over .* to perform the operation Move(?s).*")); "(?s).*Session .* don't have rights \\[(Write|Read), (Write|Read)\\] over .* to perform the operation Move(?s).*"));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment