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 2022/01/31 12:20:48 UTC
[isis] branch master updated: ISIS-2952: polishing: rename annotation
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 9bc8610 ISIS-2952: polishing: rename annotation
9bc8610 is described below
commit 9bc8610a8266ec4ed31df97a64e768c6e925d78a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 31 13:20:37 2022 +0100
ISIS-2952: polishing: rename annotation
---
.../org/apache/isis/testdomain/interact/CustomContextTest.java | 6 +++---
.../apache/isis/testing/integtestsupport/applib/_Helper.java | 10 +++++-----
.../applib/annotation/{TestWith.java => InteractAs.java} | 4 ++--
.../annotation/{TestWithUtils.java => InteractAsUtils.java} | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CustomContextTest.java b/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CustomContextTest.java
index 32ef64d..2771e1e 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CustomContextTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/isis/testdomain/interact/CustomContextTest.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.config.progmodel.ProgrammingModelConstants.DateTimeF
import org.apache.isis.testdomain.conf.Configuration_headless;
import org.apache.isis.testdomain.model.interaction.Configuration_usingInteractionDomain;
import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
-import org.apache.isis.testing.integtestsupport.applib.annotation.TestWith;
+import org.apache.isis.testing.integtestsupport.applib.annotation.InteractAs;
import lombok.val;
@@ -57,7 +57,7 @@ class CustomContextTest extends IsisIntegrationTestAbstract {
@Inject InteractionService interactionService;
@Test
- @TestWith()
+ @InteractAs()
void shouldRunWithDefaultContext() {
val iaCtx = interactionService.currentInteractionContextElseFail();
@@ -73,7 +73,7 @@ class CustomContextTest extends IsisIntegrationTestAbstract {
@Test
- @TestWith(
+ @InteractAs(
userName = "sven",
localeName = "fr",
frozenDateTime = "2010-01-01 13:02:04")
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java
index 949f905..c5a0a84 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/_Helper.java
@@ -27,8 +27,8 @@ import org.apache.isis.applib.services.iactnlayer.InteractionContext;
import org.apache.isis.applib.services.iactnlayer.InteractionService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.reflection._Annotations;
-import org.apache.isis.testing.integtestsupport.applib.annotation.TestWith;
-import org.apache.isis.testing.integtestsupport.applib.annotation.TestWithUtils;
+import org.apache.isis.testing.integtestsupport.applib.annotation.InteractAs;
+import org.apache.isis.testing.integtestsupport.applib.annotation.InteractAsUtils;
class _Helper {
@@ -40,12 +40,12 @@ class _Helper {
}
/**
- * Eg. as declared on test method via {@link TestWith}.
+ * Eg. as declared on test method via {@link InteractAs}.
*/
static Optional<InteractionContext> getCustomInteractionContext(final ExtensionContext extensionContext) {
return extensionContext.getTestMethod()
- .flatMap(testMethod->_Annotations.synthesize(testMethod, TestWith.class))
- .map(TestWithUtils::toInteractionContext);
+ .flatMap(testMethod->_Annotations.synthesize(testMethod, InteractAs.class))
+ .map(InteractAsUtils::toInteractionContext);
}
// -- SHORTCUTS
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/TestWith.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/InteractAs.java
similarity index 97%
rename from testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/TestWith.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/InteractAs.java
index d094f4a..bfc40e8 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/TestWith.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/InteractAs.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.iactnlayer.InteractionService;
* Example:<br>
* <pre>
* @Test
- * @TestWith(
+ * @InteractAs(
* userName = "sven",
* localeName = "en",
* frozenDateTime = "2010-01-01 13:02:04")
@@ -47,7 +47,7 @@ import org.apache.isis.applib.services.iactnlayer.InteractionService;
@Inherited
@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
@Retention(RetentionPolicy.RUNTIME)
-public @interface TestWith {
+public @interface InteractAs {
/**
* If empty, defaults to the system user (with elevated privileges).
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/TestWithUtils.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/InteractAsUtils.java
similarity index 94%
rename from testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/TestWithUtils.java
rename to testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/InteractAsUtils.java
index d1813b8..fa5de78 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/TestWithUtils.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/annotation/InteractAsUtils.java
@@ -31,9 +31,9 @@ import lombok.val;
import lombok.experimental.UtilityClass;
@UtilityClass
-public class TestWithUtils {
+public class InteractAsUtils {
- public InteractionContext toInteractionContext(final TestWith testWith) {
+ public InteractionContext toInteractionContext(final InteractAs testWith) {
val user = _Strings.isNotEmpty(testWith.userName())
? UserMemento.ofName(testWith.userName())
: UserMemento.system();