You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/12/02 13:25:51 UTC
[isis] branch master updated: ISIS-2903: more test regression fixes
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new b6fe2c4 ISIS-2903: more test regression fixes
b6fe2c4 is described below
commit b6fe2c405031c648851db50338b5dbf8988cfd9c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Dec 2 14:25:40 2021 +0100
ISIS-2903: more test regression fixes
---
.../viewers/jdo/wkt/InteractionTestJdoWkt.java | 3 ++-
.../stubs/LifecycleEventPublishingTestAbstract.java | 12 ++++++------
.../stubs/PropertyPublishingTestAbstract.java | 17 ++++++++++-------
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/regressiontests/stable-viewers-jdo/src/test/java/org/apache/isis/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java b/regressiontests/stable-viewers-jdo/src/test/java/org/apache/isis/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
index d75cdf0..9f963bc 100644
--- a/regressiontests/stable-viewers-jdo/src/test/java/org/apache/isis/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
+++ b/regressiontests/stable-viewers-jdo/src/test/java/org/apache/isis/testdomain/viewers/jdo/wkt/InteractionTestJdoWkt.java
@@ -83,7 +83,8 @@ class InteractionTestJdoWkt extends RegressionTestAbstract {
run(()->{
wktTester.startEntityPage(pageParameters);
wktTester.assertRenderedPage(EntityPage.class);
-
+ wktTester.assertLabel("label", "Favorite Book");
+ //wktTester.assertComponent("", null);
});
//TODO simulate change of a String property -> should yield a new Title and serialized URL link
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java
index 75f9ca9..7dee513 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/LifecycleEventPublishingTestAbstract.java
@@ -61,20 +61,20 @@ extends PublishingTestAbstract {
final ChangeScenario changeScenario,
final VerificationStage verificationStage) {
- val samples = BookDto.samples().collect(Can.toCan());
+ val defaultSample = BookDto.sample();
val bookSamplesForCreate = Can.of(
- samples.getElseFail(0),
+ defaultSample,
BookDto.builder().build()); // empty-defaults
val bookSample1 = Can.of( // initial
- samples.getElseFail(0));
+ defaultSample);
val bookSample2 = Can.of( // after property update
- samples.getElseFail(0).asBuilder()
+ defaultSample.asBuilder()
.name("Book #2")
.build());
val bookSample3 = Can.of( // after action invocation
- samples.getElseFail(0).asBuilder()
- .price(198.0)
+ defaultSample.asBuilder()
+ .price(defaultSample.getPrice()*2.)
.build());
switch(verificationStage) {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java
index e78dc83..fca3005 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/stubs/PropertyPublishingTestAbstract.java
@@ -20,17 +20,18 @@ package org.apache.isis.testdomain.publishing.stubs;
import javax.inject.Inject;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.testdomain.publishing.PublishingTestFactoryAbstract.ChangeScenario;
import org.apache.isis.testdomain.publishing.PublishingTestFactoryAbstract.VerificationStage;
import org.apache.isis.testdomain.publishing.subscriber.EntityPropertyChangeSubscriberForTesting;
import org.apache.isis.testdomain.util.CollectionAssertions;
+import org.apache.isis.testdomain.util.dto.BookDto;
import org.apache.isis.testdomain.util.kv.KVStoreForTesting;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
import lombok.val;
public abstract class PropertyPublishingTestAbstract
@@ -61,6 +62,8 @@ extends PublishingTestAbstract {
break;
case POST_COMMIT:
+ val defaultBook = BookDto.sample();
+
switch(changeScenario) {
case ENTITY_CREATION:
return; // factory-service does not trigger property publishing
@@ -68,19 +71,19 @@ extends PublishingTestAbstract {
return; // not subject of change tests
case ENTITY_PERSISTING:
assertContainsPropertyChangeEntries(Can.of(
- formatPersistenceStandardSpecificCapitalize("%s Book/name: '[NEW]' -> 'Sample Book'")));
+ formatPersistenceStandardSpecificCapitalize("%s Book/name: '[NEW]' -> '" + defaultBook.getName() + "'")));
return;
case PROPERTY_UPDATE:
assertHasPropertyChangeEntries(Can.of(
- formatPersistenceStandardSpecificCapitalize("%s Book/name: 'Sample Book' -> 'Book #2'")));
+ formatPersistenceStandardSpecificCapitalize("%s Book/name: '" + defaultBook.getName() + "' -> 'Book #2'")));
return;
case ACTION_INVOCATION:
assertHasPropertyChangeEntries(Can.of(
- formatPersistenceStandardSpecificCapitalize("%s Book/price: '99.0' -> '198.0'")));
+ formatPersistenceStandardSpecificCapitalize("%s Book/price: '" + defaultBook.getPrice() + "' -> '" + (2.*defaultBook.getPrice()) + "'")));
return;
case ENTITY_REMOVAL:
assertContainsPropertyChangeEntries(Can.of(
- formatPersistenceStandardSpecificCapitalize("%s Book/name: 'Sample Book' -> '[DELETED]'")));
+ formatPersistenceStandardSpecificCapitalize("%s Book/name: '" + defaultBook.getName() + "' -> '[DELETED]'")));
return;
default:
throw _Exceptions.unmatchedCase(changeScenario);