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/29 16:33:45 UTC
[isis] branch 2039-Redesign_of_Config updated: ISIS-2039: further
fixing 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
The following commit(s) were added to refs/heads/2039-Redesign_of_Config by this push:
new abb65f6 ISIS-2039: further fixing tests ...
abb65f6 is described below
commit abb65f6a8d1141657f9ac2f09b7fac233ec19fda
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Nov 29 17:05:30 2018 +0100
ISIS-2039: further fixing tests ...
also moving ExceptionRecognizer services that depend on the 'config'
module from 'applib' to 'runtime'
Task-Url: https://issues.apache.org/jira/browse/ISIS-2039
---
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 9 +++-
.../DomainObjectLayoutFactoryTest.java | 28 +++++------
...eptionRecognizerCompositeForJdoObjectStore.java | 10 ++--
...xceptionRecognizerForJDODataStoreException.java | 0
...traintViolationForeignKeyNoActionException.java | 0
...ionRecognizerForJDOObjectNotFoundException.java | 0
...yConstraintViolationUniqueOrIndexException.java | 0
.../eventbus/EventBusServiceDefaultTest.java | 6 ++-
...onRecognizerCompositeForJdoObjectStoreTest.java | 54 ++++++++++++----------
...LIntegrityConstraintViolationExceptionTest.java | 2 +-
10 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index 4cb0121..3616f64 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -30,6 +30,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -80,7 +81,10 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
protected OneToManyAssociation mockOneToManyAssociation;
@Mock
protected OneToOneActionParameter mockOneToOneActionParameter;
-
+ @Mock
+ protected EventBusService mockEventBusService;
+
+
protected FacetedMethod facetedMethod;
protected FacetedMethodParameter facetedMethodParameter;
@@ -116,6 +120,9 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).lookupServiceElseFail(EventBusService.class);
+ will(returnValue(mockEventBusService));
+
allowing(mockServicesInjector).getSpecificationLoader();
will(returnValue(mockSpecificationLoader));
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index b9fc4c5..0ea5277 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -112,7 +112,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
_Config.clear();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenSpecified() {
final Class<?> cls = DomainObjectLayoutFactoryTest.Customer.class;
@@ -131,7 +131,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
expectNoMethodsRemoved();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenDefaults() {
final Class<?> cls = CustomerWithDefaults.class;
@@ -205,7 +205,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
super.setUp();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenSpecified() {
final Class<?> cls = DomainObjectLayoutFactoryTest.Customer.class;
@@ -222,7 +222,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
expectNoMethodsRemoved();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenDefaults() {
final Class<?> cls = CustomerWithDefaults.class;
@@ -284,7 +284,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenSpecified() {
final Class<?> cls = DomainObjectLayoutFactoryTest.Customer.class;
@@ -302,7 +302,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
expectNoMethodsRemoved();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenDefaults() {
final Class<?> cls = CustomerWithDefaults.class;
@@ -364,7 +364,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
_Config.clear();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenSpecified() {
final Class<?> cls = DomainObjectLayoutFactoryTest.Customer.class;
@@ -381,7 +381,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
expectNoMethodsRemoved();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenDefaults() {
final Class<?> cls = CustomerWithDefaults.class;
@@ -442,7 +442,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
_Config.clear();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenSpecified() {
final Class<?> cls = DomainObjectLayoutFactoryTest.Customer.class;
@@ -459,7 +459,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
expectNoMethodsRemoved();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenDefaults() {
final Class<?> cls = CustomerWithDefaults.class;
@@ -520,7 +520,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
_Config.clear();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenSpecified() {
final Class<?> cls = DomainObjectLayoutFactoryTest.Customer.class;
@@ -537,7 +537,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
expectNoMethodsRemoved();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenDefaults() {
final Class<?> cls = CustomerWithDefaults.class;
@@ -598,7 +598,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
_Config.clear();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenSpecified() {
final Class<?> cls = DomainObjectLayoutFactoryTest.Customer.class;
@@ -615,7 +615,7 @@ public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4Tes
expectNoMethodsRemoved();
}
- @Test @Ignore //FIXME[2039]
+ @Test
public void whenDefaults() {
final Class<?> cls = CustomerWithDefaults.class;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
similarity index 93%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
rename to core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
index d4bfd91..07887e1 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
+++ b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStore.java
@@ -28,6 +28,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.config.internal._Config;
/**
* Convenience implementation of the {@link ExceptionRecognizer} domain service that
@@ -54,11 +55,10 @@ public class ExceptionRecognizerCompositeForJdoObjectStore extends ExceptionReco
@PostConstruct
public void init() {
-//FIXME[2039]
-// final boolean disabled = getElseFalse(properties, KEY_DISABLE);
-// if(disabled) {
-// return;
-// }
+ final boolean disabled = _Config.getConfiguration().getBoolean(KEY_DISABLE, false);
+ if(disabled) {
+ return;
+ }
addChildren();
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreException.java b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreException.java
rename to core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
rename to core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDOObjectNotFoundException.java b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDOObjectNotFoundException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDOObjectNotFoundException.java
rename to core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForJDOObjectNotFoundException.java
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java b/core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
similarity index 100%
rename from core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
rename to core/runtime/src/main/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java
index a577d99..68449a3 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefaultTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.config.internal._Config;
+import org.apache.isis.core.plugins.environment.IsisSystemEnvironment;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.isIn;
@@ -36,7 +37,10 @@ public class EventBusServiceDefaultTest {
@Before
public void setUp() throws Exception {
- _Config.clear();
+
+ _Config.clear();
+ IsisSystemEnvironment.setUnitTesting(true);
+
eventBusService = new EventBusServiceDefault() {
{
serviceRegistry = new ServiceRegistry() {
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
similarity index 67%
rename from core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 7b4b74a..6abc81c 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/exceprecog/jdo/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.services.exceprecog.jdo;
+package org.apache.isis.core.runtime.services.exceprecog.jdo;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.Collections;
-
-import org.apache.isis.commons.internal.collections._Maps;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.applib.services.exceprecog.jdo.ExceptionRecognizerCompositeForJdoObjectStore;
+import org.apache.isis.config.internal._Config;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
public class ExceptionRecognizerCompositeForJdoObjectStoreTest {
private boolean[] called;
@@ -34,6 +34,7 @@ public class ExceptionRecognizerCompositeForJdoObjectStoreTest {
@Before
public void setUp() throws Exception {
+ _Config.clear();
called = new boolean[1];
recog = new ExceptionRecognizerCompositeForJdoObjectStore() {
@@ -52,23 +53,26 @@ public class ExceptionRecognizerCompositeForJdoObjectStoreTest {
assertThat(called[0], is(true));
}
- //FIXME[2039]
-// @Test
-// public void whenDisabledFlagSetToTrue() throws Exception {
-// // when
-// recog.init(_Maps.unmodifiable(ExceptionRecognizerCompositeForJdoObjectStore.KEY_DISABLE, "true"));
-//
-// // then
-// assertThat(called[0], is(false));
-// }
-//
-// @Test
-// public void whenDisabledFlagSetToFalse() throws Exception {
-// // when
-// recog.init(_Maps.unmodifiable(ExceptionRecognizerCompositeForJdoObjectStore.KEY_DISABLE, "false"));
-//
-// // then
-// assertThat(called[0], is(true));
-// }
+
+ @Test
+ public void whenDisabledFlagSetToTrue() throws Exception {
+
+ // when
+ _Config.put(ExceptionRecognizerCompositeForJdoObjectStore.KEY_DISABLE, true);
+ recog.init();
+
+ // then
+ assertThat(called[0], is(false));
+ }
+
+ @Test
+ public void whenDisabledFlagSetToFalse() throws Exception {
+ // when
+ _Config.put(ExceptionRecognizerCompositeForJdoObjectStore.KEY_DISABLE, false);
+ recog.init();
+
+ // then
+ assertThat(called[0], is(true));
+ }
}
\ No newline at end of file
diff --git a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
similarity index 97%
rename from core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
index 477eba2..c36412f 100644
--- a/core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/services/exceprecog/jdo/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.isis.applib.services.exceprecog.jdo;
+package org.apache.isis.core.runtime.services.exceprecog.jdo;
import java.sql.SQLIntegrityConstraintViolationException;
import org.junit.Before;