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/07/28 12:59:21 UTC

[isis] branch master updated: ISIS-2826: cosmetic change of enum (consistency)

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 1e3f7c4  ISIS-2826: cosmetic change of enum (consistency)
1e3f7c4 is described below

commit 1e3f7c4debce090e4e6bf83749cda7829f6ab4e8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jul 28 14:59:08 2021 +0200

    ISIS-2826: cosmetic change of enum (consistency)
---
 .../testdomain/publishing/CommandPublishingTestAbstract.java   |  2 +-
 .../testdomain/publishing/ExecutionPublishingTestAbstract.java |  2 +-
 .../testdomain/publishing/PropertyPublishingTestAbstract.java  |  2 +-
 .../testdomain/publishing/jdo/JdoCommandPublishingTest.java    |  2 +-
 .../testdomain/publishing/jdo/JdoEntityPublishingTest.java     |  2 +-
 .../testdomain/publishing/jdo/JdoExecutionPublishingTest.java  |  2 +-
 .../testdomain/publishing/jdo/JdoPropertyPublishingTest.java   |  2 +-
 .../testdomain/publishing/jpa/JpaCommandPublishingTest.java    |  2 +-
 .../testdomain/publishing/jpa/JpaEntityPublishingTest.java     |  2 +-
 .../testdomain/publishing/jpa/JpaExecutionPublishingTest.java  |  2 +-
 .../testdomain/publishing/jpa/JpaPropertyPublishingTest.java   |  2 +-
 .../testdomain/publishing/PublishingTestFactoryAbstract.java   |  4 ++--
 .../isis/testdomain/publishing/PublishingTestFactoryJdo.java   | 10 +++++-----
 .../isis/testdomain/publishing/PublishingTestFactoryJpa.java   | 10 +++++-----
 14 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/CommandPublishingTestAbstract.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/CommandPublishingTestAbstract.java
index 95d6a07..29e3261 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/CommandPublishingTestAbstract.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/CommandPublishingTestAbstract.java
@@ -77,7 +77,7 @@ implements HasPersistenceStandard {
 
                 assertHasCommandEntries(Can.of(command));
                 break;
-            case ACTION_EXECUTION:
+            case ACTION_INVOCATION:
 
                 val actionDto = new ActionDto();
                 actionDto.setLogicalMemberIdentifier(
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/ExecutionPublishingTestAbstract.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/ExecutionPublishingTestAbstract.java
index 455ee38..1a55a2c 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/ExecutionPublishingTestAbstract.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/ExecutionPublishingTestAbstract.java
@@ -82,7 +82,7 @@ implements HasPersistenceStandard {
                         ));
             }
                 break;
