* It would be nice to separate these two aspects and handle them in two separate listeners, but * TestNG has no way to override or disable the listener annotated on the test class. *
- * TestNG provides a listener callback for configuration methods, but it does not let us intercept - * them. For this reason, we use an ugly reflection hack to disable them when running under the - * driver and to make sure they get executed inside the test container only. - *
* Dependencies annotated by {@link javax.inject.Inject} get injected into the test class in the - * container (OSGi and Java EE modes) or by the driver (CDI mode). + * container. * * @author Harald Wellmann * @since 2.3.0 @@ -211,8 +206,6 @@ public void onFinish(ISuite suite) { * and creating one or more test containers. *
* When using a probe invoker, we register the tests with the reactor. - *
- * Hack: As there is no way to intercept configuration methods, we disable them by reflection. * * @param suite * test suite @@ -223,7 +216,7 @@ private synchronized StagedExamReactor stageReactor(ISuite suite) { methods = suite.getAllMethods(); Class testClass = methods.get(0).getRealClass(); LOG.debug("test class = {}", testClass); - disableConfigurationMethods(suite); + disableLifecycleMethods(suite); Object testClassInstance = testClass.newInstance(); return stageReactorForClass(testClass, testClassInstance); } @@ -247,23 +240,21 @@ private StagedExamReactor stageReactorForClass(Class testClass, Object testCl } /** - * Disables the {@code @BeforeMethod} and {@code @AfterMethod} configuration methods of all test - * classes, overriding the corresponding private fields of {@code TestClass}. + * Disables the {@code @BeforeMethod} and {@code @AfterMethod} lifecycle methods of all test + * classes. *
* These methods shall run only once inside the test container, but not directly under the * driver. - *
- * This is a rather ugly hack, but there does not seem to be any other way.
*
* @param suite
* test suite
*/
- private void disableConfigurationMethods(ISuite suite) {
+ private void disableLifecycleMethods(ISuite suite) {
Set
- * NOTE: Ugly reflection hack, as TestNG does not provide an API for overriding before and after
- * methods.
+ * Disables BeforeMethod and AfterMethod lifecycle methods in the given test class.
*
* @param testClass
* TestNG test class wrapper
*/
- private void disableConfigurationMethods(ITestClass testClass) {
- NoOpTestClass instance = (NoOpTestClass) testClass;
- ITestNGMethod[] noMethods = new ITestNGMethod[0];
- Class javaClass = NoOpTestClass.class;
- setPrivateField(javaClass, instance, "m_beforeTestMethods", noMethods);
- setPrivateField(javaClass, instance, "m_afterTestMethods", noMethods);
- }
-
- /**
- * Sets a private field by injection
- *
- * @param klass
- * Java class where the field is declared
- * @param instance
- * instance of (a subclass of) klass
- * @param fieldName
- * name of field to be set
- * @param value
- * new value for field
- */
- private void setPrivateField(Class klass, Object instance, String fieldName, Object value) {
- try {
- Field field = NoOpTestClass.class.getDeclaredField(fieldName);
- field.setAccessible(true);
- field.set(instance, value);
- }
- catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException
- | SecurityException exc) {
- throw new TestContainerException(exc);
+ private void disableLifecycleMethods(ITestClass testClass) {
+ if (testClass instanceof NoOpTestClass) {
+ NoOpTestClass instance = (NoOpTestClass) testClass;
+ instance.setBeforeTestMethods(new ITestNGMethod[0]);
+ instance.setAfterTestMethod(new ITestNGMethod[0]);
}
}
+
}
diff --git a/pom/pom.xml b/pom/pom.xml
index 8177ade04..c6f0c102c 100644
--- a/pom/pom.xml
+++ b/pom/pom.xml
@@ -32,7 +32,7 @@