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/01/29 19:38:37 UTC
[isis] 08/25: ISIS-2273: fixes failing test for metamodel
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 6f22c4ec8eabce0841cd05827ac520a1007eea6a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 29 17:12:18 2020 +0000
ISIS-2273: fixes failing test for metamodel
reference config's test-jar instead
---
core/metamodel/pom.xml | 3 ++-
.../org/apache/isis/core/metamodel/MetaModelContext_forTesting.java | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 1721f76..5809749 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -116,8 +116,9 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-unittestsupport</artifactId>
+ <artifactId>isis-core-config</artifactId>
<scope>test</scope>
+ <type>test-jar</type>
</dependency>
<dependency>
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index cab5e78..da2fe83 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -39,6 +39,8 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistry;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
+import org.apache.isis.core.config.unittestsupport.IsisConfigurationLegacy;
+import org.apache.isis.core.config.unittestsupport.internal._Config;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.objectmanager.ObjectManagerDefault;
@@ -51,8 +53,6 @@ import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
-import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.core.unittestsupport.config._Config;
import lombok.Builder;
import lombok.Getter;
@@ -113,7 +113,7 @@ public final class MetaModelContext_forTesting implements MetaModelContext {
private List<Object> singletons;
//@Override
- public IsisConfigurationLegacy getConfigurationLegacy() {
+ public efereIsisConfigurationLegacy getConfigurationLegacy() {
return _Config.getConfiguration();
}