You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/06/11 07:39:46 UTC

[isis] 03/03: ISIS-2375: IsisIntegrationTestAbstractWithFixtures now calls setupRefDataFixtures and tearDownFixtures

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

commit 1f902a4a367d6f396b025862cdb89a41f26eaf5d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jun 11 08:29:02 2020 +0100

    ISIS-2375: IsisIntegrationTestAbstractWithFixtures now calls setupRefDataFixtures and tearDownFixtures
---
 .../applib/IsisIntegrationTestAbstractWithFixtures.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
index 0a0152b..9e5c49b 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
@@ -21,6 +21,8 @@ package org.apache.isis.testing.fixtures.applib;
 import javax.inject.Inject;
 
 import org.joda.time.LocalDate;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import org.apache.isis.applib.clock.Clock;
 import org.apache.isis.applib.services.clock.ClockService;
@@ -30,6 +32,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
 import org.apache.isis.testing.fixtures.applib.clock.FixtureClock;
 import org.apache.isis.testing.fixtures.applib.clock.TickingFixtureClock;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixturesService;
 import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
 
 public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegrationTestAbstract {
@@ -86,6 +89,18 @@ public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegr
 
     // -- DEPENDENCIES
 
+    @BeforeEach
+    protected void setupRefDataFixtures() {
+        fixtureScripts.run(moduleWithFixturesService.getRefDataSetupFixture());
+    }
+
+    @AfterEach
+    protected void tearDownFixtures() {
+        fixtureScripts.run(moduleWithFixturesService.getTeardownFixture());
+    }
+
+    @Inject protected ModuleWithFixturesService moduleWithFixturesService;
+
     @Inject protected FixtureScripts fixtureScripts;