You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/11/23 08:40:24 UTC
[isis] 05/07: ISIS-2039: fixing some tests
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2039-Redesign_of_Config
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d5c6366f91b31a9101f06262e142e96d720d77c1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 23 00:51:38 2018 +0100
ISIS-2039: fixing some tests
Task-Url: https://issues.apache.org/jira/browse/ISIS-2039
---
.../fixtures/FixturesInstallerDelegate.java | 3 ++-
.../isisWicketModule_bindingsStandard_Test.java | 22 +++++++++++++++-------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index 62882ba..202865b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -33,6 +33,7 @@ import org.apache.isis.applib.fixturescripts.events.FixturesInstalledEvent;
import org.apache.isis.applib.fixturescripts.events.FixturesInstallingEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -108,7 +109,7 @@ public class FixturesInstallerDelegate {
}
private IsisConfiguration getConfiguration() {
- return isisSessionFactory.getServicesInjector().lookupServiceElseFail(IsisConfiguration.class);
+ return _Config.getConfiguration();
}
private void installFixtures(final List<Object> fixtures) {
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
index 71d15be..24d33eb 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/isisWicketModule_bindingsStandard_Test.java
@@ -27,6 +27,7 @@ import javax.servlet.ServletContext;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import com.google.inject.Provider;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -37,6 +38,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.apache.isis.config.internal._Config;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
@@ -59,9 +61,6 @@ public class isisWicketModule_bindingsStandard_Test {
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
@Mock
- private IsisConfiguration mockIsisConfiguration;
-
- @Mock
private ServletContext mockServletContext;
private IsisWicketModule isisWicketModule;
@@ -87,10 +86,13 @@ public class isisWicketModule_bindingsStandard_Test {
@Before
public void setUp() throws Exception {
- isisWicketModule = new IsisWicketModule(mockServletContext, mockIsisConfiguration);
+
+ _Config.clear();
+ final IsisConfiguration isisConfiguration = _Config.getConfiguration();
+
+ isisWicketModule = new IsisWicketModule(mockServletContext, isisConfiguration);
context.checking(new Expectations() {{
- allowing(mockIsisConfiguration);
allowing(mockServletContext);
}});
@@ -106,9 +108,15 @@ public class isisWicketModule_bindingsStandard_Test {
// -- CONFIGURATION BINDING
private static class ConfigModule extends AbstractModule {
- @Override
+
+ @Override
protected void configure() {
- bind(IsisConfiguration.class).to(IsisConfiguration.class);
+ bind(IsisConfiguration.class).toProvider(new Provider<IsisConfiguration>() {
+ @Override
+ public IsisConfiguration get() {
+ return _Config.getConfiguration();
+ }
+ });
}
}