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 2017/08/04 17:09:35 UTC
[6/6] isis git commit: ISIS-1521: fixes integ test
ISIS-1521: fixes integ test
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d1ec30ae
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d1ec30ae
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d1ec30ae
Branch: refs/heads/master
Commit: d1ec30ae4557db9a031a655e67364dc7da405f77
Parents: b310e86
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Aug 4 18:09:22 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Aug 4 18:09:22 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/isis/applib/AbstractContainedObject.java | 2 +-
.../modules/simple/integtests/SimpleModuleIntegTestAbstract.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d1ec30ae/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java b/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
index 90f49ac..98e53a3 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
@@ -782,7 +782,7 @@ public abstract class AbstractContainedObject {
// //////////////////////////////////////
-
+
@javax.inject.Inject
private DomainObjectContainer container;
http://git-wip-us.apache.org/repos/asf/isis/blob/d1ec30ae/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
index 7a0ca97..18ff06b 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleIntegTestAbstract.java
@@ -28,8 +28,7 @@ public abstract class SimpleModuleIntegTestAbstract extends IntegrationTestAbstr
@BeforeClass
public static void initSystem() {
- bootstrapUsing(new SimpleModuleManifest());
- //bootstrapUsing(SimpleModuleManifest.BUILDER.withConfigurationProperty("isis.objects.editing","false"));
+ bootstrapUsing(SimpleModuleManifest.BUILDER.withConfigurationProperty("isis.objects.editing","false"));
}
}