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 2021/03/05 08:06:47 UTC
[isis] 09/10: ISIS-439: fixes further compile issues
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2444
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f35366d5b86cb47230e7cf56ad3db5fc44d5f477
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Mar 4 17:31:12 2021 +0000
ISIS-439: fixes further compile issues
---
.../core/interaction/InteractionDefaultTest_next.java | 15 ++++++++-------
...inEventHelperTest_newCollectionDomainEvent_forAdd.java | 6 ------
...ventHelperTest_newCollectionDomainEvent_forRemove.java | 6 ------
3 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/core/interaction/src/test/java/org/apache/isis/core/interaction/InteractionDefaultTest_next.java b/core/interaction/src/test/java/org/apache/isis/core/interaction/InteractionDefaultTest_next.java
index cb31c8f..1559096 100644
--- a/core/interaction/src/test/java/org/apache/isis/core/interaction/InteractionDefaultTest_next.java
+++ b/core/interaction/src/test/java/org/apache/isis/core/interaction/InteractionDefaultTest_next.java
@@ -26,6 +26,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import org.apache.isis.applib.services.iactn.SequenceType;
import org.apache.isis.core.interaction.session.IsisInteraction;
import lombok.val;
@@ -36,13 +37,13 @@ public class InteractionDefaultTest_next {
public void test() {
val interaction = new IsisInteraction(UUID.randomUUID());
- assertThat(interaction.next("foo"), is(0));
- assertThat(interaction.next("foo"), is(1));
- assertThat(interaction.next("bar"), is(0));
- assertThat(interaction.next("bar"), is(1));
- assertThat(interaction.next("foo"), is(2));
- assertThat(interaction.next("bar"), is(2));
- assertThat(interaction.next("bar"), is(3));
+ assertThat(interaction.next(SequenceType.EXECUTION), is(0));
+ assertThat(interaction.next(SequenceType.EXECUTION), is(1));
+ assertThat(interaction.next(SequenceType.TRANSACTION), is(0));
+ assertThat(interaction.next(SequenceType.TRANSACTION), is(1));
+ assertThat(interaction.next(SequenceType.EXECUTION), is(2));
+ assertThat(interaction.next(SequenceType.TRANSACTION), is(2));
+ assertThat(interaction.next(SequenceType.TRANSACTION), is(3));
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
index 5abc008..4451113 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forAdd.java
@@ -51,8 +51,6 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
CollectionDomainEvent.Default.class, null, identifier, sdo);
assertSame(ev.getSource(), sdo);
assertThat(ev.getIdentifier(), is(identifier));
- assertThat(ev.getOf(), is(CollectionDomainEvent.Of.ADD_TO));
- assertSame(ev.getValue(), other);
}
@Test
@@ -66,8 +64,6 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
CollectionDomainEvent.Default.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo);
assertSame(ev.getSource(), sdo);
assertThat(ev.getIdentifier(), is(identifier));
- assertThat(ev.getOf(), is(CollectionDomainEvent.Of.ADD_TO));
- assertSame(ev.getValue(), other);
}
@Test
@@ -81,8 +77,6 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forAdd {
SomeDomainObjectCollectionDomainEvent.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo);
assertThat(ev.getSource(), is(sdo));
assertThat(ev.getIdentifier(), is(identifier));
- assertThat(ev.getOf(), is(CollectionDomainEvent.Of.ADD_TO));
- assertThat(ev.getValue(), is(other));
}
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
index b4e2a52..913207d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/DomainEventHelperTest_newCollectionDomainEvent_forRemove.java
@@ -51,8 +51,6 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
CollectionDomainEvent.Default.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo);
assertSame(ev.getSource(), sdo);
assertThat(ev.getIdentifier(), is(identifier));
- assertThat(ev.getOf(), is(CollectionDomainEvent.Of.REMOVE_FROM));
- assertSame(ev.getValue(), other);
}
@Test
@@ -66,8 +64,6 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
CollectionDomainEvent.Default.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo);
assertSame(ev.getSource(), sdo);
assertThat(ev.getIdentifier(), is(identifier));
- assertThat(ev.getOf(), is(CollectionDomainEvent.Of.REMOVE_FROM));
- assertSame(ev.getValue(), other);
}
@Test
@@ -81,8 +77,6 @@ public class DomainEventHelperTest_newCollectionDomainEvent_forRemove {
SomeDomainObjectCollectionRemovedFromDomainEvent.class, AbstractDomainEvent.Phase.EXECUTED, identifier, sdo);
assertThat(ev.getSource(), is(sdo));
assertThat(ev.getIdentifier(), is(identifier));
- assertThat(ev.getOf(), is(CollectionDomainEvent.Of.REMOVE_FROM));
- assertThat(ev.getValue(), is(other));
}
}