-            case ACTION_EXECUTION: {
+            case ACTION_INVOCATION: {
                 Identifier actionId = Identifier.actionIdentifier(
                         LogicalType.fqcn(bookClass), "doubleThePrice");
                 val args = Collections.<Object>emptyList();
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PropertyPublishingTestAbstract.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PropertyPublishingTestAbstract.java
index 4721815..272fd0f 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PropertyPublishingTestAbstract.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/PropertyPublishingTestAbstract.java
@@ -62,7 +62,7 @@ implements HasPersistenceStandard {
                 assertHasPropertyChangeEntries(Can.of(
                         formatPersistenceStandardSpecificCapitalize("%s Book/name: 'Sample Book' -> 'Book #2'")));
                 break;
-            case ACTION_EXECUTION:
+            case ACTION_INVOCATION:
                 assertHasPropertyChangeEntries(Can.of(
                         formatPersistenceStandardSpecificCapitalize("%s Book/price: '99.0' -> '198.0'")));
                 break;
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoCommandPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoCommandPublishingTest.java
index f91bf2c..0ce6313 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoCommandPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoCommandPublishingTest.java
@@ -78,7 +78,7 @@ implements HasPersistenceStandardJdo {
     @TestFactory @DisplayName("Action Execution")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTests(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 }
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoEntityPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoEntityPublishingTest.java
index 6e3021f..e26796f 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoEntityPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoEntityPublishingTest.java
@@ -79,7 +79,7 @@ implements HasPersistenceStandardJdo {
     @TestFactory @DisplayName("Action Execution")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTestsIncludeProgrammatic(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 }
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoExecutionPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoExecutionPublishingTest.java
index 3ed494c..76da9c5 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoExecutionPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoExecutionPublishingTest.java
@@ -78,7 +78,7 @@ implements HasPersistenceStandardJdo {
     @TestFactory @DisplayName("Action Execution")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTests(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 }
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoPropertyPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoPropertyPublishingTest.java
index ed741db..78c4e4e 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoPropertyPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jdo/JdoPropertyPublishingTest.java
@@ -81,7 +81,7 @@ implements HasPersistenceStandardJdo {
     @TestFactory @DisplayName("Action Execution")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTestsIncludeProgrammatic(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 }
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaCommandPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaCommandPublishingTest.java
index 7510138..96a1e42 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaCommandPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaCommandPublishingTest.java
@@ -78,7 +78,7 @@ implements HasPersistenceStandardJpa {
     @TestFactory @DisplayName("Action Execution")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTests(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaEntityPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaEntityPublishingTest.java
index 53dbd00..525f03f 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaEntityPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaEntityPublishingTest.java
@@ -82,7 +82,7 @@ implements HasPersistenceStandardJpa {
     @TestFactory @DisplayName("Action Execution - n/a")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTestsIncludeProgrammatic(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 }
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaExecutionPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
index 1b006a3..8019255 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaExecutionPublishingTest.java
@@ -78,7 +78,7 @@ implements HasPersistenceStandardJpa {
     @TestFactory @DisplayName("Action Execution")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTests(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 }
diff --git a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaPropertyPublishingTest.java b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
index 80fe48d..564dfb4 100644
--- a/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
+++ b/regressiontests/incubating/src/test/java/org/apache/isis/testdomain/publishing/jpa/JpaPropertyPublishingTest.java
@@ -81,7 +81,7 @@ implements HasPersistenceStandardJpa {
     @TestFactory @DisplayName("Action Execution")
     List<DynamicTest> generateTestsForAction() {
         return testFactory.generateTestsIncludeProgrammatic(
-                ChangeScenario.ACTION_EXECUTION, this::given, this::verify);
+                ChangeScenario.ACTION_INVOCATION, this::given, this::verify);
     }
 
 }
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java
index 33d7624..dc24beb 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryAbstract.java
@@ -67,7 +67,7 @@ public abstract class PublishingTestFactoryAbstract {
     public static enum ChangeScenario {
         ENTITY_CREATION("creation"),
         PROPERTY_UPDATE("property update"),
-        ACTION_EXECUTION("action execution"),
+        ACTION_INVOCATION("action invocation"),
         ENTITY_REMOVAL("removal");
         final String displayName;
     }
@@ -232,7 +232,7 @@ public abstract class PublishingTestFactoryAbstract {
 
 
         if(changeScenario == ChangeScenario.PROPERTY_UPDATE
-                || changeScenario == ChangeScenario.ACTION_EXECUTION) {
+                || changeScenario == ChangeScenario.ACTION_INVOCATION) {
 
             dynamicTests = dynamicTests
                 .add(publishingTest(
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJdo.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJdo.java
index 23f8fc4..cc9abaf 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJdo.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJdo.java
@@ -99,7 +99,7 @@ extends PublishingTestFactoryAbstract {
             break;
 
         case PROPERTY_UPDATE:
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
         case ENTITY_REMOVAL:
 
             // given
@@ -141,7 +141,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             withBookDo(book->{
 
@@ -205,7 +205,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             // when
             withBookDo(book->{
@@ -257,7 +257,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             // when
             withBookDo(book->{
@@ -303,7 +303,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             // when
             withBookDo(book->{
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJpa.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJpa.java
index 2adcd88..db5148f 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJpa.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/publishing/PublishingTestFactoryJpa.java
@@ -95,7 +95,7 @@ extends PublishingTestFactoryAbstract {
             break;
 
         case PROPERTY_UPDATE:
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
         case ENTITY_REMOVAL:
 
             // given
@@ -136,7 +136,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             withBookDo(book->{
 
@@ -198,7 +198,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             // when
             withBookDo(book->{
@@ -250,7 +250,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             // when
             withBookDo(book->{
@@ -296,7 +296,7 @@ extends PublishingTestFactoryAbstract {
             });
 
             break;
-        case ACTION_EXECUTION:
+        case ACTION_INVOCATION:
 
             // when
             withBookDo(book->{