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 2011/04/26 23:28:06 UTC
svn commit: r1096917 [1/3] - in
/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel:
adapter/ adapter/oid/stringable/directly/ consent/ facetapi/ facets/
facets/object/callbacks/ services/ spec/ spec/feature/ specloader/cl...
Author: danhaywood
Date: Tue Apr 26 21:28:05 2011
New Revision: 1096917
URL: http://svn.apache.org/viewvc?rev=1096917&view=rev
Log:
ISIS-22 code cleanup for core.metamodel (src/test/java)
Modified:
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsValidToChangeToTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_RespondToChangesInPersistentObjectsTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_SerializeFromTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/DirectlyStringableOidAbstract.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectCanRoundtripTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/GivenOidStringifierDirectWhenInstantiateTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidConformant.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonPublicDestringMethod.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/stringable/directly/OidWithNonStaticDestringMethod.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/consent/InteractionResultTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetAbstractTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facetapi/FacetFiltersTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/EnumerationAbstractTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ImperativeFacetUtilsTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/callbacks/LifeCycleEventTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstractTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTargetTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/PersistableTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/classsubstitutor/ClassSubstitutorComposite_lifecycle.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/TestProxySpecification.java
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_CouldResolveTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_CouldResolveTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, NEW},
- {true, GHOST},
- {true, PART_RESOLVED},
- {false, RESOLVED},
- {true, RESOLVING},
- {true, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {true, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {true, SERIALIZING_GHOST},
- {true, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean couldResolve;
- private final ResolveState state;
-
- public ResolveState_CouldResolveTest(final boolean couldResolve, final ResolveState state) {
- this.couldResolve = couldResolve;
- this.state = state;
- }
-
- @Test
- public void testCouldResolve() {
- assertThat(state.couldResolve(), is(couldResolve));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_CouldResolveTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, NEW }, { true, GHOST }, { true, PART_RESOLVED },
+ { false, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { true, UPDATING }, { false, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
+ { true, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean couldResolve;
+ private final ResolveState state;
+
+ public ResolveState_CouldResolveTest(final boolean couldResolve, final ResolveState state) {
+ this.couldResolve = couldResolve;
+ this.state = state;
+ }
+
+ @Test
+ public void testCouldResolve() {
+ assertThat(state.couldResolve(), is(couldResolve));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_GetEndStateTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,42 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_GetEndStateTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {NEW, null},
- {GHOST, null},
- {TRANSIENT, null},
- {RESOLVING_PART, PART_RESOLVED},
- {PART_RESOLVED, null},
- {RESOLVING, RESOLVED},
- {RESOLVED, null},
- {UPDATING, RESOLVED},
- {SERIALIZING_TRANSIENT, TRANSIENT},
- {SERIALIZING_PART_RESOLVED, PART_RESOLVED},
- {SERIALIZING_RESOLVED, RESOLVED},
- {SERIALIZING_GHOST, GHOST},
- {VALUE, null},
- {DESTROYED, null},
- });
- }
-
- private final ResolveState from;
- private final ResolveState to;
-
- public ResolveState_GetEndStateTest(final ResolveState from, final ResolveState to) {
- this.from = from;
- this.to = to;
- }
-
- @Test
- public void testGetEndState() {
- assertThat(from.getEndState(), is(to));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_GetEndStateTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { NEW, null }, { GHOST, null }, { TRANSIENT, null },
+ { RESOLVING_PART, PART_RESOLVED }, { PART_RESOLVED, null }, { RESOLVING, RESOLVED }, { RESOLVED, null },
+ { UPDATING, RESOLVED }, { SERIALIZING_TRANSIENT, TRANSIENT }, { SERIALIZING_PART_RESOLVED, PART_RESOLVED },
+ { SERIALIZING_RESOLVED, RESOLVED }, { SERIALIZING_GHOST, GHOST }, { VALUE, null }, { DESTROYED, null }, });
+ }
+
+ private final ResolveState from;
+ private final ResolveState to;
+
+ public ResolveState_GetEndStateTest(final ResolveState from, final ResolveState to) {
+ this.from = from;
+ this.to = to;
+ }
+
+ @Test
+ public void testGetEndState() {
+ assertThat(from.getEndState(), is(to));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsDestroyedTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsDestroyedTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, GHOST},
- {false, NEW},
- {false, PART_RESOLVED},
- {false, RESOLVED},
- {false, RESOLVING},
- {false, RESOLVING_PART},
- {false, TRANSIENT},
- {true, DESTROYED},
- {false, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {false, SERIALIZING_GHOST},
- {false, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsDestroyedTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsDestroyed() {
- assertThat(state.isDestroyed(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsDestroyedTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
+ { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
+ { true, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsDestroyedTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsDestroyed() {
+ assertThat(state.isDestroyed(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsGhostTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,30 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsGhostTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {true, GHOST},
- {false, NEW},
- {false, PART_RESOLVED},
- {false, RESOLVED},
- {false, RESOLVING},
- {false, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {false, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {false, SERIALIZING_GHOST}, // surprisingly not?
- {false, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsGhostTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsGhost() {
- assertThat(state.isGhost(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsGhostTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { false, PART_RESOLVED },
+ { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST }, // surprisingly
+ // not?
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsGhostTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsGhost() {
+ assertThat(state.isGhost(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsNewTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsNewTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, GHOST},
- {true, NEW},
- {false, PART_RESOLVED},
- {false, RESOLVED},
- {false, RESOLVING},
- {false, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {false, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {false, SERIALIZING_GHOST},
- {false, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsNewTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsNew() {
- assertThat(state.isNew(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsNewTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, GHOST }, { true, NEW }, { false, PART_RESOLVED },
+ { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsNewTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsNew() {
+ assertThat(state.isNew(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPartlyResolvedTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsPartlyResolvedTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, GHOST},
- {false, NEW},
- {true, PART_RESOLVED},
- {false, RESOLVED},
- {false, RESOLVING},
- {false, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {false, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {false, SERIALIZING_GHOST},
- {false, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsPartlyResolvedTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsPartlyResolved() {
- assertThat(state.isPartlyResolved(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsPartlyResolvedTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { true, PART_RESOLVED },
+ { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsPartlyResolvedTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsPartlyResolved() {
+ assertThat(state.isPartlyResolved(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsPersistentTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsPersistentTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {true, GHOST},
- {false, NEW},
- {true, PART_RESOLVED},
- {true, RESOLVED},
- {true, RESOLVING},
- {true, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {true, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {true, SERIALIZING_GHOST},
- {true, SERIALIZING_PART_RESOLVED},
- {true, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsPersistentTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsPersistent() {
- assertThat(state.isPersistent(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsPersistentTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { true, GHOST }, { false, NEW }, { true, PART_RESOLVED },
+ { true, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { true, UPDATING }, { false, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
+ { true, SERIALIZING_PART_RESOLVED }, { true, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsPersistentTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsPersistent() {
+ assertThat(state.isPersistent(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvableOrDeserializableTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -45,265 +44,175 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsResolvableOrDeserializableTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {null, null, NEW, GHOST},
- {null, null, NEW, NEW},
- {null, null, NEW, PART_RESOLVED},
- {null, null, NEW, RESOLVED},
- {false, false, NEW, RESOLVING},
- {false, false, NEW, RESOLVING_PART},
- {null, null, NEW, TRANSIENT},
- {null, null, NEW, DESTROYED},
- {false, false, NEW, UPDATING},
- {null, false, NEW, SERIALIZING_TRANSIENT},
- {null, null, NEW, SERIALIZING_GHOST},
- {null, null, NEW, SERIALIZING_PART_RESOLVED},
- {null, null, NEW, SERIALIZING_RESOLVED},
- {null, null, NEW, VALUE},
-
- {null, null, GHOST, GHOST},
- {null, null, GHOST, NEW},
- {null, null, GHOST, PART_RESOLVED},
- {null, null, GHOST, RESOLVED},
- {true, true, GHOST, RESOLVING},
- {true, true, GHOST, RESOLVING_PART},
- {null, null, GHOST, TRANSIENT},
- {null, null, GHOST, DESTROYED},
- {true, true, GHOST, UPDATING},
- {null, false, GHOST, SERIALIZING_TRANSIENT},
- {null, null, GHOST, SERIALIZING_GHOST},
- {null, null, GHOST, SERIALIZING_PART_RESOLVED},
- {null, null, GHOST, SERIALIZING_RESOLVED},
- {null, null, GHOST, VALUE},
-
- {null, null, TRANSIENT, GHOST},
- {null, null, TRANSIENT, NEW},
- {null, null, TRANSIENT, PART_RESOLVED},
- {null, null, TRANSIENT, RESOLVED},
- {false, false, TRANSIENT, RESOLVING},
- {false, false, TRANSIENT, RESOLVING_PART},
- {null, null, TRANSIENT, TRANSIENT},
- {null, null, TRANSIENT, DESTROYED},
- {false, false, TRANSIENT, UPDATING},
- {null, true, TRANSIENT, SERIALIZING_TRANSIENT},
- {null, null, TRANSIENT, SERIALIZING_GHOST},
- {null, null, TRANSIENT, SERIALIZING_PART_RESOLVED},
- {null, null, TRANSIENT, SERIALIZING_RESOLVED},
- {null, null, TRANSIENT, VALUE},
-
- {null, null, RESOLVING_PART, GHOST},
- {null, null, RESOLVING_PART, NEW},
- {null, null, RESOLVING_PART, PART_RESOLVED},
- {null, null, RESOLVING_PART, RESOLVED},
- {false, false, RESOLVING_PART, RESOLVING},
- {false, false, RESOLVING_PART, RESOLVING_PART},
- {null, null, RESOLVING_PART, TRANSIENT},
- {null, null, RESOLVING_PART, DESTROYED},
- {false, false, RESOLVING_PART, UPDATING},
- {null, false, RESOLVING_PART, SERIALIZING_TRANSIENT},
- {null, null, RESOLVING_PART, SERIALIZING_GHOST},
- {null, null, RESOLVING_PART, SERIALIZING_PART_RESOLVED},
- {null, null, RESOLVING_PART, SERIALIZING_RESOLVED},
- {null, null, RESOLVING_PART, VALUE},
-
- {null, null, PART_RESOLVED, GHOST},
- {null, null, PART_RESOLVED, NEW},
- {null, null, PART_RESOLVED, PART_RESOLVED},
- {null, null, PART_RESOLVED, RESOLVED},
- {true, true, PART_RESOLVED, RESOLVING},
- {true, true, PART_RESOLVED, RESOLVING_PART},
- {null, null, PART_RESOLVED, TRANSIENT},
- {null, null, PART_RESOLVED, DESTROYED},
- {true, true, PART_RESOLVED, UPDATING},
- {null, false, PART_RESOLVED, SERIALIZING_TRANSIENT},
- {null, null, PART_RESOLVED, SERIALIZING_GHOST},
- {null, null, PART_RESOLVED, SERIALIZING_PART_RESOLVED},
- {null, null, PART_RESOLVED, SERIALIZING_RESOLVED},
- {null, null, PART_RESOLVED, VALUE},
-
- {null, null, RESOLVING, GHOST},
- {null, null, RESOLVING, NEW},
- {null, null, RESOLVING, PART_RESOLVED},
- {null, null, RESOLVING, RESOLVED},
- {false, false, RESOLVING, RESOLVING},
- {false, false, RESOLVING, RESOLVING_PART},
- {null, null, RESOLVING, TRANSIENT},
- {null, null, RESOLVING, DESTROYED},
- {false, false, RESOLVING, UPDATING},
- {null, false, RESOLVING, SERIALIZING_TRANSIENT},
- {null, null, RESOLVING, SERIALIZING_GHOST},
- {null, null, RESOLVING, SERIALIZING_PART_RESOLVED},
- {null, null, RESOLVING, SERIALIZING_RESOLVED},
- {null, null, RESOLVING, VALUE},
-
- {null, null, RESOLVED, GHOST},
- {null, null, RESOLVED, NEW},
- {null, null, RESOLVED, PART_RESOLVED},
- {null, null, RESOLVED, RESOLVED},
- {false, false, RESOLVED, RESOLVING},
- {false, false, RESOLVED, RESOLVING_PART},
- {null, null, RESOLVED, TRANSIENT},
- {null, null, RESOLVED, DESTROYED},
- {true, true, RESOLVED, UPDATING},
- {null, false, RESOLVED, SERIALIZING_TRANSIENT},
- {null, null, RESOLVED, SERIALIZING_GHOST},
- {null, null, RESOLVED, SERIALIZING_PART_RESOLVED},
- {null, null, RESOLVED, SERIALIZING_RESOLVED},
- {null, null, RESOLVED, VALUE},
-
- {null, null, UPDATING, GHOST},
- {null, null, UPDATING, NEW},
- {null, null, UPDATING, PART_RESOLVED},
- {null, null, UPDATING, RESOLVED},
- {false, false, UPDATING, RESOLVING},
- {false, false, UPDATING, RESOLVING_PART},
- {null, null, UPDATING, TRANSIENT},
- {null, null, UPDATING, DESTROYED},
- {false, false, UPDATING, UPDATING},
- {null, false, UPDATING, SERIALIZING_TRANSIENT},
- {null, null, UPDATING, SERIALIZING_GHOST},
- {null, null, UPDATING, SERIALIZING_PART_RESOLVED},
- {null, null, UPDATING, SERIALIZING_RESOLVED},
- {null, null, UPDATING, VALUE},
-
- {null, null, SERIALIZING_TRANSIENT, GHOST},
- {null, null, SERIALIZING_TRANSIENT, NEW},
- {null, null, SERIALIZING_TRANSIENT, PART_RESOLVED},
- {null, null, SERIALIZING_TRANSIENT, RESOLVED},
- {false, false, SERIALIZING_TRANSIENT, RESOLVING},
- {false, false, SERIALIZING_TRANSIENT, RESOLVING_PART},
- {null, null, SERIALIZING_TRANSIENT, TRANSIENT},
- {null, null, SERIALIZING_TRANSIENT, DESTROYED},
- {false, false, SERIALIZING_TRANSIENT, UPDATING},
- {null, false, SERIALIZING_TRANSIENT, SERIALIZING_TRANSIENT},
- {null, null, SERIALIZING_TRANSIENT, SERIALIZING_GHOST},
- {null, null, SERIALIZING_TRANSIENT, SERIALIZING_PART_RESOLVED},
- {null, null, SERIALIZING_TRANSIENT, SERIALIZING_RESOLVED},
- {null, null, SERIALIZING_TRANSIENT, VALUE},
-
- {null, null, SERIALIZING_PART_RESOLVED, GHOST},
- {null, null, SERIALIZING_PART_RESOLVED, NEW},
- {null, null, SERIALIZING_PART_RESOLVED, PART_RESOLVED},
- {null, null, SERIALIZING_PART_RESOLVED, RESOLVED},
- {false, false, SERIALIZING_PART_RESOLVED, RESOLVING},
- {false, false, SERIALIZING_PART_RESOLVED, RESOLVING_PART},
- {null, null, SERIALIZING_PART_RESOLVED, TRANSIENT},
- {null, null, SERIALIZING_PART_RESOLVED, DESTROYED},
- {false, false, SERIALIZING_PART_RESOLVED, UPDATING},
- {null, false, SERIALIZING_PART_RESOLVED, SERIALIZING_TRANSIENT},
- {null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_GHOST},
- {null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_PART_RESOLVED},
- {null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_RESOLVED},
- {null, null, SERIALIZING_PART_RESOLVED, VALUE},
-
- {null, null, SERIALIZING_RESOLVED, GHOST},
- {null, null, SERIALIZING_RESOLVED, NEW},
- {null, null, SERIALIZING_RESOLVED, PART_RESOLVED},
- {null, null, SERIALIZING_RESOLVED, RESOLVED},
- {false, false, SERIALIZING_RESOLVED, RESOLVING},
- {false, false, SERIALIZING_RESOLVED, RESOLVING_PART},
- {null, null, SERIALIZING_RESOLVED, TRANSIENT},
- {null, null, SERIALIZING_RESOLVED, DESTROYED},
- {false, false, SERIALIZING_RESOLVED, UPDATING},
- {null, false, SERIALIZING_RESOLVED, SERIALIZING_TRANSIENT},
- {null, null, SERIALIZING_RESOLVED, SERIALIZING_GHOST},
- {null, null, SERIALIZING_RESOLVED, SERIALIZING_PART_RESOLVED},
- {null, null, SERIALIZING_RESOLVED, SERIALIZING_RESOLVED},
- {null, null, SERIALIZING_RESOLVED, VALUE},
-
- {null, null, SERIALIZING_GHOST, GHOST},
- {null, null, SERIALIZING_GHOST, NEW},
- {null, null, SERIALIZING_GHOST, PART_RESOLVED},
- {null, null, SERIALIZING_GHOST, RESOLVED},
- {false, false, SERIALIZING_GHOST, RESOLVING},
- {false, false, SERIALIZING_GHOST, RESOLVING_PART},
- {null, null, SERIALIZING_GHOST, TRANSIENT},
- {null, null, SERIALIZING_GHOST, DESTROYED},
- {false, false, SERIALIZING_GHOST, UPDATING},
- {null, false, SERIALIZING_GHOST, SERIALIZING_TRANSIENT},
- {null, null, SERIALIZING_GHOST, SERIALIZING_GHOST},
- {null, null, SERIALIZING_GHOST, SERIALIZING_PART_RESOLVED},
- {null, null, SERIALIZING_GHOST, SERIALIZING_RESOLVED},
- {null, null, SERIALIZING_GHOST, VALUE},
-
- {null, null, VALUE, GHOST},
- {null, null, VALUE, NEW},
- {null, null, VALUE, PART_RESOLVED},
- {null, null, VALUE, RESOLVED},
- {false, false, VALUE, RESOLVING},
- {false, false, VALUE, RESOLVING_PART},
- {null, null, VALUE, TRANSIENT},
- {null, null, VALUE, DESTROYED},
- {false, false, VALUE, UPDATING},
- {null, false, VALUE, SERIALIZING_TRANSIENT},
- {null, null, VALUE, SERIALIZING_GHOST},
- {null, null, VALUE, SERIALIZING_PART_RESOLVED},
- {null, null, VALUE, SERIALIZING_RESOLVED},
- {null, null, VALUE, VALUE},
-
- {null, null, DESTROYED, GHOST},
- {null, null, DESTROYED, NEW},
- {null, null, DESTROYED, PART_RESOLVED},
- {null, null, DESTROYED, RESOLVED},
- {false, false, DESTROYED, RESOLVING},
- {false, false, DESTROYED, RESOLVING_PART},
- {null, null, DESTROYED, TRANSIENT},
- {null, null, DESTROYED, DESTROYED},
- {false, false, DESTROYED, UPDATING},
- {null, false, DESTROYED, SERIALIZING_TRANSIENT},
- {null, null, DESTROYED, SERIALIZING_GHOST},
- {null, null, DESTROYED, SERIALIZING_PART_RESOLVED},
- {null, null, DESTROYED, SERIALIZING_RESOLVED},
- {null, null, DESTROYED, VALUE},
-
- });
- }
-
- private final Boolean whetherIsResolvable;
- private final Boolean whetherIsDeserializable;
- private final ResolveState from;
- private final ResolveState to;
-
- public ResolveState_IsResolvableOrDeserializableTest(final Boolean whetherIsResolvable, final Boolean whetherIsDeserializable, final ResolveState from, final ResolveState to) {
- this.whetherIsResolvable = whetherIsResolvable;
- this.whetherIsDeserializable = whetherIsDeserializable;
- this.from = from;
- this.to = to;
- }
-
- @Test
- public void testIsResolvable() {
- if (whetherIsResolvable != null) {
- assertThat(from.isResolvable(to), is(whetherIsResolvable));
- } else {
- try {
- from.isResolvable(to);
- fail();
- } catch(ResolveException ex) {
- // expected
- }
- }
- }
-
- @Test
- public void testIsDeserialiable() {
- if (whetherIsDeserializable != null) {
- assertThat(from.isDeserializable(to), is(whetherIsDeserializable));
- } else {
- try {
- from.isDeserializable(to);
- fail();
- } catch(ResolveException ex) {
- // expected
- }
- }
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsResolvableOrDeserializableTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { null, null, NEW, GHOST }, { null, null, NEW, NEW },
+ { null, null, NEW, PART_RESOLVED }, { null, null, NEW, RESOLVED }, { false, false, NEW, RESOLVING },
+ { false, false, NEW, RESOLVING_PART }, { null, null, NEW, TRANSIENT }, { null, null, NEW, DESTROYED },
+ { false, false, NEW, UPDATING }, { null, false, NEW, SERIALIZING_TRANSIENT },
+ { null, null, NEW, SERIALIZING_GHOST }, { null, null, NEW, SERIALIZING_PART_RESOLVED },
+ { null, null, NEW, SERIALIZING_RESOLVED }, { null, null, NEW, VALUE },
+
+ { null, null, GHOST, GHOST }, { null, null, GHOST, NEW }, { null, null, GHOST, PART_RESOLVED },
+ { null, null, GHOST, RESOLVED }, { true, true, GHOST, RESOLVING }, { true, true, GHOST, RESOLVING_PART },
+ { null, null, GHOST, TRANSIENT }, { null, null, GHOST, DESTROYED }, { true, true, GHOST, UPDATING },
+ { null, false, GHOST, SERIALIZING_TRANSIENT }, { null, null, GHOST, SERIALIZING_GHOST },
+ { null, null, GHOST, SERIALIZING_PART_RESOLVED }, { null, null, GHOST, SERIALIZING_RESOLVED },
+ { null, null, GHOST, VALUE },
+
+ { null, null, TRANSIENT, GHOST }, { null, null, TRANSIENT, NEW }, { null, null, TRANSIENT, PART_RESOLVED },
+ { null, null, TRANSIENT, RESOLVED }, { false, false, TRANSIENT, RESOLVING },
+ { false, false, TRANSIENT, RESOLVING_PART }, { null, null, TRANSIENT, TRANSIENT },
+ { null, null, TRANSIENT, DESTROYED }, { false, false, TRANSIENT, UPDATING },
+ { null, true, TRANSIENT, SERIALIZING_TRANSIENT }, { null, null, TRANSIENT, SERIALIZING_GHOST },
+ { null, null, TRANSIENT, SERIALIZING_PART_RESOLVED }, { null, null, TRANSIENT, SERIALIZING_RESOLVED },
+ { null, null, TRANSIENT, VALUE },
+
+ { null, null, RESOLVING_PART, GHOST }, { null, null, RESOLVING_PART, NEW },
+ { null, null, RESOLVING_PART, PART_RESOLVED }, { null, null, RESOLVING_PART, RESOLVED },
+ { false, false, RESOLVING_PART, RESOLVING }, { false, false, RESOLVING_PART, RESOLVING_PART },
+ { null, null, RESOLVING_PART, TRANSIENT }, { null, null, RESOLVING_PART, DESTROYED },
+ { false, false, RESOLVING_PART, UPDATING }, { null, false, RESOLVING_PART, SERIALIZING_TRANSIENT },
+ { null, null, RESOLVING_PART, SERIALIZING_GHOST },
+ { null, null, RESOLVING_PART, SERIALIZING_PART_RESOLVED },
+ { null, null, RESOLVING_PART, SERIALIZING_RESOLVED }, { null, null, RESOLVING_PART, VALUE },
+
+ { null, null, PART_RESOLVED, GHOST }, { null, null, PART_RESOLVED, NEW },
+ { null, null, PART_RESOLVED, PART_RESOLVED }, { null, null, PART_RESOLVED, RESOLVED },
+ { true, true, PART_RESOLVED, RESOLVING }, { true, true, PART_RESOLVED, RESOLVING_PART },
+ { null, null, PART_RESOLVED, TRANSIENT }, { null, null, PART_RESOLVED, DESTROYED },
+ { true, true, PART_RESOLVED, UPDATING }, { null, false, PART_RESOLVED, SERIALIZING_TRANSIENT },
+ { null, null, PART_RESOLVED, SERIALIZING_GHOST }, { null, null, PART_RESOLVED, SERIALIZING_PART_RESOLVED },
+ { null, null, PART_RESOLVED, SERIALIZING_RESOLVED }, { null, null, PART_RESOLVED, VALUE },
+
+ { null, null, RESOLVING, GHOST }, { null, null, RESOLVING, NEW }, { null, null, RESOLVING, PART_RESOLVED },
+ { null, null, RESOLVING, RESOLVED }, { false, false, RESOLVING, RESOLVING },
+ { false, false, RESOLVING, RESOLVING_PART }, { null, null, RESOLVING, TRANSIENT },
+ { null, null, RESOLVING, DESTROYED }, { false, false, RESOLVING, UPDATING },
+ { null, false, RESOLVING, SERIALIZING_TRANSIENT }, { null, null, RESOLVING, SERIALIZING_GHOST },
+ { null, null, RESOLVING, SERIALIZING_PART_RESOLVED }, { null, null, RESOLVING, SERIALIZING_RESOLVED },
+ { null, null, RESOLVING, VALUE },
+
+ { null, null, RESOLVED, GHOST }, { null, null, RESOLVED, NEW }, { null, null, RESOLVED, PART_RESOLVED },
+ { null, null, RESOLVED, RESOLVED }, { false, false, RESOLVED, RESOLVING },
+ { false, false, RESOLVED, RESOLVING_PART }, { null, null, RESOLVED, TRANSIENT },
+ { null, null, RESOLVED, DESTROYED }, { true, true, RESOLVED, UPDATING },
+ { null, false, RESOLVED, SERIALIZING_TRANSIENT }, { null, null, RESOLVED, SERIALIZING_GHOST },
+ { null, null, RESOLVED, SERIALIZING_PART_RESOLVED }, { null, null, RESOLVED, SERIALIZING_RESOLVED },
+ { null, null, RESOLVED, VALUE },
+
+ { null, null, UPDATING, GHOST }, { null, null, UPDATING, NEW }, { null, null, UPDATING, PART_RESOLVED },
+ { null, null, UPDATING, RESOLVED }, { false, false, UPDATING, RESOLVING },
+ { false, false, UPDATING, RESOLVING_PART }, { null, null, UPDATING, TRANSIENT },
+ { null, null, UPDATING, DESTROYED }, { false, false, UPDATING, UPDATING },
+ { null, false, UPDATING, SERIALIZING_TRANSIENT }, { null, null, UPDATING, SERIALIZING_GHOST },
+ { null, null, UPDATING, SERIALIZING_PART_RESOLVED }, { null, null, UPDATING, SERIALIZING_RESOLVED },
+ { null, null, UPDATING, VALUE },
+
+ { null, null, SERIALIZING_TRANSIENT, GHOST }, { null, null, SERIALIZING_TRANSIENT, NEW },
+ { null, null, SERIALIZING_TRANSIENT, PART_RESOLVED }, { null, null, SERIALIZING_TRANSIENT, RESOLVED },
+ { false, false, SERIALIZING_TRANSIENT, RESOLVING },
+ { false, false, SERIALIZING_TRANSIENT, RESOLVING_PART }, { null, null, SERIALIZING_TRANSIENT, TRANSIENT },
+ { null, null, SERIALIZING_TRANSIENT, DESTROYED }, { false, false, SERIALIZING_TRANSIENT, UPDATING },
+ { null, false, SERIALIZING_TRANSIENT, SERIALIZING_TRANSIENT },
+ { null, null, SERIALIZING_TRANSIENT, SERIALIZING_GHOST },
+ { null, null, SERIALIZING_TRANSIENT, SERIALIZING_PART_RESOLVED },
+ { null, null, SERIALIZING_TRANSIENT, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_TRANSIENT, VALUE },
+
+ { null, null, SERIALIZING_PART_RESOLVED, GHOST }, { null, null, SERIALIZING_PART_RESOLVED, NEW },
+ { null, null, SERIALIZING_PART_RESOLVED, PART_RESOLVED },
+ { null, null, SERIALIZING_PART_RESOLVED, RESOLVED },
+ { false, false, SERIALIZING_PART_RESOLVED, RESOLVING },
+ { false, false, SERIALIZING_PART_RESOLVED, RESOLVING_PART },
+ { null, null, SERIALIZING_PART_RESOLVED, TRANSIENT }, { null, null, SERIALIZING_PART_RESOLVED, DESTROYED },
+ { false, false, SERIALIZING_PART_RESOLVED, UPDATING },
+ { null, false, SERIALIZING_PART_RESOLVED, SERIALIZING_TRANSIENT },
+ { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_GHOST },
+ { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_PART_RESOLVED },
+ { null, null, SERIALIZING_PART_RESOLVED, SERIALIZING_RESOLVED },
+ { null, null, SERIALIZING_PART_RESOLVED, VALUE },
+
+ { null, null, SERIALIZING_RESOLVED, GHOST }, { null, null, SERIALIZING_RESOLVED, NEW },
+ { null, null, SERIALIZING_RESOLVED, PART_RESOLVED }, { null, null, SERIALIZING_RESOLVED, RESOLVED },
+ { false, false, SERIALIZING_RESOLVED, RESOLVING }, { false, false, SERIALIZING_RESOLVED, RESOLVING_PART },
+ { null, null, SERIALIZING_RESOLVED, TRANSIENT }, { null, null, SERIALIZING_RESOLVED, DESTROYED },
+ { false, false, SERIALIZING_RESOLVED, UPDATING },
+ { null, false, SERIALIZING_RESOLVED, SERIALIZING_TRANSIENT },
+ { null, null, SERIALIZING_RESOLVED, SERIALIZING_GHOST },
+ { null, null, SERIALIZING_RESOLVED, SERIALIZING_PART_RESOLVED },
+ { null, null, SERIALIZING_RESOLVED, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_RESOLVED, VALUE },
+
+ { null, null, SERIALIZING_GHOST, GHOST }, { null, null, SERIALIZING_GHOST, NEW },
+ { null, null, SERIALIZING_GHOST, PART_RESOLVED }, { null, null, SERIALIZING_GHOST, RESOLVED },
+ { false, false, SERIALIZING_GHOST, RESOLVING }, { false, false, SERIALIZING_GHOST, RESOLVING_PART },
+ { null, null, SERIALIZING_GHOST, TRANSIENT }, { null, null, SERIALIZING_GHOST, DESTROYED },
+ { false, false, SERIALIZING_GHOST, UPDATING }, { null, false, SERIALIZING_GHOST, SERIALIZING_TRANSIENT },
+ { null, null, SERIALIZING_GHOST, SERIALIZING_GHOST },
+ { null, null, SERIALIZING_GHOST, SERIALIZING_PART_RESOLVED },
+ { null, null, SERIALIZING_GHOST, SERIALIZING_RESOLVED }, { null, null, SERIALIZING_GHOST, VALUE },
+
+ { null, null, VALUE, GHOST }, { null, null, VALUE, NEW }, { null, null, VALUE, PART_RESOLVED },
+ { null, null, VALUE, RESOLVED }, { false, false, VALUE, RESOLVING },
+ { false, false, VALUE, RESOLVING_PART }, { null, null, VALUE, TRANSIENT },
+ { null, null, VALUE, DESTROYED }, { false, false, VALUE, UPDATING },
+ { null, false, VALUE, SERIALIZING_TRANSIENT }, { null, null, VALUE, SERIALIZING_GHOST },
+ { null, null, VALUE, SERIALIZING_PART_RESOLVED }, { null, null, VALUE, SERIALIZING_RESOLVED },
+ { null, null, VALUE, VALUE },
+
+ { null, null, DESTROYED, GHOST }, { null, null, DESTROYED, NEW }, { null, null, DESTROYED, PART_RESOLVED },
+ { null, null, DESTROYED, RESOLVED }, { false, false, DESTROYED, RESOLVING },
+ { false, false, DESTROYED, RESOLVING_PART }, { null, null, DESTROYED, TRANSIENT },
+ { null, null, DESTROYED, DESTROYED }, { false, false, DESTROYED, UPDATING },
+ { null, false, DESTROYED, SERIALIZING_TRANSIENT }, { null, null, DESTROYED, SERIALIZING_GHOST },
+ { null, null, DESTROYED, SERIALIZING_PART_RESOLVED }, { null, null, DESTROYED, SERIALIZING_RESOLVED },
+ { null, null, DESTROYED, VALUE },
+
+ });
+ }
+
+ private final Boolean whetherIsResolvable;
+ private final Boolean whetherIsDeserializable;
+ private final ResolveState from;
+ private final ResolveState to;
+
+ public ResolveState_IsResolvableOrDeserializableTest(final Boolean whetherIsResolvable,
+ final Boolean whetherIsDeserializable, final ResolveState from, final ResolveState to) {
+ this.whetherIsResolvable = whetherIsResolvable;
+ this.whetherIsDeserializable = whetherIsDeserializable;
+ this.from = from;
+ this.to = to;
+ }
+
+ @Test
+ public void testIsResolvable() {
+ if (whetherIsResolvable != null) {
+ assertThat(from.isResolvable(to), is(whetherIsResolvable));
+ } else {
+ try {
+ from.isResolvable(to);
+ fail();
+ } catch (final ResolveException ex) {
+ // expected
+ }
+ }
+ }
+
+ @Test
+ public void testIsDeserialiable() {
+ if (whetherIsDeserializable != null) {
+ assertThat(from.isDeserializable(to), is(whetherIsDeserializable));
+ } else {
+ try {
+ from.isDeserializable(to);
+ fail();
+ } catch (final ResolveException ex) {
+ // expected
+ }
+ }
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvedTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsResolvedTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, GHOST},
- {false, NEW},
- {false, PART_RESOLVED},
- {true, RESOLVED},
- {false, RESOLVING},
- {false, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {false, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {false, SERIALIZING_GHOST},
- {false, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsResolvedTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsResolved() {
- assertThat(state.isResolved(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsResolvedTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
+ { true, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsResolvedTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsResolved() {
+ assertThat(state.isResolved(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsResolvingTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsResolvingTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, GHOST},
- {false, NEW},
- {false, PART_RESOLVED},
- {false, RESOLVED},
- {true, RESOLVING},
- {true, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {false, UPDATING},
- {false, SERIALIZING_TRANSIENT},
- {false, SERIALIZING_GHOST},
- {false, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsResolvingTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsResolving() {
- assertThat(state.isResolving(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsResolvingTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
+ { false, RESOLVED }, { true, RESOLVING }, { true, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { false, UPDATING }, { false, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsResolvingTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsResolving() {
+ assertThat(state.isResolving(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsSerializingTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsSerializingTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, GHOST},
- {false, NEW},
- {false, PART_RESOLVED},
- {false, RESOLVED},
- {false, RESOLVING},
- {false, RESOLVING_PART},
- {false, TRANSIENT},
- {false, DESTROYED},
- {false, UPDATING},
- {true, SERIALIZING_TRANSIENT},
- {true, SERIALIZING_GHOST},
- {true, SERIALIZING_PART_RESOLVED},
- {true, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsSerializingTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsSerializing() {
- assertThat(state.isSerializing(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsSerializingTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
+ { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { false, TRANSIENT },
+ { false, DESTROYED }, { false, UPDATING }, { true, SERIALIZING_TRANSIENT }, { true, SERIALIZING_GHOST },
+ { true, SERIALIZING_PART_RESOLVED }, { true, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsSerializingTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsSerializing() {
+ assertThat(state.isSerializing(), is(whetherIs));
+ }
+
+}
Modified: incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java?rev=1096917&r1=1096916&r2=1096917&view=diff
==============================================================================
--- incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java (original)
+++ incubator/isis/trunk/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/ResolveState_IsTransientTest.java Tue Apr 26 21:28:05 2011
@@ -17,9 +17,8 @@
* under the License.
*/
+package org.apache.isis.core.metamodel.adapter;
-package org.apache.isis.core.metamodel.adapter;
-
import static org.apache.isis.core.metamodel.adapter.ResolveState.DESTROYED;
import static org.apache.isis.core.metamodel.adapter.ResolveState.GHOST;
import static org.apache.isis.core.metamodel.adapter.ResolveState.NEW;
@@ -44,43 +43,29 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class ResolveState_IsTransientTest {
-
-
- @Parameters
- public static Collection<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {false, GHOST},
- {false, NEW},
- {false, PART_RESOLVED},
- {false, RESOLVED},
- {false, RESOLVING},
- {false, RESOLVING_PART},
- {true, TRANSIENT},
- {false, DESTROYED},
- {false, UPDATING},
- {true, SERIALIZING_TRANSIENT},
- {false, SERIALIZING_GHOST},
- {false, SERIALIZING_PART_RESOLVED},
- {false, SERIALIZING_RESOLVED},
- {false, VALUE},
- });
- }
-
-
- private final boolean whetherIs;
- private final ResolveState state;
-
- public ResolveState_IsTransientTest(final boolean whetherIs, final ResolveState state) {
- this.whetherIs = whetherIs;
- this.state = state;
- }
-
- @Test
- public void testIsTransient() {
- assertThat(state.isTransient(), is(whetherIs));
- }
-
-}
+
+@RunWith(Parameterized.class)
+public class ResolveState_IsTransientTest {
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ return Arrays.asList(new Object[][] { { false, GHOST }, { false, NEW }, { false, PART_RESOLVED },
+ { false, RESOLVED }, { false, RESOLVING }, { false, RESOLVING_PART }, { true, TRANSIENT },
+ { false, DESTROYED }, { false, UPDATING }, { true, SERIALIZING_TRANSIENT }, { false, SERIALIZING_GHOST },
+ { false, SERIALIZING_PART_RESOLVED }, { false, SERIALIZING_RESOLVED }, { false, VALUE }, });
+ }
+
+ private final boolean whetherIs;
+ private final ResolveState state;
+
+ public ResolveState_IsTransientTest(final boolean whetherIs, final ResolveState state) {
+ this.whetherIs = whetherIs;
+ this.state = state;
+ }
+
+ @Test
+ public void testIsTransient() {
+ assertThat(state.isTransient(), is(whetherIs));
+ }
+
+}