Added some additional test diagnostics.

- Trying to catch the reason of intermittent test failures in entity filtering E2E tests.

Change-Id: I70711e225e7139e6b982d9e4d844c2acce789999
Signed-off-by: Marek Potociar <[email protected]>

Author: Marek Potociar

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/entity/filtering/FilteringMessageBodyProvider.java

@@ -102,10 +102,15 @@ public long getSize(final Object o, final Class<?> type, final Type genericType,
     public Object readFrom(final Class<Object> type, final Type genericType, final Annotation[] annotations,
                            final MediaType mediaType, final MultivaluedMap<String, String> httpHeaders,
                            final InputStream entityStream) throws IOException, WebApplicationException {
-        final ObjectGraph objectGraph = provider.get()
-                .getFilteringObject(FilteringHelper.getEntityClass(genericType), false, annotations);
+        try {
+            final ObjectGraph objectGraph = provider.get()
+                    .getFilteringObject(FilteringHelper.getEntityClass(genericType), false, annotations);
 
-        return objectGraphToString(objectGraph);
+            return objectGraphToString(objectGraph);
+        } catch (final Throwable t) {
+            LOGGER.log(Level.WARNING, "Error during reading an object graph.", t);
+            return "ERROR: " + t.getMessage();
+        }
     }
 
     @Override
@@ -117,12 +122,12 @@ public void writeTo(final Object o, final Class<?> type, final Type genericType,
 
         try {
             entityStream.write(objectGraphToString(objectGraph).getBytes());
-        } catch (final Throwable e) {
-            LOGGER.log(Level.WARNING, "Error during writing an object graph to string.", e);
+        } catch (final Throwable t) {
+            LOGGER.log(Level.WARNING, "Error during writing an object graph.", t);
         }
     }
 
-    private String objectGraphToString(final ObjectGraph objectGraph) {
+    private static String objectGraphToString(final ObjectGraph objectGraph) {
         final StringBuilder sb = new StringBuilder();
         for (final String field : objectGraphToFields("", objectGraph)) {
             if (!field.contains("Transient")) {
@@ -135,7 +140,7 @@ private String objectGraphToString(final ObjectGraph objectGraph) {
         return sb.toString();
     }
 
-    private List<String> objectGraphToFields(final String prefix, final ObjectGraph objectGraph) {
+    private static List<String> objectGraphToFields(final String prefix, final ObjectGraph objectGraph) {
         final List<String> fields = Lists.newArrayList();
 
         // Fields.