[isis] branch master updated: ISIS-1782: reverts change in name of @Before/@After methods

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 62d8a18  ISIS-1782: reverts change in name of @Before/@After methods
62d8a18 is described below

commit 62d8a1864a7185d8d436c1d77baaa1d6346b2981
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 7 15:45:41 2017 +0000

    ISIS-1782: reverts change in name of @Before/@After methods
    
    of IntegrationTestAbstract3
---
 .../apache/isis/core/integtestsupport/IntegrationTestAbstract3.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
index d7672f3..dc362e4 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract3.java
@@ -161,16 +161,18 @@ public abstract class IntegrationTestAbstract3 extends IntegrationBootstrapAbstr
         super(logConfig, module, additionalModuleClasses);
     }
 
+    @Override
     @Before
-    public void beforeTest() {
+    public void bootstrapAndSetupIfRequired() {
 
         super.bootstrapAndSetupIfRequired();
 
         log("### TEST: " + this.getClass().getCanonicalName());
     }
 
+    @Override
     @After
-    public void afterTest() {
+    public void tearDownAllModules() {
         super.tearDownAllModules();
     }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].