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 2021/06/11 11:00:59 UTC
[isis] 01/04: ISIS-2732: removes methods to set clock from
IsisIntegrationTestAbstractWithFixtures
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2732
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6313cce9dbc15673114898f204a18351d52dc0bb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 11 11:48:30 2021 +0100
ISIS-2732: removes methods to set clock from IsisIntegrationTestAbstractWithFixtures
---
.../IsisIntegrationTestAbstractWithFixtures.java | 44 +---------------------
1 file changed, 2 insertions(+), 42 deletions(-)
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 d6b3826..7ad0d6f 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
@@ -20,19 +20,14 @@ 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.services.clock.ClockService;
-import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
-import org.apache.isis.testing.fixtures.applib.clock.clock.Clock;
-import org.apache.isis.testing.fixtures.applib.clock.clock.FixtureClock;
-import org.apache.isis.testing.fixtures.applib.clock.clock.TickingFixtureClock;
-import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptAbstract;
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.modules.ModuleWithFixturesService;
+import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.personas.PersonaWithBuilderScript;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
/**
@@ -56,41 +51,6 @@ public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegr
return this.fixtureScripts.runPersona(personaScript);
}
- /**
- * To use instead of {@link #getFixtureClock()}'s {@link FixtureClock#setDate(int, int, int)} ()}.
- */
- protected void setFixtureClockDate(final LocalDate date) {
- if(date == null) {
- return;
- }
- setFixtureClockDate(date.getYear(), date.getMonthOfYear(), date.getDayOfMonth());
- }
-
- /**
- * To use instead of {@link #getFixtureClock()}'s {@link FixtureClock#setDate(int, int, int)} ()}.
- */
- protected void setFixtureClockDate(final int year, final int month, final int day) {
-
- final Clock instance = Clock.getInstance();
-
- if(instance instanceof TickingFixtureClock) {
- TickingFixtureClock.reinstateExisting();
- getFixtureClock().setDate(year, month, day);
- TickingFixtureClock.replaceExisting();
- }
-
- if(instance instanceof FixtureClock) {
- getFixtureClock().setDate(year, month, day);
- }
- }
-
- /**
- * If just require the current time, use {@link ClockService}
- */
- private FixtureClock getFixtureClock() {
- return ((FixtureClock)FixtureClock.getInstance());
- }
-
// -- DEPENDENCIES
@BeforeEach