From 8ca796461b5da5cec9b61e6d805c1de4187b0783 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 13 Apr 2011 11:58:08 +0000
Subject: [PATCH] minor: restore test version which works on Hudson
SVN: 20878
---
.../server/business/bo/AbstractBOTest.java | 21 ++++++++-----------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
index 67a5f78784a..6eb77e06d1d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java
@@ -16,10 +16,11 @@
package ch.systemsx.cisd.openbis.generic.server.business.bo;
+import java.lang.reflect.Method;
+
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.testng.AssertJUnit;
-import org.testng.ITestResult;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -194,19 +195,15 @@ public abstract class AbstractBOTest extends AssertJUnit
}
@AfterMethod
- public void afterMethod(ITestResult result)
+ public void afterMethod(Method m)
{
- // verify mock expectations only when the test has not failed
- if (result.isSuccess())
+ try
{
- try
- {
- context.assertIsSatisfied();
- } catch (Throwable t)
- {
- // assert expectations were met, including the name of the failed method
- throw new Error(result.getMethod().getMethodName() + "() : ", t);
- }
+ context.assertIsSatisfied();
+ } catch (Throwable t)
+ {
+ // assert expectations were met, including the name of the failed method
+ throw new Error(m.getName() + "() : ", t);
}
}
--
GitLab