[java-driver#755] Fixing issue when skipped exception is treated as failed one.

Author: nikagra

driver-core/src/test/java/com/datastax/driver/core/TestListener.java

@@ -45,12 +45,6 @@ public class TestListener extends TestListenerAdapter implements IInvokedMethodL
 
   @Override
   public void onTestFailure(ITestResult tr) {
-    if (tr.getThrowable() instanceof SkipException) {
-      // Workaround for testng 6.13.x bug https://github.com/testng-team/testng/issues/1632
-      // When SkipException thrown from beforeInvocation marks test as FAILED
-      tr.setStatus(ITestResult.SKIP);
-      return;
-    }
     long elapsedTime = TimeUnit.NANOSECONDS.toSeconds((System.nanoTime() - start_time));
     long testTime = tr.getEndMillis() - tr.getStartMillis();
     tr.getThrowable().printStackTrace();
@@ -121,11 +115,15 @@ public void beforeInvocation(IInvokedMethod testMethod, ITestResult testResult)
     ConstructorOrMethod constructorOrMethod = testNgMethod.getConstructorOrMethod();
 
     Class<?> clazz = testNgMethod.getInstance().getClass();
-    if (clazz != null) {
-      do {
+    do {
+      try {
         if (scanAnnotatedElement(clazz)) break;
-      } while (!(clazz = clazz.getSuperclass()).equals(Object.class));
-    }
+      } catch (SkipException e) {
+        // Workaround for testng 6.13.x bug https://github.com/testng-team/testng/issues/1632
+        // When SkipException thrown from beforeInvocation marks test as FAILED
+        testResult.setStatus(ITestResult.SKIP);
+      }
+    } while (!(clazz = clazz.getSuperclass()).equals(Object.class));
     Method method = constructorOrMethod.getMethod();
     if (method != null) {
       scanAnnotatedElement(method);