Merge pull request #774 from juherr/issue-773

Fix issue #773 : Test should not be skipped when the exception is expected

1 files changed, 7 insertions, 6 deletions

diff --git a/src/main/java/org/testng/internal/Invoker.java b/src/main/java/org/testng/internal/Invoker.java
index 9cf7326d..86c892c2 100644
--- a/src/main/java/org/testng/internal/Invoker.java
+++ b/src/main/java/org/testng/internal/Invoker.java
@@ -1351,17 +1351,18 @@ public class Invoker implements IInvoker {
       // Exception thrown?
       if (ite != null) {
 
-        if (isSkipExceptionAndSkip(ite)){
-          status = ITestResult.SKIP;
-        }
         //  Invocation caused an exception, see if the method was annotated with @ExpectedException
-        else if (expectedExceptionsHolder != null) {
+        if (expectedExceptionsHolder != null) {
           if (expectedExceptionsHolder.isExpectedException(ite)) {
             testResult.setStatus(ITestResult.SUCCESS);
             status = ITestResult.SUCCESS;
           } else {
-            testResult.setThrowable(expectedExceptionsHolder.wrongException(ite));
-            status= ITestResult.FAILURE;
+            if (isSkipExceptionAndSkip(ite)){
+              status = ITestResult.SKIP;
+            } else {
+              testResult.setThrowable(expectedExceptionsHolder.wrongException(ite));
+              status = ITestResult.FAILURE;
+            }
           }
         } else {
           handleException(ite, testMethod, testResult, failure.count++);