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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new b28284eea1 CAUSEWAY-3404: adds annotation DisabledIfRunningWithSurefire
b28284eea1 is described below
commit b28284eea17c14273c668b763ed6d843bcb24382
Author: Andi Huber <[email protected]>
AuthorDate: Thu Feb 15 08:42:53 2024 +0100
CAUSEWAY-3404: adds annotation DisabledIfRunningWithSurefire
- had to add twice: for internal unit testing and for public api (would
otherwise have to mess with artifact dependencies, which on first
attempt would introduce circles)
---
.../annotations/DisabledIfRunningWithSurefire.java | 53 ++++++++++++++++++++++
.../secondary/fetch/CommandFetcher_Test.java | 4 +-
.../domainmodel/MetaModelRegressionTest.java | 2 -
.../injecting/jpa/JpaEntityInjectingTest.java | 4 +-
...actionRollbackTest_usingInteractionService.java | 7 ++-
...actionRollbackTest_usingTransactionService.java | 10 ++--
.../jpa/JpaTransactionScopeListenerTest.java | 3 +-
.../testdomain/rest/JsonValueEncoderTest.java | 1 -
.../testdomain/rest/RestServiceStressTest.java | 4 +-
scripts/ci/rename-all-published-sources.jsh | 28 ++++++------
.../annotations/DisabledIfRunningWithSurefire.java | 51 +++++++++++++++++++++
.../tooling/javamodel/test/AnalyzerTest.java | 6 +--
.../wicket/viewer/wicketapp/CryptFactoryTest.java | 5 +-
13 files changed, 140 insertions(+), 38 deletions(-)
diff --git
a/core/internaltestsupport/src/main/java/org/apache/causeway/core/internaltestsupport/annotations/DisabledIfRunningWithSurefire.java
b/core/internaltestsupport/src/main/java/org/apache/causeway/core/internaltestsupport/annotations/DisabledIfRunningWithSurefire.java
new file mode 100644
index 0000000000..696c94af67
--- /dev/null
+++
b/core/internaltestsupport/src/main/java/org/apache/causeway/core/internaltestsupport/annotations/DisabledIfRunningWithSurefire.java
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.core.internaltestsupport.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+
+/**
+ * Works if combined with
+ * <pre>{@code
+ * <plugin>
+ * <groupId>org.apache.maven.plugins</groupId>
+ * <artifactId>maven-surefire-plugin</artifactId>
+ * ...
+ * <configuration>
+ * <systemPropertyVariables>
+ * <isRunningWithSurefire>true</isRunningWithSurefire>
+ * </systemPropertyVariables>
+ * </configuration>
+ * </plugin>}
+ * </pre>
+ * @see DisabledIfSystemProperty
+ * @apiNote This one is for framework internal use.
+ * There is also a copy for the public API in the unittesting-applib
module.
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+public @interface DisabledIfRunningWithSurefire {
+
+}
diff --git
a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
index 82b6989230..badde83508 100644
---
a/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
+++
b/incubator/extensions/core/commandreplay/secondary/src/test/java/org/apache/causeway/extensions/commandreplay/secondary/fetch/CommandFetcher_Test.java
@@ -21,7 +21,6 @@ package
org.apache.causeway.extensions.commandreplay.secondary.fetch;
import java.util.Optional;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.TestPropertySource;
@@ -29,6 +28,7 @@ import org.springframework.test.context.TestPropertySource;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import
org.apache.causeway.core.internaltestsupport.annotations.DisabledIfRunningWithSurefire;
import org.apache.causeway.core.metamodel._testing.MetaModelContext_forTesting;
import
org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
import
org.apache.causeway.extensions.commandreplay.secondary.status.StatusException;
@@ -48,7 +48,7 @@ import lombok.val;
CausewayPresets.UseLog4j2Test,
})
//intended only for manual verification.
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+@DisabledIfRunningWithSurefire
//@Log4j2
class CommandFetcher_Test {
diff --git
a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
index 9544fa7615..95d8b8dccd 100644
---
a/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
+++
b/regressiontests/stable-domainmodel/src/test/java/org/apache/causeway/testdomain/domainmodel/MetaModelRegressionTest.java
@@ -59,8 +59,6 @@ import lombok.SneakyThrows;
CausewayPresets.SilenceMetaModel,
CausewayPresets.SilenceProgrammingModel
})
-//uncomment if intended only for manual verification.
-//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
class MetaModelRegressionTest {
@Inject MetaModelServiceMenu metaModelServiceMenu;
diff --git
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
index 8b4ac8d97b..92bc5f9c1f 100644
---
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
+++
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/injecting/jpa/JpaEntityInjectingTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.Commit;
import org.springframework.test.context.TestPropertySource;
@@ -46,6 +45,7 @@ import org.apache.causeway.testdomain.jpa.entities.JpaProduct;
import org.apache.causeway.testdomain.util.dto.BookDto;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import
org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
+import
org.apache.causeway.testing.unittestsupport.applib.annotations.DisabledIfRunningWithSurefire;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -61,7 +61,7 @@ import lombok.extern.log4j.Log4j2;
@Transactional
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@Log4j2
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+@DisabledIfRunningWithSurefire
class JpaEntityInjectingTest extends CausewayIntegrationTestAbstract {
@Inject private JpaTestFixtures jpaTestFixtures;
diff --git
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
index 6a4f1fe1bc..0a0e67201d 100644
---
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
+++
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingInteractionService.java
@@ -20,12 +20,9 @@ package org.apache.causeway.testdomain.transactions.jpa;
import javax.inject.Inject;
-import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
@@ -40,11 +37,13 @@ import
org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.commons.internal.base._Refs.ObjectReference;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import
org.apache.causeway.testing.integtestsupport.applib.CausewayInteractionHandler;
+import
org.apache.causeway.testing.unittestsupport.applib.annotations.DisabledIfRunningWithSurefire;
import lombok.val;
@@ -61,7 +60,7 @@ import lombok.val;
@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ExtendWith({CausewayInteractionHandler.class})
@DirtiesContext
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+@DisabledIfRunningWithSurefire
class JpaTransactionRollbackTest_usingInteractionService
//extends CausewayIntegrationTestAbstract
{
diff --git
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
index 59cd84aa24..a012b472a6 100644
---
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
+++
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionRollbackTest_usingTransactionService.java
@@ -20,14 +20,9 @@ package org.apache.causeway.testdomain.transactions.jpa;
import javax.inject.Inject;
-import org.apache.causeway.commons.internal.base._Refs;
-
-import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
-
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
@@ -38,12 +33,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.xactn.TransactionService;
+import org.apache.causeway.commons.internal.base._Refs;
import org.apache.causeway.core.config.presets.CausewayPresets;
+import org.apache.causeway.core.transaction.events.TransactionCompletionStatus;
import org.apache.causeway.testdomain.conf.Configuration_usingJpa;
import org.apache.causeway.testdomain.jpa.JpaTestDomainPersona;
import org.apache.causeway.testdomain.jpa.entities.JpaBook;
import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import
org.apache.causeway.testing.integtestsupport.applib.CausewayInteractionHandler;
+import
org.apache.causeway.testing.unittestsupport.applib.annotations.DisabledIfRunningWithSurefire;
import lombok.val;
@@ -60,7 +58,7 @@ import lombok.val;
@TestPropertySource(CausewayPresets.UseLog4j2Test)
@ExtendWith({CausewayInteractionHandler.class})
@DirtiesContext
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+@DisabledIfRunningWithSurefire
class JpaTransactionRollbackTest_usingTransactionService
//extends CausewayIntegrationTestAbstract
{
diff --git
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
index 863c6d01e6..9f864d59cb 100644
---
a/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
+++
b/regressiontests/stable-persistence-jpa/src/test/java/org/apache/causeway/testdomain/transactions/jpa/JpaTransactionScopeListenerTest.java
@@ -42,6 +42,7 @@ import
org.apache.causeway.testdomain.util.interaction.InteractionBoundaryProbe;
import org.apache.causeway.testdomain.util.kv.KVStoreForTesting;
import
org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
import
org.apache.causeway.testing.integtestsupport.applib.CausewayInteractionHandler;
+import
org.apache.causeway.testing.unittestsupport.applib.annotations.DisabledIfRunningWithSurefire;
@SpringBootTest(
classes = {
@@ -57,7 +58,7 @@ import
org.apache.causeway.testing.integtestsupport.applib.CausewayInteractionHa
*/
@DirtiesContext
@ExtendWith(CausewayInteractionHandler.class)
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+@DisabledIfRunningWithSurefire
class JpaTransactionScopeListenerTest {
@Inject private FixtureScripts fixtureScripts;
diff --git
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
index ff5679b41f..70d812dc49 100644
---
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
+++
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/JsonValueEncoderTest.java
@@ -52,7 +52,6 @@ import lombok.val;
Configuration_headless.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
})
-//@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
//TODO WIP
@TestPropertySource(CausewayPresets.UseLog4j2Test)
class JsonValueEncoderTest {
diff --git
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
index 54f7312c7a..599bfcec65 100644
---
a/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
+++
b/regressiontests/stable-rest/src/test/java/org/apache/causeway/testdomain/rest/RestServiceStressTest.java
@@ -24,7 +24,6 @@ import javax.inject.Inject;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.context.annotation.Import;
@@ -38,6 +37,7 @@ import org.apache.causeway.commons.internal.base._Timing;
import org.apache.causeway.core.config.presets.CausewayPresets;
import org.apache.causeway.testdomain.conf.Configuration_usingJdo;
import org.apache.causeway.testdomain.util.rest.RestEndpointService;
+import
org.apache.causeway.testing.unittestsupport.applib.annotations.DisabledIfRunningWithSurefire;
import org.apache.causeway.viewer.restfulobjects.client.RestfulClient;
import
org.apache.causeway.viewer.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy;
@@ -52,7 +52,7 @@ import lombok.extern.log4j.Log4j2;
Configuration_usingJdo.class,
CausewayModuleViewerRestfulObjectsJaxrsResteasy.class
})
-@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+@DisabledIfRunningWithSurefire
@Log4j2
class RestServiceStressTest {
diff --git a/scripts/ci/rename-all-published-sources.jsh
b/scripts/ci/rename-all-published-sources.jsh
index 78826b07da..92bf78a68a 100644
--- a/scripts/ci/rename-all-published-sources.jsh
+++ b/scripts/ci/rename-all-published-sources.jsh
@@ -358,17 +358,19 @@ var rootPath = "" + System.getenv("ROOT_PATH_LEGACY");
if(rootPath.isBlank()
|| ! new File(rootPath).exists()) {
System.err.println("env ROOT_PATH_LEGACY must point to an existing
directory");
- /exit 1
-}
-
-var root = new File(rootPath);
-
-var renamer = RenameProject.renameBackToLegacy(root);
-System.out.printf("processing root %s%n", root.getAbsolutePath());
-
-renamer.renameAllFiles();
-renamer.rewriteAllFileContents();
-
-System.out.println("done.");
-
+ // /exit 1 // syntax error
+
+} else {
+
+ var root = new File(rootPath);
+
+ var renamer = RenameProject.renameBackToLegacy(root);
+ System.out.printf("processing root %s%n", root.getAbsolutePath());
+
+ renamer.renameAllFiles();
+ renamer.rewriteAllFileContents();
+
+ System.out.println("done.");
+}
+
/exit
diff --git
a/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/annotations/DisabledIfRunningWithSurefire.java
b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/annotations/DisabledIfRunningWithSurefire.java
new file mode 100644
index 0000000000..5dfd5cfb0d
--- /dev/null
+++
b/testing/unittestsupport/applib/src/main/java/org/apache/causeway/testing/unittestsupport/applib/annotations/DisabledIfRunningWithSurefire.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.testing.unittestsupport.applib.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+
+/**
+ * Works if combined with
+ * <pre>{@code
+ * <plugin>
+ * <groupId>org.apache.maven.plugins</groupId>
+ * <artifactId>maven-surefire-plugin</artifactId>
+ * ...
+ * <configuration>
+ * <systemPropertyVariables>
+ * <isRunningWithSurefire>true</isRunningWithSurefire>
+ * </systemPropertyVariables>
+ * </configuration>
+ * </plugin>}
+ * </pre>
+ * @see DisabledIfSystemProperty
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@DisabledIfSystemProperty(named = "isRunningWithSurefire", matches = "true")
+public @interface DisabledIfRunningWithSurefire {
+
+}
diff --git
a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
index 95e38c0352..f259237c32 100644
---
a/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
+++
b/tooling/javamodel/src/test/java/org/apache/causeway/tooling/javamodel/test/AnalyzerTest.java
@@ -24,10 +24,10 @@ import java.io.File;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.io.FileUtils;
+import
org.apache.causeway.core.internaltestsupport.annotations.DisabledIfRunningWithSurefire;
import org.apache.causeway.tooling.javamodel.AnalyzerConfigFactory;
import org.apache.causeway.tooling.javamodel.ast.AnyTypeDeclaration;
import org.apache.causeway.tooling.javamodel.ast.CompilationUnits;
@@ -55,7 +55,7 @@ class AnalyzerTest {
}
@Test //work in progress, as of yet a proof of concept
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches =
"true")
+ @DisabledIfRunningWithSurefire
void testJavaDocMining() {
val projDir = ProjectSamples.self();
@@ -89,7 +89,7 @@ class AnalyzerTest {
}
@Test //fails when run with the CI pipeline
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches =
"true")
+ @DisabledIfRunningWithSurefire
void testAnnotationGathering() {
val projDir = ProjectSamples.apacheCausewayRuntime();
diff --git
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
index 80e664daf0..ce7bd9305f 100644
---
a/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
+++
b/viewers/wicket/viewer/src/test/java/org/apache/causeway/viewer/wicket/viewer/wicketapp/CryptFactoryTest.java
@@ -36,7 +36,6 @@ import org.apache.wicket.request.cycle.RequestCycleContext;
import org.apache.wicket.util.crypt.ICrypt;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
@@ -46,6 +45,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
+import
org.apache.causeway.core.internaltestsupport.annotations.DisabledIfRunningWithSurefire;
+
import lombok.val;
/**
@@ -85,7 +86,7 @@ class CryptFactoryTest {
ThreadContext.setRequestCycle(null);
}
- @DisabledIfSystemProperty(named = "isRunningWithSurefire", matches =
"true")
+ @DisabledIfRunningWithSurefire
@ParameterizedTest(name = "{index} {0}")
@MethodSource("provideCryptoCandidates")
void authenticationStrategyRoundtrip_whenProduction(
