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 2016/06/03 15:58:37 UTC
[6/8] isis git commit: ISIS-1422: fixing unit tests.
ISIS-1422: fixing unit tests.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0f550803
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0f550803
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0f550803
Branch: refs/heads/master
Commit: 0f5508038f7090bb3c1eed5a9e7fb09aa02e6311
Parents: 935a5d9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 3 16:40:41 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 3 16:43:11 2016 +0100
----------------------------------------------------------------------
.../AbstractFacetFactoryJUnit4TestCase.java | 7 ++++++
.../facets/AbstractFacetFactoryTest.java | 9 +++++++
.../actions/ActionMethodsFacetFactoryTest.java | 10 +++++---
.../ParseableFacetUsingParserTest.java | 9 ++++++-
.../BigDecimalValueSemanticsProviderTest.java | 5 ++--
.../value/BigIntValueSemanticsProviderTest.java | 5 ++--
.../value/BlobValueSemanticsProviderTest.java | 2 +-
.../BooleanValueSemanticsProviderTest.java | 2 +-
.../value/ByteValueSemanticsProviderTest.java | 2 +-
.../CharacterValueSemanticsProviderTest.java | 2 +-
.../value/ClobValueSemanticsProviderTest.java | 2 +-
.../value/ColorValueSemanticsProviderTest.java | 2 +-
.../DateTimeValueSemanticsProviderTest.java | 2 +-
.../value/DateValueSemanticsProviderTest.java | 2 +-
.../value/DoubleValueSemanticsProviderTest.java | 2 +-
.../value/FloatValueSemanticsProviderTest.java | 2 +-
...ImageValueSemanticsProviderAbstractTest.java | 24 +++++++++++++++---
.../value/IntValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
...aSqlTimeStampValueSemanticsProviderTest.java | 2 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 2 +-
.../value/MoneyValueSemanticsProviderTest.java | 2 +-
.../PasswordValueSemanticsProviderTest.java | 2 +-
.../PercentageValueSemanticsProviderTest.java | 2 +-
.../PolishMoneyValueSemanticsProviderTest.java | 2 +-
.../value/ShortValueSemanticsProviderTest.java | 2 +-
.../value/StringValueSemanticsProviderTest.java | 2 +-
.../TimeStampValueSemanticsProviderTest.java | 2 +-
.../value/TimeValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 17 ++++++++++---
...ApplicationFeatureRepositoryDefaultTest.java | 24 ++++++++++++++++--
.../spec/ObjectSpecIdTest_constructor.java | 4 +--
.../SpecificationLoaderTestAbstract.java | 26 --------------------
35 files changed, 117 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
----------------------------------------------------------------------
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 a07d2b0..ee195e2 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
@@ -110,6 +110,10 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
context.checking(new Expectations() {{
+
+ allowing(mockServicesInjector).getDeploymentCategoryProvider();
+ will(returnValue(mockDeploymentCategoryProvider));
+
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
@@ -128,6 +132,9 @@ public abstract class AbstractFacetFactoryJUnit4TestCase {
allowing(mockServicesInjector).lookupService(TranslationService.class);
will(returnValue(mockTranslationService));
+ allowing(mockServicesInjector).getAuthenticationSessionProvider();
+ will(returnValue(mockAuthenticationSessionProvider));
+
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index aa026ed..45a529a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -129,9 +129,18 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).getAuthenticationSessionProvider();
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ allowing(mockServicesInjector).getAuthenticationSessionProvider();
+ will(returnValue(mockAuthenticationSessionProvider));
+
allowing(mockServicesInjector).getSpecificationLoader();
will(returnValue(mockSpecificationLoader));
+ allowing(mockServicesInjector).getDeploymentCategoryProvider();
+ will(returnValue(mockDeploymentCategoryProvider));
+
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index 16756fa..26ea27f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -126,12 +126,18 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
+ allowing(mockServicesInjector).getAuthenticationSessionProvider();
+ will(returnValue(mockAuthenticationSessionProvider));
+
allowing(mockServicesInjector).getConfigurationServiceInternal();
will(returnValue(stubConfigurationServiceInternal));
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
+ allowing(mockServicesInjector).getDeploymentCategoryProvider();
+ will(returnValue(mockDeploymentCategoryProvider));
+
allowing(mockServicesInjector).getSpecificationLoader();
will(returnValue(mockSpecificationLoader));
@@ -574,7 +580,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setServicesInjector(mockServicesInjector);
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
@@ -594,7 +599,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
final Method actionMethod = findMethod(CustomerStatic.class, "otherAction", new Class[] { int.class, Long.class });
@@ -635,7 +639,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setServicesInjector(mockServicesInjector);
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
final Method actionMethod = findMethod(CustomerStatic.class, "someAction", new Class[] { int.class, Long.class });
@@ -657,7 +660,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory.setServicesInjector(mockServicesInjector);
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index 56d83f8..fbbc315 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -20,6 +20,7 @@ package org.apache.isis.core.metamodel.facets.object.parseable;
import java.util.IllegalFormatWidthException;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -52,7 +53,7 @@ public class ParseableFacetUsingParserTest {
@Mock
private ServicesInjector mockServicesInjector;
@Mock
- private AdapterManager mockAdapterManager;
+ private PersistenceSessionServiceInternal mockAdapterManager;
private ParseableFacetUsingParser parseableFacetUsingParser;
@@ -69,6 +70,12 @@ public class ParseableFacetUsingParserTest {
allowing(mockServicesInjector).injectServicesInto(with(any(Object.class)));
+ allowing(mockServicesInjector).getAuthenticationSessionProvider();
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ allowing(mockServicesInjector).getPersistenceSessionServiceInternal();
+ will(returnValue(mockAdapterManager));
+
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index d96c70a..61ceb61 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -41,7 +41,8 @@ public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProvider
private FacetHolder holder;
@Before
- public void setUpObjects() throws Exception {
+ public void setUp() throws Exception {
+ super.setUp();
context.checking(new Expectations() {
{
allowing(mockConfiguration).getString("isis.value.format.decimal");
@@ -53,7 +54,7 @@ public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProvider
allowMockAdapterToReturn(bigDecimal);
holder = new FacetHolderImpl();
- setValue(value = new BigDecimalValueSemanticsProvider(holder, mockContext));
+ setValue(value = new BigDecimalValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index 5310733..2754c7f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -40,7 +40,8 @@ public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbst
private FacetHolder holder;
@Before
- public void setUpObjects() throws Exception {
+ public void setUp() throws Exception {
+ super.setUp();
bigInt = new BigInteger("132199");
allowMockAdapterToReturn(bigInt);
@@ -52,7 +53,7 @@ public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbst
});
holder = new FacetHolderImpl();
- setValue(new BigIntegerValueSemanticsProvider(holder, mockContext));
+ setValue(new BigIntegerValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
index 3f70bfa..17c738e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
@@ -44,7 +44,7 @@ public class BlobValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
allowMockAdapterToReturn(blob);
holder = new FacetHolderImpl();
- setValue(value = new BlobValueSemanticsProvider(holder, mockContext));
+ setValue(value = new BlobValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
index 1a77292..a414a02 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
@@ -43,7 +43,7 @@ public class BooleanValueSemanticsProviderTest extends ValueSemanticsProviderAbs
public void setUpObjects() throws Exception {
booleanObj = Boolean.valueOf(true);
facetHolder = new FacetHolderImpl();
- setValue(value = new BooleanWrapperValueSemanticsProvider(facetHolder, mockContext));
+ setValue(value = new BooleanWrapperValueSemanticsProvider(facetHolder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index 9b8471b..02573bd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -53,7 +53,7 @@ public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
}
});
- setValue(value = new ByteWrapperValueSemanticsProvider(holder, mockContext));
+ setValue(value = new ByteWrapperValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
index 82718ca..7349c47 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
@@ -44,7 +44,7 @@ public class CharacterValueSemanticsProviderTest extends ValueSemanticsProviderA
public void setUpObjects() throws Exception {
character = Character.valueOf('r');
holder = new FacetHolderImpl();
- setValue(value = new CharWrapperValueSemanticsProvider(holder, mockContext));
+ setValue(value = new CharWrapperValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
index 950efd2..7919404 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
@@ -44,7 +44,7 @@ public class ClobValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
allowMockAdapterToReturn(clob);
holder = new FacetHolderImpl();
- setValue(value = new ClobValueSemanticsProvider(holder, mockContext));
+ setValue(value = new ClobValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
index f2f89b6..58c5625 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
@@ -44,7 +44,7 @@ public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
allowMockAdapterToReturn(color);
holder = new FacetHolderImpl();
- setValue(value = new ColorValueSemanticsProvider(holder, mockContext));
+ setValue(value = new ColorValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
index 21113ca..b30015b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
@@ -47,7 +47,7 @@ public class DateTimeValueSemanticsProviderTest extends ValueSemanticsProviderAb
TestClock.initialize();
holder = new FacetHolderImpl();
- setValue(adapter = new DateTimeValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new DateTimeValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
index 3006597..b7d0483 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
@@ -51,7 +51,7 @@ public class DateValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
TestClock.initialize();
date = new Date(2001, 2, 4);
holder = new FacetHolderImpl();
- setValue(adapter = new DateValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new DateValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index 036e4a7..16885a1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -49,7 +49,7 @@ public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbst
});
holder = new FacetHolderImpl();
- setValue(new DoubleWrapperValueSemanticsProvider(holder, mockContext));
+ setValue(new DoubleWrapperValueSemanticsProvider(holder, mockServicesInjector));
doubleObj = new Double(32.5d);
allowMockAdapterToReturn(doubleObj);
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index a5b5e84..b3b7ef6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -52,7 +52,7 @@ public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
allowMockAdapterToReturn(float1);
holder = new FacetHolderImpl();
- setValue(value = new FloatWrapperValueSemanticsProvider(holder, mockContext));
+ setValue(value = new FloatWrapperValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 9fa3bd5..d91b372 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -23,6 +23,9 @@ import static org.junit.Assert.assertEquals;
import java.awt.Image;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
+import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
@@ -37,16 +40,29 @@ import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ImageValueSemanticsProviderAbstractTest {
@Rule
- public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_ONLY);
+ public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
@Mock
private FacetHolder mockFacetHolder;
+ @Mock
+ private ServicesInjector mockServicesInjector;
+
+ @Mock
+ private ConfigurationServiceInternal mockConfiguration;
+
private TestImageSemanticsProvider adapter;
@Before
public void setUp() throws Exception {
- adapter = new TestImageSemanticsProvider(mockFacetHolder);
+
+ context.checking(new Expectations() {{
+ allowing(mockServicesInjector).getConfigurationServiceInternal();
+ will(returnValue(mockConfiguration));
+
+ }});
+
+ adapter = new TestImageSemanticsProvider(mockFacetHolder, mockServicesInjector);
}
@Test
@@ -66,8 +82,8 @@ public class ImageValueSemanticsProviderAbstractTest {
class TestImageSemanticsProvider extends ImageValueSemanticsProviderAbstract<int[][]> {
- TestImageSemanticsProvider(final FacetHolder holder) {
- super(holder, null, null);
+ TestImageSemanticsProvider(final FacetHolder holder, ServicesInjector servicesInjector) {
+ super(holder, null, servicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 886a03d..2414583 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -52,7 +52,7 @@ public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstrac
});
holder = new FacetHolderImpl();
- setValue(value = new IntWrapperValueSemanticsProvider(holder, mockContext));
+ setValue(value = new IntWrapperValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index 8c4e0e3..142ae7f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -54,7 +54,7 @@ public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProvide
TestClock.initialize();
date = new Date(0);
holder = new FacetHolderImpl();
- setValue(adapter = new JavaSqlDateValueSemanticsProvider(holder, mockContext) {
+ setValue(adapter = new JavaSqlDateValueSemanticsProvider(holder, mockServicesInjector) {
@Override
protected String defaultFormat() {
return "iso";
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
index 157ba7c..a1a11b9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
@@ -50,7 +50,7 @@ public class JavaSqlTimeStampValueSemanticsProviderTest extends ValueSemanticsPr
TestClock.initialize();
timestamp = new Timestamp(0);
holder = new FacetHolderImpl();
- setValue(adapter = new JavaSqlTimeStampValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new JavaSqlTimeStampValueSemanticsProvider(holder, mockServicesInjector));
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index 482985d..999cf9fa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -63,7 +63,7 @@ public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProvide
twoOClock = new Time(c.getTimeInMillis());
holder = new FacetHolderImpl();
- setValue(value = new JavaSqlTimeValueSemanticsProvider(holder, mockContext));
+ setValue(value = new JavaSqlTimeValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 4b69664..9d66cb6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -54,7 +54,7 @@ public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProvid
date = new java.util.Date(0);
holder = new FacetHolderImpl();
- setValue(new JavaUtilDateValueSemanticsProvider(holder, mockContext) {
+ setValue(new JavaUtilDateValueSemanticsProvider(holder, mockServicesInjector) {
@Override
protected String defaultFormat() {
return "iso";
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index f5cb820..79fc899 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -53,7 +53,7 @@ public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
}
});
- setValue(value = new LongWrapperValueSemanticsProvider(holder, mockContext));
+ setValue(value = new LongWrapperValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
index 1a84d0b..8b1bfe7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
@@ -46,7 +46,7 @@ public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
public void setUpObjects() throws Exception {
Locale.setDefault(Locale.UK);
holder = new FacetHolderImpl();
- setValue(adapter = new MoneyValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new MoneyValueSemanticsProvider(holder, mockServicesInjector));
}
private Money createMoney(final double amount, final String currency) {
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
index 3f207b3..4930e5f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PasswordValueSemanticsProviderTest.java
@@ -38,7 +38,7 @@ public class PasswordValueSemanticsProviderTest extends ValueSemanticsProviderAb
@Before
public void setUpObjects() throws Exception {
holder = new FacetHolderImpl();
- setValue(adapter = new PasswordValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new PasswordValueSemanticsProvider(holder, mockServicesInjector));
password = new Password("secret");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 154c158..6d2ce17 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -50,7 +50,7 @@ public class PercentageValueSemanticsProviderTest extends ValueSemanticsProvider
holder = new FacetHolderImpl();
- setValue(adapter = new PercentageValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new PercentageValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
index c06067b..811add6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
@@ -55,7 +55,7 @@ public class PolishMoneyValueSemanticsProviderTest extends ValueSemanticsProvide
Locale.setDefault(new Locale("pl", "PL"));
originalMoney = new Money(10.50, "pln");
holder = new FacetHolderImpl();
- setValue(adapter = new MoneyValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new MoneyValueSemanticsProvider(holder, mockServicesInjector));
}
private Money createMoney(final double amount, final String currency) {
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index a31a934..558a31b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -53,7 +53,7 @@ public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
holder = new FacetHolderImpl();
- setValue(value = new ShortWrapperValueSemanticsProvider(holder, mockContext));
+ setValue(value = new ShortWrapperValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
index a133d2b..70b82ba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
@@ -41,7 +41,7 @@ public class StringValueSemanticsProviderTest extends ValueSemanticsProviderAbst
public void setUpObjects() throws Exception {
string = "text entry";
holder = new FacetHolderImpl();
- setValue(value = new StringValueSemanticsProvider(holder, mockContext));
+ setValue(value = new StringValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
index 0862928..361f9ad 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
@@ -49,7 +49,7 @@ public class TimeStampValueSemanticsProviderTest extends ValueSemanticsProviderA
TestClock.initialize();
timestamp = new TimeStamp(0);
holder = new FacetHolderImpl();
- setValue(adapter = new TimeStampValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new TimeStampValueSemanticsProvider(holder, mockServicesInjector));
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
index e386358..964081d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
@@ -51,7 +51,7 @@ public class TimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
TestClock.initialize();
time = new Time(8, 13);
holder = new FacetHolderImpl();
- setValue(adapter = new TimeValueSemanticsProvider(holder, mockContext));
+ setValue(adapter = new TimeValueSemanticsProvider(holder, mockServicesInjector));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 93c79de..cae4912 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -21,6 +21,8 @@ package org.apache.isis.core.metamodel.facets.value;
import java.util.Locale;
+import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.After;
@@ -66,13 +68,11 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
@Mock
protected FacetHolder mockFacetHolder;
@Mock
- protected IsisConfiguration mockConfiguration;
- @Mock
- protected ServicesInjector mockContext;
+ protected ConfigurationServiceInternal mockConfiguration;
@Mock
protected ServicesInjector mockServicesInjector;
@Mock
- protected AdapterManager mockAdapterManager;
+ protected PersistenceSessionServiceInternal mockAdapterManager;
@Mock
protected SpecificationLoader mockSpecificationLoader;
@Mock
@@ -95,6 +95,15 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
allowing(mockConfiguration).getString("isis.locale");
will(returnValue(null));
+ allowing(mockServicesInjector).getConfigurationServiceInternal();
+ will(returnValue(mockConfiguration));
+
+ allowing(mockServicesInjector).getAuthenticationSessionProvider();
+ will(returnValue(mockAuthenticationSessionProvider));
+
+ allowing(mockServicesInjector).getPersistenceSessionServiceInternal();
+ will(returnValue(mockAdapterManager));
+
allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
will(returnValue(mockAuthenticationSessionProvider));
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index 2ab2142..e0757c2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import com.google.common.collect.Lists;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.hamcrest.Matchers;
import org.jmock.Expectations;
import org.jmock.Sequence;
@@ -84,6 +85,9 @@ public class ApplicationFeatureRepositoryDefaultTest {
@Mock
ServiceRegistry2 mockServiceRegistry;
+ @Mock
+ SpecificationLoader mockSpecificationLoader;
+
ApplicationFeatureRepositoryDefault applicationFeatureRepository;
@Before
@@ -91,13 +95,13 @@ public class ApplicationFeatureRepositoryDefaultTest {
applicationFeatureRepository = new ApplicationFeatureRepositoryDefault();
applicationFeatureRepository.container = mockContainer;
applicationFeatureRepository.serviceRegistry = mockServiceRegistry;
+ applicationFeatureRepository.specificationLoader = mockSpecificationLoader;
final ApplicationFeatureFactory applicationFeatureFactory = new ApplicationFeatureFactory();
applicationFeatureRepository.applicationFeatureFactory = applicationFeatureFactory;
applicationFeatureFactory.factoryService = mockFactoryService;
-
mockActThatIsHidden = context.mock(ObjectAction.class, "mockActThatIsHidden");
}
@@ -263,13 +267,27 @@ public class ApplicationFeatureRepositoryDefaultTest {
public static class AddClassParent extends ApplicationFeatureRepositoryDefaultTest {
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ context.checking(new Expectations() {{
+ allowing(mockServiceRegistry).getRegisteredServices();
+ will(returnValue(Lists.newArrayList()));
+
+ allowing(mockSpecificationLoader).allSpecifications();
+ will(returnValue(Lists.newArrayList()));
+ }});
+
+ }
+
@Test
public void parentNotYetEncountered() throws Exception {
// given
final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
- // then
+ // expecting
final ApplicationFeature newlyCreatedParent = new ApplicationFeature();
context.checking(new Expectations() {{
@@ -297,6 +315,8 @@ public class ApplicationFeatureRepositoryDefaultTest {
final ApplicationFeatureId classFeatureId = ApplicationFeatureId.newClass("com.mycompany.Bar");
+
+
// when
final ApplicationFeatureId applicationFeatureId = applicationFeatureRepository.addClassParent(classFeatureId);
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_constructor.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_constructor.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_constructor.java
index b56cf85..1c92da6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_constructor.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_constructor.java
@@ -28,13 +28,13 @@ public class ObjectSpecIdTest_constructor {
final ObjectSpecId objectSpecId = new ObjectSpecId("CUS");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected=AssertionError.class)
public void cannotBeEmpty() throws Exception {
new ObjectSpecId("");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected=AssertionError.class)
public void cannotBeNull() throws Exception {
new ObjectSpecId(null);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/0f550803/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index cbedb8c..18b7d7f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -134,32 +134,6 @@ public abstract class SpecificationLoaderTestAbstract {
protected abstract ObjectSpecification loadSpecification(SpecificationLoader reflector);
@Test
- public void testLayoutMetadataReaderEmptyList() {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("illegal argument, expected: is not an empty collection");
-
- new SpecificationLoader(DeploymentCategory.PRODUCTION ,
- stubConfiguration,
- new ProgrammingModelFacetsJava5(stubConfiguration),
- new MetaModelValidatorDefault(),
- Lists.<LayoutMetadataReader>newArrayList(),
- stubServicesInjector);
- }
-
- @Test
- public void testLayoutMetadataReaderNull() {
- expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("illegal argument, expected: is not null");
-
- new SpecificationLoader(DeploymentCategory.PRODUCTION,
- stubConfiguration,
- new ProgrammingModelFacetsJava5(stubConfiguration),
- new MetaModelValidatorDefault(),
- null,
- stubServicesInjector);
- }
-
- @Test
public void testCollectionFacet() throws Exception {
final Facet facet = specification.getFacet(CollectionFacet.class);
Assert.assertNull(facet);